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

Commit9d1fa02

Browse files
committed
More code coverage improvements
1 parent406ddcc commit9d1fa02

19 files changed

+98
-102
lines changed

‎src/main/java/io/api/etherscan/App.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public void correct() {
3030
assertNotNull(balances);
3131
assertFalse(balances.isEmpty());
3232
assertEquals(2,balances.size());
33+
assertNotEquals(balances.get(0),balances.get(1));
34+
assertNotEquals(balances.get(0).hashCode(),balances.get(1).hashCode());
3335
for(Balancebalance :balances) {
3436
assertNotNull(balance.getAddress());
3537
assertNotNull(balance.getGwei());

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ public void correct() {
6969

7070
assertEquals(blocksMined,blocks.size());
7171
assertBlocks(blocks);
72-
Blockblock =newBlock();
73-
assertFalse(blocks.get(0).equals(block));
74-
assertNotNull(block.toString());
72+
assertNotNull(blocks.get(0).toString());
73+
74+
assertNotEquals(blocks.get(0),blocks.get(1));
75+
assertNotEquals(blocks.get(0).hashCode(),blocks.get(1).hashCode());
7576
}
7677

7778
@Test(expected =InvalidAddressException.class)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ public void correct() {
9494
assertNotNull(balance.toString());
9595

9696
TokenBalancebalance1 =newTokenBalance("",BigInteger.ONE,"");
97-
assertFalse(balance.equals(balance1));
98-
assertFalse(balance.hashCode() ==balance1.hashCode());
97+
assertNotEquals(balance,balance1);
98+
assertNotEquals(balance.hashCode(),balance1.hashCode());
9999

100100
TokenBalancebalance2 =newTokenBalance("125161",balance.getWei(),balance.getContract());
101-
assertFalse(balance.equals(balance2));
102-
assertFalse(balance.hashCode() ==balance2.hashCode());
101+
assertNotEquals(balance,balance2);
102+
assertNotEquals(balance.hashCode(),balance2.hashCode());
103103
}
104104

105105
@Test(expected =InvalidAddressException.class)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ public void correct() {
8888
assertNotEquals(-1,txs.get(0).getTraceId());
8989
assertTrue(BasicUtils.isEmpty(txs.get(0).getErrCode()));
9090
assertNotNull(txs.get(0).toString());
91+
92+
assertNotEquals(txs.get(0),txs.get(1));
93+
assertNotEquals(txs.get(0).hashCode(),txs.get(1).hashCode());
9194
}
9295

9396
@Test(expected =InvalidTxHashException.class)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public void correct() {
2525
assertEquals(8,txs.size());
2626
assertTxs(txs);
2727
assertNotNull(txs.get(0).toString());
28+
assertNotEquals(txs.get(0),txs.get(1));
29+
assertNotEquals(txs.get(0).hashCode(),txs.get(1).hashCode());
2830
}
2931

3032
@Test

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ public void correct() {
3535
assertNotNull(txs.get(0).getValue());
3636
assertNotNull(txs.get(0).getContractAddress());
3737
assertNotNull(txs.get(0).getInput());
38-
assertNotEquals(txs.get(0).hashCode(),txs.get(1).hashCode());
3938
assertNotNull(txs.get(0).toString());
39+
assertNotEquals(txs.get(0),txs.get(1));
40+
assertNotEquals(txs.get(0).hashCode(),txs.get(1).hashCode());
4041
}
4142

4243
@Test

‎src/test/java/io/api/etherscan/block/BlockApiTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ public void correct() {
3030
assertNotNull(uncles.get().getUncles().get(0).getMiner());
3131
assertNotNull(uncles.get().toString());
3232

33-
assertNotEquals(0,uncles.get().hashCode());
34-
3533
UncleBlockempty =newUncleBlock();
36-
assertFalse(uncles.get().equals(empty));
34+
assertNotEquals(empty.hashCode(),uncles.get().hashCode());
35+
assertNotEquals(uncles,empty);
3736
assertTrue(empty.isEmpty());
3837
}
3938

‎src/test/java/io/api/etherscan/contract/ContractApiTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ public void correct() {
2424
assertTrue(abi.haveAbi());
2525
assertNotNull(abi.getContractAbi());
2626
assertNotNull(abi.toString());
27+
28+
Abiempty =Abi.verified("asg");
29+
assertNotEquals(empty,abi);
30+
assertNotEquals(empty.hashCode(),abi.hashCode());
2731
}
2832

2933
@Test(expected =InvalidAddressException.class)
3034
publicvoidinvalidParamWithError() {
31-
Abiabi =api.contract().contractAbi("0xBBbc244D798123fDe783fCc1C72d3Bb8C189413");
35+
api.contract().contractAbi("0xBBbc244D798123fDe783fCc1C72d3Bb8C189413");
3236
}
3337

3438
@Test

‎src/test/java/io/api/etherscan/logs/LogQueryBuilderTest.java‎

Lines changed: 18 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,16 @@ public void singleCorrect() {
2828

2929
@Test(expected =InvalidAddressException.class)
3030
publicvoidsingleInCorrectAddress() {
31-
LogQuerysingle =LogQueryBuilder.with("033990122638b9132ca29c723bdf037f1a891a70c")
31+
LogQueryBuilder.with("033990122638b9132ca29c723bdf037f1a891a70c")
3232
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545")
3333
.build();
34-
35-
assertNotNull(single);
36-
assertNotNull(single.getParams());
3734
}
3835

3936
@Test(expected =LogQueryException.class)
4037
publicvoidsingleInCorrectTopic() {
41-
LogQuerysingle =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
38+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
4239
.topic("6516=")
4340
.build();
44-
45-
assertNotNull(single);
46-
assertNotNull(single.getParams());
4741
}
4842

4943
@Test
@@ -60,14 +54,11 @@ public void tupleCorrect() {
6054

6155
@Test(expected =LogQueryException.class)
6256
publicvoidtupleInCorrectOp() {
63-
LogQuerytuple =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224)
57+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224)
6458
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
6559
"0x72657075746174696f6e00000000000000000000000000000000000000000000")
6660
.setOpTopic0_1(null)
6761
.build();
68-
69-
assertNotNull(tuple);
70-
assertNotNull(tuple.getParams());
7162
}
7263

7364
@Test
@@ -87,62 +78,50 @@ public void tripleCorrect() {
8778

8879
@Test(expected =LogQueryException.class)
8980
publicvoidtripleInCorrectOp() {
90-
LogQuerytriple =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
81+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
9182
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
9283
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
9384
"0x72657075746174696f6e00000000000000000000000000000000000000000000")
9485
.setOpTopic0_1(LogOp.AND)
9586
.setOpTopic0_2(null)
9687
.setOpTopic1_2(LogOp.AND)
9788
.build();
98-
99-
assertNotNull(triple);
100-
assertNotNull(triple.getParams());
10189
}
10290

10391
@Test(expected =LogQueryException.class)
10492
publicvoidtripleInCorrectTopic1() {
105-
LogQuerytriple =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
93+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
10694
.topic(null,
10795
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
10896
"0x72657075746174696f6e00000000000000000000000000000000000000000000")
10997
.setOpTopic0_1(LogOp.AND)
11098
.setOpTopic0_2(null)
11199
.setOpTopic1_2(LogOp.AND)
112100
.build();
113-
114-
assertNotNull(triple);
115-
assertNotNull(triple.getParams());
116101
}
117102

118103
@Test(expected =LogQueryException.class)
119104
publicvoidtripleInCorrectTopic2() {
120-
LogQuerytriple =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
105+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
121106
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
122107
"null",
123108
"0x72657075746174696f6e00000000000000000000000000000000000000000000")
124109
.setOpTopic0_1(LogOp.AND)
125110
.setOpTopic0_2(null)
126111
.setOpTopic1_2(LogOp.AND)
127112
.build();
128-
129-
assertNotNull(triple);
130-
assertNotNull(triple.getParams());
131113
}
132114

133115
@Test(expected =LogQueryException.class)
134116
publicvoidtripleInCorrectTopic3() {
135-
LogQuerytriple =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
117+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c",379224,400000)
136118
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
137119
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
138120
"null")
139121
.setOpTopic0_1(LogOp.AND)
140122
.setOpTopic0_2(null)
141123
.setOpTopic1_2(LogOp.AND)
142124
.build();
143-
144-
assertNotNull(triple);
145-
assertNotNull(triple.getParams());
146125
}
147126

148127
@Test
@@ -166,7 +145,7 @@ public void quadroCorrect() {
166145

167146
@Test(expected =LogQueryException.class)
168147
publicvoidquadroIncorrectTopic2() {
169-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
148+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
170149
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
171150
null,
172151
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
@@ -178,38 +157,29 @@ public void quadroIncorrectTopic2() {
178157
.setOpTopic1_3(LogOp.OR)
179158
.setOpTopic2_3(LogOp.OR)
180159
.build();
181-
182-
assertNotNull(quadro);
183-
assertNotNull(quadro.getParams());
184160
}
185161

186162
@Test(expected =LogQueryException.class)
187163
publicvoidtupleIncorrectTopic2() {
188-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
164+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
189165
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
190166
null)
191167
.setOpTopic0_1(LogOp.AND)
192168
.build();
193-
194-
assertNotNull(quadro);
195-
assertNotNull(quadro.getParams());
196169
}
197170

198171
@Test(expected =LogQueryException.class)
199172
publicvoidtupleIncorrectTopic1() {
200-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
173+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
201174
.topic(null,
202175
"0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545")
203176
.setOpTopic0_1(LogOp.AND)
204177
.build();
205-
206-
assertNotNull(quadro);
207-
assertNotNull(quadro.getParams());
208178
}
209179

210180
@Test(expected =LogQueryException.class)
211181
publicvoidquadroIncorrectOp1() {
212-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
182+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
213183
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
214184
null,
215185
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
@@ -221,14 +191,11 @@ public void quadroIncorrectOp1() {
221191
.setOpTopic1_3(LogOp.OR)
222192
.setOpTopic2_3(LogOp.OR)
223193
.build();
224-
225-
assertNotNull(quadro);
226-
assertNotNull(quadro.getParams());
227194
}
228195

229196
@Test(expected =LogQueryException.class)
230197
publicvoidquadroIncorrectOp2() {
231-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
198+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
232199
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
233200
null,
234201
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
@@ -240,14 +207,11 @@ public void quadroIncorrectOp2() {
240207
.setOpTopic1_3(LogOp.OR)
241208
.setOpTopic2_3(LogOp.OR)
242209
.build();
243-
244-
assertNotNull(quadro);
245-
assertNotNull(quadro.getParams());
246210
}
247211

248212
@Test(expected =LogQueryException.class)
249213
publicvoidquadroIncorrectOp3() {
250-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
214+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
251215
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
252216
null,
253217
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
@@ -259,14 +223,11 @@ public void quadroIncorrectOp3() {
259223
.setOpTopic1_3(LogOp.OR)
260224
.setOpTopic2_3(LogOp.OR)
261225
.build();
262-
263-
assertNotNull(quadro);
264-
assertNotNull(quadro.getParams());
265226
}
266227

267228
@Test(expected =LogQueryException.class)
268229
publicvoidquadroInCorrectAgainTopic() {
269-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
230+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
270231
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
271232
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
272233
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
@@ -278,14 +239,11 @@ public void quadroInCorrectAgainTopic() {
278239
.setOpTopic1_3(LogOp.OR)
279240
.setOpTopic2_3(LogOp.OR)
280241
.build();
281-
282-
assertNotNull(quadro);
283-
assertNotNull(quadro.getParams());
284242
}
285243

286244
@Test(expected =LogQueryException.class)
287245
publicvoidquadroInCorrectOp4() {
288-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
246+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
289247
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
290248
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
291249
"",
@@ -297,14 +255,11 @@ public void quadroInCorrectOp4() {
297255
.setOpTopic1_3(LogOp.OR)
298256
.setOpTopic2_3(LogOp.OR)
299257
.build();
300-
301-
assertNotNull(quadro);
302-
assertNotNull(quadro.getParams());
303258
}
304259

305260
@Test(expected =LogQueryException.class)
306261
publicvoidquadroInCorrectOp5() {
307-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
262+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
308263
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
309264
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
310265
"",
@@ -316,14 +271,11 @@ public void quadroInCorrectOp5() {
316271
.setOpTopic1_3(null)
317272
.setOpTopic2_3(LogOp.OR)
318273
.build();
319-
320-
assertNotNull(quadro);
321-
assertNotNull(quadro.getParams());
322274
}
323275

324276
@Test(expected =LogQueryException.class)
325277
publicvoidquadroInCorrectOp6() {
326-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
278+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
327279
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
328280
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
329281
"",
@@ -335,14 +287,11 @@ public void quadroInCorrectOp6() {
335287
.setOpTopic1_3(LogOp.OR)
336288
.setOpTopic2_3(null)
337289
.build();
338-
339-
assertNotNull(quadro);
340-
assertNotNull(quadro.getParams());
341290
}
342291

343292
@Test(expected =LogQueryException.class)
344293
publicvoidquadroInCorrectTopic() {
345-
LogQueryquadro =LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
294+
LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
346295
.topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
347296
"0x72657075746174696f6e00000000000000000000000000000000000000000000",
348297
"",
@@ -354,8 +303,5 @@ public void quadroInCorrectTopic() {
354303
.setOpTopic1_3(LogOp.OR)
355304
.setOpTopic2_3(LogOp.OR)
356305
.build();
357-
358-
assertNotNull(quadro);
359-
assertNotNull(quadro.getParams());
360306
}
361307
}

0 commit comments

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