test Gas, Message, Miner and NetInfo Class

diff --git a/.gitignore b/.gitignore
index 2e653db..f2d2e8a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.iml
 target/
 bytom.log
+javadoc/

diff --git a/src/main/java/io/bytom/api/Message.java b/src/main/java/io/bytom/api/Message.java
index b55da44..4ce1e70 100644 (file)
--- a/src/main/java/io/bytom/api/Message.java
+++ b/src/main/java/io/bytom/api/Message.java
@@ -111,8 +111,7 @@ public class Message {
         public Boolean verifyMessage(Client client) throws BytomException {
             Boolean result = client.requestGet("verify-message", this, "result", Boolean.class);
 
-            logger.info("verify-message:");
-            logger.info(result);
+            logger.info("verify-message:"+result);
 
             return result;
         }

diff --git a/src/main/java/io/bytom/api/Miner.java b/src/main/java/io/bytom/api/Miner.java
index c177f3f..7f30da7 100644 (file)
--- a/src/main/java/io/bytom/api/Miner.java
+++ b/src/main/java/io/bytom/api/Miner.java
@@ -20,8 +20,11 @@ public class Miner {
      * @return
      * @throws BytomException
      */
-    public static boolean isMining(Client client) throws BytomException {
-        return client.requestGet("is-mining", null, "is_mining", Boolean.class);
+    public static Boolean isMining(Client client) throws BytomException {
+        Boolean isMining = client.requestGet("is-mining", null, "is_mining", Boolean.class);
+
+        logger.info("is-mining:"+isMining);
+        return isMining;
     }
 
     /**

diff --git a/src/test/java/io/bytom/integration/GasTest.java b/src/test/java/io/bytom/integration/GasTest.java
new file mode 100644 (file)
index 0000000..d5a87a8
--- /dev/null
+++ b/src/test/java/io/bytom/integration/GasTest.java
@@ -0,0 +1,31 @@
+package io.bytom.integration;
+
+import io.bytom.TestUtils;
+import io.bytom.api.Gas;
+import io.bytom.api.Wallet;
+import io.bytom.exception.BytomException;
+import io.bytom.http.Client;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class GasTest {
+
+    static Client client;
+
+    static {
+        try {
+            client = TestUtils.generateClient();
+        } catch (BytomException e) {
+            e.printStackTrace();
+        }
+    }
+
+    static Gas gas;
+
+    @Test
+    public void testWalletBackUp() throws Exception {
+        gas = Gas.gasRate(client);
+        Assert.assertNotNull(gas);
+    }
+
+}

diff --git a/src/test/java/io/bytom/integration/MessageTest.java b/src/test/java/io/bytom/integration/MessageTest.java
index c0d9e5d..8f30c6e 100644 (file)
--- a/src/test/java/io/bytom/integration/MessageTest.java
+++ b/src/test/java/io/bytom/integration/MessageTest.java
@@ -7,6 +7,7 @@ import io.bytom.api.Message;
 import io.bytom.api.Wallet;
 import io.bytom.exception.BytomException;
 import io.bytom.http.Client;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
@@ -28,20 +29,26 @@ public class MessageTest {
     @Test
     public void testMessageSign() throws Exception {
 
-        String id = "0E6K7AFF00A02";
-        String alias = "test";
-        Account.AddressBuilder addressBuilder = new Account.AddressBuilder()
-                                                            .setAccountId(id)
-                                                            .setAccountAlias(alias);
-        List<Address> addressList = addressBuilder.list(client);
-
-        String address = addressList.get(0).address;
-
         message = new Message.SignBuilder()
                     .setAddress("sm1qz2j8k5anh0d0nu63pcwccxwkn7qu4y2zjwaj5h")
-                    .setMessage("this is a test message")
+                    .setMessage("test")
                     .setPassword("123456")
                     .sign(client);
+
+        Assert.assertNotNull(message);
+    }
+
+    @Test
+    public void testMessageVerify() throws Exception {
+        String derived_xpub = "6e1efce70e2b29efa348aec7c148edc2beb72edc0d4422a03cfb0f40e6e4cfc6e6050b5863bbe84c44131280dff68614e0308a4d081e8b677d0f7f09fb3390c4";
+        String signature = "0d840d5b6a6df028013260e94e871c1443686c446a65db4ee93005c5395c3607feb0ac5bf583a3139c8a3d0afe757448ff49fa17ffd2377831ce5f925c846b0b";
+
+        Boolean verify = new Message.VerifyBuilder()
+                    .setDerivedXpub(derived_xpub)
+                    .setSignature(signature)
+                    .setAddress("sm1qz2j8k5anh0d0nu63pcwccxwkn7qu4y2zjwaj5h")
+                    .setMessage("test")
+                    .verifyMessage(client);
     }
 
 

diff --git a/src/test/java/io/bytom/integration/MinerTest.java b/src/test/java/io/bytom/integration/MinerTest.java
new file mode 100644 (file)
index 0000000..1d88ff8
--- /dev/null
+++ b/src/test/java/io/bytom/integration/MinerTest.java
@@ -0,0 +1,42 @@
+package io.bytom.integration;
+
+import io.bytom.TestUtils;
+import io.bytom.api.Miner;
+import io.bytom.api.Wallet;
+import io.bytom.exception.BytomException;
+import io.bytom.http.Client;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class MinerTest {
+
+    static Client client;
+
+    static {
+        try {
+            client = TestUtils.generateClient();
+        } catch (BytomException e) {
+            e.printStackTrace();
+        }
+    }
+
+    static Miner miner;
+
+    @Test
+    public void testIsMining() throws Exception {
+        Boolean isMining = Miner.isMining(client);
+        Assert.assertEquals(false, isMining);
+    }
+
+    @Test
+    public void testSetMining() throws Exception {
+        Miner.setMining(client, false);
+
+        Boolean isMining = Miner.isMining(client);
+        Assert.assertEquals(false, isMining);
+    }
+
+
+
+
+}

diff --git a/src/test/java/io/bytom/integration/NetInfoTest.java b/src/test/java/io/bytom/integration/NetInfoTest.java
new file mode 100644 (file)
index 0000000..cb095cc
--- /dev/null
+++ b/src/test/java/io/bytom/integration/NetInfoTest.java
@@ -0,0 +1,33 @@
+package io.bytom.integration;
+
+import io.bytom.TestUtils;
+import io.bytom.api.NetInfo;
+import io.bytom.exception.BytomException;
+import io.bytom.http.Client;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NetInfoTest {
+
+    static Client client;
+
+    static {
+        try {
+            client = TestUtils.generateClient();
+        } catch (BytomException e) {
+            e.printStackTrace();
+        }
+    }
+
+    static NetInfo netInfo;
+
+
+    @Test
+    public void testNetInfo() throws Exception {
+        netInfo = NetInfo.getNetInfo(client);
+        Assert.assertNotNull(netInfo);
+    }
+
+
+
+}