Code coverage improvements

GoodforGod · GoodforGod · commit 051bf293ea6d · 2018-11-13T01:36:04.000+03:00
README badges
diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
 # java-etherscan-api
 
+![travis](https://travis-ci.org/GoodforGod/java-etherscan-api.svg?branch=master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/808997be2e69ff1ae8fe/maintainability)](https://codeclimate.com/github/GoodforGod/java-etherscan-api/maintainability)
+[![codecov](https://codecov.io/gh/GoodforGod/java-etherscan-api/branch/master/graph/badge.svg)](https://codecov.io/gh/GoodforGod/java-etherscan-api)
+
 [Etherscan](https://etherscan.io/apis) Java API implementation.
 
 Library supports all available EtherScan *API* calls for all available *Ethereum Networks*.
diff --git a/src/main/java/io/api/etherscan/model/Supply.java b/src/main/java/io/api/etherscan/model/Supply.java
@@ -10,14 +10,6 @@
  */
 public class Supply extends Wei {
 
-    public Supply() {
-        super();
-    }
-
-    public Supply(long value) {
-        super(value);
-    }
-
     public Supply(BigInteger value) {
         super(value);
     }
diff --git a/src/test/java/io/api/etherscan/account/AccountBalanceListTest.java b/src/test/java/io/api/etherscan/account/AccountBalanceListTest.java
@@ -47,7 +47,13 @@ public void correctMoreThat20Addresses() {
         for(Balance balance : balances) {
             assertNotNull(balance.getAddress());
             assertNotEquals(0, balance.getWei());
+            assertNotEquals(0, balance.getKwei());
+            assertNotEquals(0, balance.getMwei());
+            assertNotEquals(0, balance.getEther());
+            assertNotEquals(0, balance.getGwei());
         }
+
+        assertFalse(balances.get(0).equals(balances.get(1)));
     }
 
     @Test(expected = InvalidAddressException.class)
diff --git a/src/test/java/io/api/etherscan/account/AccountMinedBlocksTest.java b/src/test/java/io/api/etherscan/account/AccountMinedBlocksTest.java
@@ -69,6 +69,8 @@ public void correct() {
 
         assertEquals(blocksMined, blocks.size());
         assertBlocks(blocks);
+        Block block = new Block();
+        assertFalse(blocks.get(0).equals(block));
     }
 
     @Test(expected = InvalidAddressException.class)
diff --git a/src/test/java/io/api/etherscan/account/AccountTokenBalanceTest.java b/src/test/java/io/api/etherscan/account/AccountTokenBalanceTest.java
@@ -11,6 +11,7 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -90,6 +91,9 @@ public void correct() {
         assertNotNull(balance.getAddress());
         assertNotNull(balance.getContract());
         assertNotEquals(0, balance.getWei());
+        TokenBalance balance1 = new TokenBalance("", BigInteger.ONE, "");
+        assertFalse(balance.equals(balance1));
+        assertFalse(balance.hashCode() == balance1.hashCode());
     }
 
     @Test(expected = InvalidAddressException.class)
diff --git a/src/test/java/io/api/etherscan/account/AccountTxInternalByHashTest.java b/src/test/java/io/api/etherscan/account/AccountTxInternalByHashTest.java
@@ -82,6 +82,10 @@ public void correct() {
         assertNotNull(txs.get(0).getTimeStamp());
         assertNotNull(txs.get(0).getGas());
         assertNotNull(txs.get(0).getValue());
+        assertNotNull(txs.get(0).getType());
+        assertFalse(txs.get(0).haveError());
+        assertFalse(txs.get(0).haveError());
+        assertNotEquals(-1, txs.get(0).getTraceId());
         assertTrue(BasicUtils.isEmpty(txs.get(0).getErrCode()));
     }
 
diff --git a/src/test/java/io/api/etherscan/account/AccountTxTokenTest.java b/src/test/java/io/api/etherscan/account/AccountTxTokenTest.java
@@ -62,6 +62,11 @@ private void assertTxs(List<TxToken> txs) {
             assertNotNull(tx.getFrom());
             assertNotNull(tx.getTo());
             assertNotNull(tx.getTimeStamp());
+            assertNotNull(tx.getTokenDecimal());
+            assertNotEquals(0,(tx.getConfirmations()));
+            assertNotNull(tx.getGasUsed());
+            assertNotEquals(0,(tx.getCumulativeGasUsed()));
+            assertNotEquals(0, tx.getTransactionIndex());
         }
     }
 }
diff --git a/src/test/java/io/api/etherscan/account/AccountTxsTest.java b/src/test/java/io/api/etherscan/account/AccountTxsTest.java
@@ -49,6 +49,7 @@ public void correctStartBlockEndBlock() {
         assertNotNull(txs);
         assertEquals(3, txs.size());
         assertTxs(txs);
+        assertFalse(txs.get(0).equals(txs.get(1)));
     }
 
     @Test(expected = InvalidAddressException.class)
@@ -65,10 +66,15 @@ public void correctParamWithEmptyExpectedResult() {
 
     private void assertTxs(List<Tx> txs) {
         for (Tx tx : txs) {
+            assertFalse(tx.haveError());
             assertNotNull(tx.getBlockHash());
             assertNotNull(tx.getFrom());
             assertNotNull(tx.getTo());
             assertNotNull(tx.getTimeStamp());
+            assertNotEquals(-1, (tx.getNonce()));
+            assertNotEquals(0, (tx.getTransactionIndex()));
+            assertNotEquals(0, tx.getConfirmations());
+            assertNotNull(tx.getTxreceipt_status());
         }
     }
 }
diff --git a/src/test/java/io/api/etherscan/block/BlockApiTest.java b/src/test/java/io/api/etherscan/block/BlockApiTest.java
@@ -28,6 +28,8 @@ public void correct() {
         assertFalse(uncles.get().getUncles().isEmpty());
         assertNotNull(uncles.get().getUncles().get(0).getBlockreward());
         assertNotNull(uncles.get().getUncles().get(0).getMiner());
+
+        assertNotEquals(0, uncles.get().hashCode());
     }
 
     @Test
diff --git a/src/test/java/io/api/etherscan/logs/LogQueryBuilderTest.java b/src/test/java/io/api/etherscan/logs/LogQueryBuilderTest.java
@@ -119,6 +119,45 @@ public void quadroCorrect() {
         assertNotNull(quadro.getParams());
     }
 
+    @Test(expected = LogQueryException.class)
+    public void quadroIncorrectTopic() {
+        LogQuery quadro = LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
+                .topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
+                        null,
+                        "0x72657075746174696f6e00000000000000000000000000000000000000000000",
+                        "0x72657075746174696f6e00000000000000000000000000000000000000000000")
+                .setOpTopic0_1(LogOp.AND)
+                .setOpTopic0_2(LogOp.OR)
+                .setOpTopic0_3(LogOp.AND)
+                .setOpTopic1_2(LogOp.OR)
+                .setOpTopic1_3(LogOp.OR)
+                .setOpTopic2_3(LogOp.OR)
+                .build();
+
+        assertNotNull(quadro);
+        assertNotNull(quadro.getParams());
+    }
+
+
+    @Test(expected = LogQueryException.class)
+    public void quadroInCorrectAgainTopic() {
+        LogQuery quadro = LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
+                .topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
+                        "0x72657075746174696f6e00000000000000000000000000000000000000000000",
+                        "0x72657075746174696f6e00000000000000000000000000000000000000000000",
+                        null)
+                .setOpTopic0_1(LogOp.AND)
+                .setOpTopic0_2(LogOp.OR)
+                .setOpTopic0_3(LogOp.AND)
+                .setOpTopic1_2(LogOp.OR)
+                .setOpTopic1_3(LogOp.OR)
+                .setOpTopic2_3(LogOp.OR)
+                .build();
+
+        assertNotNull(quadro);
+        assertNotNull(quadro.getParams());
+    }
+
     @Test(expected = LogQueryException.class)
     public void quadroInCorrectOp() {
         LogQuery quadro = LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
diff --git a/src/test/java/io/api/etherscan/logs/LogsApiTest.java b/src/test/java/io/api/etherscan/logs/LogsApiTest.java
@@ -76,6 +76,9 @@ public void validateQuery() {
             assertNotNull(logs.get(0).getTransactionHash());
             assertNotEquals(0, logs.get(0).getTransactionIndex());
             assertNotNull(logs.get(0).getGasUsed());
+            assertNotNull(logs.get(0).getTopics());
+            assertNotEquals(0, logs.get(0).getLogIndex());
+            assertNotNull(logs.get(0).getGasPrice());
         }
     }
 }
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxApiTest.java
@@ -38,6 +38,15 @@ public void correctByBlockNo() {
         assertNotNull(tx.get().getTo());
         assertNotNull(tx.get().getHash());
         assertNotNull(tx.get().getNonce());
+        assertNotNull(tx.get().getS());
+        assertNotNull(tx.get().getR());
+        assertNotNull(tx.get().getValue());
+        assertNotNull(tx.get().getV());
+        assertNotNull(tx.get().getGas());
+        assertNotNull(tx.get().getGasPrice());
+        assertNotNull(tx.get().getBlockHash());
+        assertNotNull(tx.get().getTransactionIndex());
+        assertNotNull(tx.get().getInput());
     }
 
     @Test(expected = InvalidTxHashException.class)
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxReceiptApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxReceiptApiTest.java
@@ -22,6 +22,19 @@ public class ProxyTxReceiptApiTest extends Assert {
     public void correct() {
         Optional<ReceiptProxy> infoProxy = api.proxy().txReceipt("0x1e2910a262b1008d0616a0beb24c1a491d78771baa54a33e66065e03b1f46bc1");
         assertTrue(infoProxy.isPresent());
+        assertNotNull(infoProxy.get().getBlockHash());
+        assertNotNull(infoProxy.get().getRoot());
+        assertNotNull(infoProxy.get().getFrom());
+        assertNotNull(infoProxy.get().getTo());
+        assertNotNull(infoProxy.get().getBlockNumber());
+        assertNotNull(infoProxy.get().getBlockHash());
+        assertNotNull(infoProxy.get().getTransactionHash());
+        assertNotNull(infoProxy.get().getTransactionIndex());
+        assertNotNull(infoProxy.get().getGasUsed());
+        assertNotNull(infoProxy.get().getCumulativeGasUsed());
+        assertNotNull(infoProxy.get().getLogs());
+        assertNotNull(infoProxy.get().getLogsBloom());
+        assertNull(infoProxy.get().getContractAddress());
     }
 
     @Test(expected = InvalidTxHashException.class)
diff --git a/src/test/java/io/api/etherscan/transaction/TransactionExecApiTest.java b/src/test/java/io/api/etherscan/transaction/TransactionExecApiTest.java
@@ -23,6 +23,7 @@ public void correct() {
         Optional<Status> status = api.txs().execStatus("0x15f8e5ea1079d9a0bb04a4c58ae5fe7654b5b2b4463375ff7ffb490aa0032f3a");
         assertTrue(status.isPresent());
         assertTrue(status.get().haveError());
+        assertNotNull(status.get().getErrDescription());
     }
 
     @Test(expected = InvalidTxHashException.class)

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,13 @@ public void correctMoreThat20Addresses() {`
`47`	`47`	`for(Balance balance : balances) {`
`48`	`48`	`assertNotNull(balance.getAddress());`
`49`	`49`	`assertNotEquals(0, balance.getWei());`
	`50`	`+ assertNotEquals(0, balance.getKwei());`
	`51`	`+ assertNotEquals(0, balance.getMwei());`
	`52`	`+ assertNotEquals(0, balance.getEther());`
	`53`	`+ assertNotEquals(0, balance.getGwei());`
`50`	`54`	`}`
	`55`	`+`
	`56`	`+ assertFalse(balances.get(0).equals(balances.get(1)));`
`51`	`57`	`}`
`52`	`58`
`53`	`59`	`@Test(expected = InvalidAddressException.class)`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ public void correct() {`
`69`	`69`
`70`	`70`	`assertEquals(blocksMined, blocks.size());`
`71`	`71`	`assertBlocks(blocks);`
	`72`	`+ Block block = new Block();`
	`73`	`+ assertFalse(blocks.get(0).equals(block));`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`@Test(expected = InvalidAddressException.class)`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,11 @@ private void assertTxs(List<TxToken> txs) {`
`62`	`62`	`assertNotNull(tx.getFrom());`
`63`	`63`	`assertNotNull(tx.getTo());`
`64`	`64`	`assertNotNull(tx.getTimeStamp());`
	`65`	`+ assertNotNull(tx.getTokenDecimal());`
	`66`	`+ assertNotEquals(0,(tx.getConfirmations()));`
	`67`	`+ assertNotNull(tx.getGasUsed());`
	`68`	`+ assertNotEquals(0,(tx.getCumulativeGasUsed()));`
	`69`	`+ assertNotEquals(0, tx.getTransactionIndex());`
`65`	`70`	`}`
`66`	`71`	`}`
`67`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public void correctStartBlockEndBlock() {`
`49`	`49`	`assertNotNull(txs);`
`50`	`50`	`assertEquals(3, txs.size());`
`51`	`51`	`assertTxs(txs);`
	`52`	`+ assertFalse(txs.get(0).equals(txs.get(1)));`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`@Test(expected = InvalidAddressException.class)`
`@@ -65,10 +66,15 @@ public void correctParamWithEmptyExpectedResult() {`
`65`	`66`
`66`	`67`	`private void assertTxs(List<Tx> txs) {`
`67`	`68`	`for (Tx tx : txs) {`
	`69`	`+ assertFalse(tx.haveError());`
`68`	`70`	`assertNotNull(tx.getBlockHash());`
`69`	`71`	`assertNotNull(tx.getFrom());`
`70`	`72`	`assertNotNull(tx.getTo());`
`71`	`73`	`assertNotNull(tx.getTimeStamp());`
	`74`	`+ assertNotEquals(-1, (tx.getNonce()));`
	`75`	`+ assertNotEquals(0, (tx.getTransactionIndex()));`
	`76`	`+ assertNotEquals(0, tx.getConfirmations());`
	`77`	`+ assertNotNull(tx.getTxreceipt_status());`
`72`	`78`	`}`
`73`	`79`	`}`
`74`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ public void correct() {`
`28`	`28`	`assertFalse(uncles.get().getUncles().isEmpty());`
`29`	`29`	`assertNotNull(uncles.get().getUncles().get(0).getBlockreward());`
`30`	`30`	`assertNotNull(uncles.get().getUncles().get(0).getMiner());`
	`31`	`+`
	`32`	`+ assertNotEquals(0, uncles.get().hashCode());`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`@Test`