add more tests

Author: tempofeng

etherspace-java/src/test/java/cc/etherspace/GreeterTest.kt

@@ -75,8 +75,15 @@ class GreeterTest {
 
     @Test
     fun newGreeting_transactionHash() {
-        val transactionHash = greeter.newGreeting_transactionHash("Hello World")
-        transactionHash.hash.length.`should be equal to`(66)
+        val hash = greeter.newGreeting_transactionHash("Hello World")
+        hash.hash.length.`should be equal to`(66)
+
+        val receipt = hash.requestTransactionReceipt<TransactionReceipt>()
+        receipt.blockHash.length.`should be equal to`(66)
+        receipt.transactionHash.length.`should be equal to`(66)
+        receipt.from!!.`should be equal to`(Tests.TEST_WALLET_ADDRESS)
+        receipt.to!!.`should be equal to`(Tests.TEST_CONTRACT_ADDRESS)
+        receipt.logs.size.`should be greater than`(0)
     }
 
     @Test

etherspace-java/src/test/java/cc/etherspace/JavaGreeter.java

@@ -10,6 +10,9 @@ public interface JavaGreeter {
     @Send
     TransactionReceipt newGreeting(String greeting, Options options) throws IOException;
 
+    @Send(functionName = "newGreeting")
+    TransactionHash newGreeting_transactionHash(String greeting);
+
     @Call
     String greet();
 

etherspace-java/src/test/java/cc/etherspace/JavaGreeterTest.java

@@ -57,4 +57,17 @@ public void newGreeting() {
     public void newGreeting_options() throws Exception {
         greeter.newGreeting("Hello World", new Options(BigInteger.ZERO, BigInteger.valueOf(44_000_000_000L)));
     }
+
+    @Test
+    public void newGreeting_transactionHash() {
+        TransactionHash hash = greeter.newGreeting_transactionHash("Hello World");
+        assertThat(hash.getHash().length()).isEqualTo(66);
+
+        TransactionReceipt receipt = hash.requestTransactionReceipt();
+        assertThat(receipt.getBlockHash().length()).isEqualTo(66);
+        assertThat(receipt.getTransactionHash().length()).isEqualTo(66);
+        assertThat(receipt.getFrom()).isEqualTo(Tests.TEST_WALLET_ADDRESS);
+        assertThat(receipt.getTo()).isEqualTo(Tests.TEST_CONTRACT_ADDRESS);
+        assertThat(receipt.getLogs().size()).isGreaterThan(0);
+    }
 }

etherspace-java/src/test/java/cc/etherspace/calladapter/CompletableFutureGreeter.java

@@ -13,6 +13,9 @@ public interface CompletableFutureGreeter {
     @Send
     CompletableFuture<TransactionReceipt> newGreeting(String greeting, Options options) throws IOException;
 
+    @Send(functionName = "newGreeting")
+    CompletableFuture<TransactionHash> newGreeting_transactionHash(String greeting) throws IOException;
+
     @Call
     CompletableFuture<String> greet() throws IOException;
 

etherspace-java/src/test/java/cc/etherspace/calladapter/CompletableFutureGreeterTest.java

@@ -1,14 +1,24 @@
 package cc.etherspace.calladapter;
 
-import cc.etherspace.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.web3j.utils.Numeric;
 
 import java.math.BigInteger;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 
+import cc.etherspace.Credentials;
+import cc.etherspace.EtherSpace;
+import cc.etherspace.Event;
+import cc.etherspace.JavaGreeter;
+import cc.etherspace.Options;
+import cc.etherspace.SolBytes32;
+import cc.etherspace.Tests;
+import cc.etherspace.TransactionHash;
+import cc.etherspace.TransactionReceipt;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class CompletableFutureGreeterTest {
@@ -61,4 +71,17 @@ public void newGreeting_options() throws Exception {
         TransactionReceipt receipt = greeter.newGreeting("Hello World", new Options(BigInteger.ZERO, BigInteger.valueOf(44_000_000_000L))).join();
         assertThat(receipt.getTransactionHash().length()).isEqualTo(66);
     }
+
+    @Test
+    public void newGreeting_transactionHash() throws Exception {
+        TransactionHash hash = greeter.newGreeting_transactionHash("Hello World").join();
+        assertThat(hash.getHash().length()).isEqualTo(66);
+        TransactionReceipt receipt = hash.<CompletableFuture<TransactionReceipt>>requestTransactionReceipt().join();
+
+        assertThat(receipt.getBlockHash().length()).isEqualTo(66);
+        assertThat(receipt.getTransactionHash().length()).isEqualTo(66);
+        assertThat(receipt.getFrom()).isEqualTo(Tests.TEST_WALLET_ADDRESS);
+        assertThat(receipt.getTo()).isEqualTo(Tests.TEST_CONTRACT_ADDRESS);
+        assertThat(receipt.getLogs().size()).isGreaterThan(0);
+    }
 }

etherspace-java/src/test/java/cc/etherspace/calladapter/RxJavaGreeter.java

@@ -12,6 +12,9 @@ public interface RxJavaGreeter {
     @Send
     Observable<TransactionReceipt> newGreeting(String greeting, Options options);
 
+    @Send(functionName = "newGreeting")
+    Observable<TransactionHash> newGreeting_transactionHash(String greeting);
+
     @Call
     Observable<String> greet();
 

etherspace-java/src/test/java/cc/etherspace/calladapter/RxJavaGreeterTest.java

@@ -1,15 +1,25 @@
 package cc.etherspace.calladapter;
 
-import cc.etherspace.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.web3j.utils.Numeric;
-import rx.observers.TestSubscriber;
 
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
 
+import cc.etherspace.Credentials;
+import cc.etherspace.EtherSpace;
+import cc.etherspace.Event;
+import cc.etherspace.JavaGreeter;
+import cc.etherspace.Options;
+import cc.etherspace.SolBytes32;
+import cc.etherspace.Tests;
+import cc.etherspace.TransactionHash;
+import cc.etherspace.TransactionReceipt;
+import rx.Observable;
+import rx.observers.TestSubscriber;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RxJavaGreeterTest {
@@ -77,4 +87,30 @@ public void newGreeting_options() {
         greeter.newGreeting("Hello World", new Options(BigInteger.ZERO, BigInteger.valueOf(44_000_000_000L))).subscribe(subscriber);
         subscriber.assertError(IOException.class);
     }
+
+
+    @Test
+    public void newGreeting_transactionHash() {
+        TestSubscriber<TransactionHash> s1 = new TestSubscriber<>();
+        greeter.newGreeting_transactionHash("Hello World").subscribe(s1);
+
+        s1.assertCompleted();
+        s1.assertNoErrors();
+        s1.assertValueCount(1);
+        TransactionHash hash = s1.getOnNextEvents().get(0);
+        assertThat(hash.getHash().length()).isEqualTo(66);
+
+        TestSubscriber<TransactionReceipt> s2 = new TestSubscriber<>();
+        hash.<Observable<TransactionReceipt>>requestTransactionReceipt().subscribe(s2);
+
+        s2.assertCompleted();
+        s2.assertNoErrors();
+        s2.assertValueCount(1);
+        TransactionReceipt receipt = s2.getOnNextEvents().get(0);
+        assertThat(receipt.getBlockHash().length()).isEqualTo(66);
+        assertThat(receipt.getTransactionHash().length()).isEqualTo(66);
+        assertThat(receipt.getFrom()).isEqualTo(Tests.TEST_WALLET_ADDRESS);
+        assertThat(receipt.getTo()).isEqualTo(Tests.TEST_CONTRACT_ADDRESS);
+        assertThat(receipt.getLogs().size()).isGreaterThan(0);
+    }
 }