Test coverage improvement

GoodforGod · GoodforGod · commit 48d4aa40c13c · 2018-11-13T01:14:35.000+03:00
Proxy block uncle fix
diff --git a/src/main/java/io/api/etherscan/App.java b/src/main/java/io/api/etherscan/App.java
@@ -1,19 +1,7 @@
 package io.api.etherscan;
 
-import io.api.etherscan.core.impl.EtherScanApi;
-import io.api.etherscan.executor.IHttpExecutor;
-import io.api.etherscan.executor.impl.HttpExecutor;
-import io.api.etherscan.model.EthNetwork;
-
-import java.util.function.Supplier;
-
 public class App {
     public static void main(String[] args) {
-        int connectionTimeout = 10000;
-        int readTimeout = 7000;
-        Supplier<IHttpExecutor> supplier = () -> new HttpExecutor(connectionTimeout);
 
-        EtherScanApi api = new EtherScanApi(EthNetwork.RINKEBY, supplier);
-        EtherScanApi apiWithKey = new EtherScanApi("YourApiKey", EthNetwork.MAINNET, supplier);
     }
 }
diff --git a/src/main/java/io/api/etherscan/core/impl/ProxyApiProvider.java b/src/main/java/io/api/etherscan/core/impl/ProxyApiProvider.java
@@ -86,7 +86,8 @@ public Optional<BlockProxy> blockUncle(final long blockNo, final long index) thr
         final long compBlockNo = BasicUtils.compensateMinBlock(blockNo);
         final long compIndex = BasicUtils.compensateMinBlock(index);
 
-        final String urlParams = ACT_UNCLE_BY_BLOCKNOINDEX_PARAM + TAG_PARAM + compBlockNo + INDEX_PARAM + compIndex;
+        final String urlParams = ACT_UNCLE_BY_BLOCKNOINDEX_PARAM + TAG_PARAM
+                + "0x" + Long.toHexString(compBlockNo) + INDEX_PARAM + "0x" + Long.toHexString(compIndex);
         final BlockProxyTO response = getRequest(urlParams, BlockProxyTO.class);
         return Optional.ofNullable(response.getResult());
     }
diff --git a/src/main/java/io/api/etherscan/error/InvalidDataHexException.java b/src/main/java/io/api/etherscan/error/InvalidDataHexException.java
@@ -11,8 +11,4 @@ public class InvalidDataHexException extends ApiException {
     public InvalidDataHexException(String message) {
         super(message);
     }
-
-    public InvalidDataHexException(String message, Throwable cause) {
-        super(message, cause);
-    }
 }
diff --git a/src/main/java/io/api/etherscan/error/InvalidTxHashException.java b/src/main/java/io/api/etherscan/error/InvalidTxHashException.java
@@ -11,8 +11,4 @@ public class InvalidTxHashException extends ApiException {
     public InvalidTxHashException(String message) {
         super(message);
     }
-
-    public InvalidTxHashException(String message, Throwable cause) {
-        super(message, cause);
-    }
 }
diff --git a/src/main/java/io/api/etherscan/error/ParseException.java b/src/main/java/io/api/etherscan/error/ParseException.java
@@ -8,10 +8,6 @@
  */
 public class ParseException extends ApiException {
 
-    public ParseException(String message) {
-        super(message);
-    }
-
     public ParseException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/src/test/java/io/api/etherscan/EtherScanApiTest.java b/src/test/java/io/api/etherscan/EtherScanApiTest.java
@@ -51,7 +51,7 @@ public void nullNetwork() {
 
     @Test(expected = ApiTimeoutException.class)
     public void timeout() {
-        Supplier<IHttpExecutor> supplier = () -> new HttpExecutor(1000, 1000);
+        Supplier<IHttpExecutor> supplier = () -> new HttpExecutor(300, 300);
         EtherScanApi api = new EtherScanApi(EthNetwork.KOVAN, supplier);
         List<Block> blocks = api.account().minedBlocks("0x0010f94b296A852aAac52EA6c5Ac72e03afD032D");
         assertNotNull(api);
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyBlockLastNoApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyBlockLastNoApiTest.java
@@ -0,0 +1,22 @@
+package io.api.etherscan.proxy;
+
+import io.api.etherscan.core.impl.EtherScanApi;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 13.11.2018
+ */
+public class ProxyBlockLastNoApiTest extends Assert {
+
+    private final EtherScanApi api = new EtherScanApi();
+
+    @Test
+    public void correct() {
+        long noLast = api.proxy().blockNoLast();
+        assertNotEquals(0, noLast);
+    }
+}
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyBlockUncleApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyBlockUncleApiTest.java
@@ -0,0 +1,38 @@
+package io.api.etherscan.proxy;
+
+import io.api.etherscan.core.impl.EtherScanApi;
+import io.api.etherscan.model.proxy.BlockProxy;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Optional;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 13.11.2018
+ */
+public class ProxyBlockUncleApiTest extends Assert {
+
+    private final EtherScanApi api = new EtherScanApi();
+
+    @Test
+    public void correct() {
+        Optional<BlockProxy> block = api.proxy().blockUncle(603183, 0);
+        assertTrue(block.isPresent());
+        assertNotNull(block.get().getHash());
+    }
+
+    @Test
+    public void correctParamWithEmptyExpectedResult() {
+        Optional<BlockProxy> block = api.proxy().blockUncle(5120, 1);
+        assertFalse(block.isPresent());
+    }
+
+    @Test
+    public void correctParamNegativeNo() {
+        Optional<BlockProxy> block = api.proxy().blockUncle(-603183, 0);
+        assertFalse(block.isPresent());
+    }
+}
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxSendRawApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxSendRawApiTest.java
@@ -4,7 +4,6 @@
 import io.api.etherscan.error.EtherScanException;
 import io.api.etherscan.error.InvalidDataHexException;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Optional;
@@ -15,7 +14,6 @@
  * @author GoodforGod
  * @since 03.11.2018
  */
-@Ignore
 //TODO contact etherscan and ask about method behavior
 public class ProxyTxSendRawApiTest extends Assert {
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ public Optional<BlockProxy> blockUncle(final long blockNo, final long index) thr`
`86`	`86`	`final long compBlockNo = BasicUtils.compensateMinBlock(blockNo);`
`87`	`87`	`final long compIndex = BasicUtils.compensateMinBlock(index);`
`88`	`88`
`89`		`- final String urlParams = ACT_UNCLE_BY_BLOCKNOINDEX_PARAM + TAG_PARAM + compBlockNo + INDEX_PARAM + compIndex;`
	`89`	`+ final String urlParams = ACT_UNCLE_BY_BLOCKNOINDEX_PARAM + TAG_PARAM`
	`90`	`+ + "0x" + Long.toHexString(compBlockNo) + INDEX_PARAM + "0x" + Long.toHexString(compIndex);`
`90`	`91`	`final BlockProxyTO response = getRequest(urlParams, BlockProxyTO.class);`
`91`	`92`	`return Optional.ofNullable(response.getResult());`
`92`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,4 @@ public class InvalidDataHexException extends ApiException {`
`11`	`11`	`public InvalidDataHexException(String message) {`
`12`	`12`	`super(message);`
`13`	`13`	`}`
`14`		`-`
`15`		`- public InvalidDataHexException(String message, Throwable cause) {`
`16`		`- super(message, cause);`
`17`		`- }`
`18`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,4 @@ public class InvalidTxHashException extends ApiException {`
`11`	`11`	`public InvalidTxHashException(String message) {`
`12`	`12`	`super(message);`
`13`	`13`	`}`
`14`		`-`
`15`		`- public InvalidTxHashException(String message, Throwable cause) {`
`16`		`- super(message, cause);`
`17`		`- }`
`18`	`14`	`}`