Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite070c5a

Browse files
committed
Some test improvements
1 parent3795b6d commite070c5a

File tree

6 files changed

+185
-25
lines changed

6 files changed

+185
-25
lines changed

‎src/test/java/io/api/etherscan/account/AccountBalanceListTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
publicclassAccountBalanceListTestextendsAssert {
2020

21-
privatefinalEtherScanApiapi =newEtherScanApi();
21+
privateEtherScanApiapi =newEtherScanApi();
2222

2323
@Test
2424
publicvoidcorrect() {

‎src/test/java/io/api/etherscan/account/AccountMinedBlocksTest.java‎

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
importio.api.etherscan.core.impl.EtherScanApi;
44
importio.api.etherscan.error.InvalidAddressException;
55
importio.api.etherscan.model.Block;
6+
importio.api.etherscan.model.EthNetwork;
67
importorg.junit.Assert;
78
importorg.junit.Test;
9+
importorg.junit.runner.RunWith;
10+
importorg.junit.runners.Parameterized;
11+
importorg.junit.runners.Parameterized.Parameters;
812

13+
importjava.util.Arrays;
14+
importjava.util.Collection;
915
importjava.util.List;
1016

1117
/**
@@ -14,31 +20,70 @@
1420
* @author GoodforGod
1521
* @since 03.11.2018
1622
*/
23+
@RunWith(Parameterized.class)
1724
publicclassAccountMinedBlocksTestextendsAssert {
1825

19-
privatefinalEtherScanApiapi =newEtherScanApi();
26+
privateEtherScanApiapi;
27+
privateintblocksMined;
28+
privateStringaddressCorrect;
29+
privateStringaddressInvalid;
30+
privateStringaddressNoResponse;
31+
32+
publicAccountMinedBlocksTest(EtherScanApiapi,
33+
intblocksMined,
34+
StringaddressCorrect,
35+
StringaddressInvalid,
36+
StringaddressNoResponse) {
37+
this.api =api;
38+
this.blocksMined =blocksMined;
39+
this.addressCorrect =addressCorrect;
40+
this.addressInvalid =addressInvalid;
41+
this.addressNoResponse =addressNoResponse;
42+
}
43+
44+
@Parameters
45+
publicstaticCollectiondata() {
46+
returnArrays.asList(newObject[][]{
47+
{
48+
newEtherScanApi(),
49+
223,
50+
"0xE4C6175183029A0f039bf2DFffa5C6e8F3cA9B23",
51+
"xE4C6175183029A0f039bf2DFffa5C6e8F3cA9B23",
52+
"0xE1C6175183029A0f039bf2DFffa5C6e8F3cA9B23",
53+
},
54+
{
55+
newEtherScanApi(EthNetwork.ROPSTEN),
56+
1,
57+
"0x0923DafEB5A5d11a83E188d5dbCdEd14f9b161a7",
58+
"00923DafEB5A5d11a83E188d5dbCdEd14f9b161a7",
59+
"0x1923DafEB5A5d11a83E188d5dbCdEd14f9b161a7",
60+
}
61+
// Other netWorks not presented due to 30k+ mined blocks, tests runs forever
62+
});
63+
}
2064

2165
@Test
2266
publicvoidcorrect() {
23-
List<Block>blocks =api.account().minedBlocks("0xE4C6175183029A0f039bf2DFffa5C6e8F3cA9B23");
67+
List<Block>blocks =api.account().minedBlocks(addressCorrect);
2468
assertNotNull(blocks);
25-
assertEquals(223,blocks.size());
26-
assertTxs(blocks);
69+
70+
assertEquals(blocksMined,blocks.size());
71+
assertBlocks(blocks);
2772
}
2873

2974
@Test(expected =InvalidAddressException.class)
3075
publicvoidinvalidParamWithError() {
31-
List<Block>txs =api.account().minedBlocks("0xEC6175183029A0f039bf2DFffa5C6e8F3cA9B23");
76+
List<Block>txs =api.account().minedBlocks(addressInvalid);
3277
}
3378

3479
@Test
3580
publicvoidcorrectParamWithEmptyExpectedResult() {
36-
List<Block>txs =api.account().minedBlocks("0xE1C6175183029A0f039bf2DFffa5C6e8F3cA9B23");
81+
List<Block>txs =api.account().minedBlocks(addressNoResponse);
3782
assertNotNull(txs);
3883
assertTrue(txs.isEmpty());
3984
}
4085

41-
privatevoidassertTxs(List<Block>blocks) {
86+
privatevoidassertBlocks(List<Block>blocks) {
4287
for (Blockblock :blocks) {
4388
assertNotEquals(0,block.getBlockNumber());
4489
assertNotNull(block.getBlockReward());

‎src/test/java/io/api/etherscan/account/AccountTokenBalanceTest.java‎

Lines changed: 70 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,88 @@
33
importio.api.etherscan.core.impl.EtherScanApi;
44
importio.api.etherscan.error.InvalidAddressException;
55
importio.api.etherscan.model.Balance;
6+
importio.api.etherscan.model.EthNetwork;
67
importio.api.etherscan.model.TokenBalance;
78
importorg.junit.Assert;
89
importorg.junit.Test;
10+
importorg.junit.runner.RunWith;
11+
importorg.junit.runners.Parameterized;
12+
importorg.junit.runners.Parameterized.Parameters;
13+
14+
importjava.util.Arrays;
15+
importjava.util.Collection;
916

1017
/**
1118
* ! NO DESCRIPTION !
1219
*
1320
* @author GoodforGod
1421
* @since 03.11.2018
1522
*/
23+
@RunWith(Parameterized.class)
1624
publicclassAccountTokenBalanceTestextendsAssert {
1725

18-
privatefinalEtherScanApiapi =newEtherScanApi();
26+
privateEtherScanApiapi;
27+
privateStringcontractValid;
28+
privateStringaddressValid;
29+
privateStringcontractInvalid;
30+
privateStringaddressInvalid;
31+
privateStringaddressEmpty;
32+
33+
publicAccountTokenBalanceTest(EtherScanApiapi,
34+
StringcontractValid,
35+
StringaddressValid,
36+
StringcontractInvalid,
37+
StringaddressInvalid,
38+
StringaddressEmpty) {
39+
this.api =api;
40+
this.contractValid =contractValid;
41+
this.addressValid =addressValid;
42+
this.contractInvalid =contractInvalid;
43+
this.addressInvalid =addressInvalid;
44+
this.addressEmpty =addressEmpty;
45+
}
46+
47+
@Parameters
48+
publicstaticCollectiondata() {
49+
returnArrays.asList(newObject[][]{
50+
{
51+
newEtherScanApi(),
52+
"0x5EaC95ad5b287cF44E058dCf694419333b796123",
53+
"0x5d807e7F124EC2103a59c5249187f772c0b8D6b2",
54+
"0xEaC95ad5b287cF44E058dCf694419333b796123",
55+
"0x5807e7F124EC2103a59c5249187f772c0b8D6b2",
56+
"0x1d807e7F124EC2103a59c5249187f772c0b8D6b2",
57+
},
58+
{
59+
newEtherScanApi(EthNetwork.ROPSTEN),
60+
"0x60a5aa08619bd5f71c6d20bfaefb5ac2c2806745",
61+
"0x0923dafeb5a5d11a83e188d5dbcded14f9b161a7",
62+
"0x0a5aa08619bd5f71c6d20bfaefb5ac2c2806745",
63+
"0x923dafeb5a5d11a83e188d5dbcded14f9b161a7",
64+
"0x1923dafeb5a5d11a83e188d5dbcded14f9b161a7",
65+
},
66+
{
67+
newEtherScanApi(EthNetwork.RINKEBY),
68+
"0xb8b6f3fb67403c90652dc5f085ba4a62ab1ef5ce",
69+
"0x7ffc57839b00206d1ad20c69a1981b489f772031",
70+
"0x8b6f3fb67403c90652dc5f085ba4a62ab1ef5ce",
71+
"0x7fc57839b00206d1ad20c69a1981b489f772031",
72+
"0x1ffc57839b00206d1ad20c69a1981b489f772031",
73+
},
74+
{
75+
newEtherScanApi(EthNetwork.KOVAN),
76+
"0xde0eaa632f071069214f1c1ad7eb609ff8152dfe",
77+
"0x00e6d2b931f55a3f1701c7389d592a7778897879",
78+
"0xd0eaa632f071069214f1c1ad7eb609ff8152dfe",
79+
"0x0e6d2b931f55a3f1701c7389d592a7778897879",
80+
"0x10e6d2b931f55a3f1701c7389d592a7778897879",
81+
},
82+
});
83+
}
1984

2085
@Test
2186
publicvoidcorrect() {
22-
TokenBalancebalance =api.account().balance("0x5d807e7F124EC2103a59c5249187f772c0b8D6b2","0x5EaC95ad5b287cF44E058dCf694419333b796123");
87+
TokenBalancebalance =api.account().balance(addressValid,contractValid);
2388
assertNotNull(balance);
2489
assertNotNull(balance.getWei());
2590
assertNotNull(balance.getAddress());
@@ -29,26 +94,21 @@ public void correct() {
2994

3095
@Test(expected =InvalidAddressException.class)
3196
publicvoidinvalidAddressParamWithError() {
32-
Balancebalance =api.account().balance("5d807e7F124EC2103a59c5249187f772c0b8D6b2","0x5EaC95ad5b287cF44E058dCf694419333b796123");
97+
Balancebalance =api.account().balance(addressInvalid,contractValid);
3398
}
3499

35100
@Test(expected =InvalidAddressException.class)
36101
publicvoidinvalidContractParamWithError() {
37-
Balancebalance =api.account().balance("0x5d807e7F124EC2103a59c5249187f772c0b8D6b2","5EaC95ad5b287cF44E058dCf694419333b796123");
102+
Balancebalance =api.account().balance(addressValid,contractInvalid);
38103
}
39104

40105
@Test
41106
publicvoidcorrectParamWithEmptyExpectedResult() {
42-
TokenBalancebalance =api.account().balance("0x5d807e7F124EC2103a51c5249187f772c0b8D6b2","0x5EaC95ad5b287cF44E058dCf694419333b796123");
107+
TokenBalancebalance =api.account().balance(addressEmpty,contractValid);
43108
assertNotNull(balance);
44109
assertNotNull(balance.getWei());
45110
assertNotNull(balance.getAddress());
46111
assertNotNull(balance.getContract());
47112
assertEquals(0,balance.getWei().intValue());
48113
}
49-
50-
@Test
51-
publicvoiderrorStatusExpected() {
52-
53-
}
54114
}

‎src/test/java/io/api/etherscan/account/AccountTxInternalByHashTest.java‎

Lines changed: 58 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22

33
importio.api.etherscan.core.impl.EtherScanApi;
44
importio.api.etherscan.error.InvalidTxHashException;
5+
importio.api.etherscan.model.EthNetwork;
56
importio.api.etherscan.model.TxInternal;
67
importio.api.etherscan.util.BasicUtils;
78
importorg.junit.Assert;
89
importorg.junit.Test;
10+
importorg.junit.runner.RunWith;
11+
importorg.junit.runners.Parameterized;
12+
importorg.junit.runners.Parameterized.Parameters;
913

14+
importjava.util.Arrays;
15+
importjava.util.Collection;
1016
importjava.util.List;
1117

1218
/**
@@ -15,15 +21,62 @@
1521
* @author GoodforGod
1622
* @since 03.11.2018
1723
*/
24+
@RunWith(Parameterized.class)
1825
publicclassAccountTxInternalByHashTestextendsAssert {
1926

20-
privatefinalEtherScanApiapi =newEtherScanApi();
27+
privateEtherScanApiapi;
28+
privateinttxAmount;
29+
privateStringvalidTx;
30+
privateStringinvalidTx;
31+
privateStringemptyTx;
32+
33+
publicAccountTxInternalByHashTest(EtherScanApiapi,inttxAmount,StringvalidTx,StringinvalidTx,StringemptyTx) {
34+
this.api =api;
35+
this.txAmount =txAmount;
36+
this.validTx =validTx;
37+
this.invalidTx =invalidTx;
38+
this.emptyTx =emptyTx;
39+
}
40+
41+
@Parameters
42+
publicstaticCollectiondata() {
43+
returnArrays.asList(newObject[][]{
44+
{
45+
newEtherScanApi(),
46+
1,
47+
"0x1b513dd971aad228eb31f54489803639de167309ac72de68ecdaeb022a7ab42b",
48+
"0xb513dd971aad228eb31f54489803639de167309ac72de68ecdaeb022a7ab42b",
49+
"0x2b513dd971aad228eb31f54489803639de167309ac72de68ecdaeb022a7ab42b",
50+
},
51+
{
52+
newEtherScanApi(EthNetwork.ROPSTEN),
53+
1,
54+
"0x8bc5504517d40ad7b4f32d008d82436cc118e856593f61d23c70eec73c10322a",
55+
"0x8c5504517d40ad7b4f32d008d82436cc118e856593f61d23c70eec73c10322a",
56+
"0x7bc5504517d40ad7b4f32d008d82436cc118e856593f61d23c70eec73c10322a",
57+
},
58+
{
59+
newEtherScanApi(EthNetwork.RINKEBY),
60+
10,
61+
"0x4be697e735f594038e2e70e051948896bdfd6193fc399e38d6113e96f96e8567",
62+
"0x4e697e735f594038e2e70e051948896bdfd6193fc399e38d6113e96f96e8567",
63+
"0x3be697e735f594038e2e70e051948896bdfd6193fc399e38d6113e96f96e8567",
64+
},
65+
{
66+
newEtherScanApi(EthNetwork.KOVAN),
67+
1,
68+
"0x3b85c47f2a8c5efd639a85f5233097af834c9ab6ab7965cf7cfc3ab3c8bae285",
69+
"0x385c47f2a8c5efd639a85f5233097af834c9ab6ab7965cf7cfc3ab3c8bae285",
70+
"0x2b85c47f2a8c5efd639a85f5233097af834c9ab6ab7965cf7cfc3ab3c8bae285",
71+
},
72+
});
73+
}
2174

2275
@Test
2376
publicvoidcorrect() {
24-
List<TxInternal>txs =api.account().txsInternalByHash("0x1b513dd971aad228eb31f54489803639de167309ac72de68ecdaeb022a7ab42b");
77+
List<TxInternal>txs =api.account().txsInternalByHash(validTx);
2578
assertNotNull(txs);
26-
assertEquals(1,txs.size());
79+
assertEquals(txAmount,txs.size());
2780
assertTxs(txs);
2881
assertNotNull(txs.get(0).getFrom());
2982
assertNotNull(txs.get(0).getTimeStamp());
@@ -34,12 +87,12 @@ public void correct() {
3487

3588
@Test(expected =InvalidTxHashException.class)
3689
publicvoidinvalidParamWithError() {
37-
List<TxInternal>txs =api.account().txsInternalByHash("01b513dd971aad228eb31f54489803639de167309ac72de68ecdaeb022a7ab42b");
90+
List<TxInternal>txs =api.account().txsInternalByHash(invalidTx);
3891
}
3992

4093
@Test
4194
publicvoidcorrectParamWithEmptyExpectedResult() {
42-
List<TxInternal>txs =api.account().txsInternalByHash("0x2b513dd971aad228eb31f54489803639de167309ac72de68ecdaeb022a7ab42b");
95+
List<TxInternal>txs =api.account().txsInternalByHash(emptyTx);
4396
assertNotNull(txs);
4497
assertTrue(txs.isEmpty());
4598
}

‎src/test/java/io/api/etherscan/account/AccountTxInternalTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
publicclassAccountTxInternalTestextendsAssert {
1818

19-
privatefinalEtherScanApiapi =newEtherScanApi();
19+
privateEtherScanApiapi =newEtherScanApi();
2020

2121
@Test
2222
publicvoidcorrect() {

‎src/test/java/io/api/etherscan/proxy/ProxyTxSendRawApiTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
importio.api.etherscan.error.EtherScanException;
55
importio.api.etherscan.error.InvalidDataHexException;
66
importorg.junit.Assert;
7+
importorg.junit.Ignore;
78
importorg.junit.Test;
89

910
importjava.util.Optional;
@@ -14,7 +15,8 @@
1415
* @author GoodforGod
1516
* @since 03.11.2018
1617
*/
17-
//TODO contact etherscan and ask about methods
18+
@Ignore
19+
//TODO contact etherscan and ask about method behavior
1820
publicclassProxyTxSendRawApiTestextendsAssert {
1921

2022
privatefinalEtherScanApiapi =newEtherScanApi();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp