bean tests

Author: danielclasen

build.gradle

@@ -26,6 +26,8 @@ dependencies {
     testImplementation 'org.spockframework:spock-core:1.0-groovy-2.4'
     testImplementation 'junit:junit:4.12'
     testImplementation 'com.anotherchrisberry:spock-retry:0.6.3'
+    testImplementation 'org.meanbean:meanbean:2.0.3'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:2.4.6'
 }
 
 

src/main/java/cash/ird/walletd/model/body/Balance.java

@@ -1,12 +1,17 @@
 package cash.ird.walletd.model.body;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Data
+@NoArgsConstructor
 public class Balance {
 
-    private long lockedAmount;
+    @NonNull
+    private Long lockedAmount;
 
-    private long availableBalance;
+    @NonNull
+    private Long availableBalance;
 
 }

src/main/java/cash/ird/walletd/model/body/EstimatedFusion.java

@@ -5,8 +5,8 @@
 @Data
 public class EstimatedFusion {
 
-    private long totalOutputCount;
+    private Long totalOutputCount;
 
-    private long fusionReadyCount;
+    private Long fusionReadyCount;
 
 }

src/main/java/cash/ird/walletd/model/body/Status.java

@@ -5,12 +5,12 @@
 @Data
 public class Status {
 
-    private long peerCount;
+    private Long peerCount;
 
-    private long blockCount;
+    private Long blockCount;
 
     private String lastBlockHash;
 
-    private long knownBlockCount;
+    private Long knownBlockCount;
 
 }

src/main/java/cash/ird/walletd/model/body/Transaction.java

@@ -1,6 +1,7 @@
 package cash.ird.walletd.model.body;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.Data;
 
 import java.util.List;
@@ -10,21 +11,21 @@ public class Transaction {
 
     private String transactionHash;
 
-    private long blockIndex;
+    private Long blockIndex;
 
-    private long timestamp;
+    private Long timestamp;
 
     @JsonProperty("isBase")
-    private boolean isBase;
+    private Boolean isBase;
 
-    private long unlockTime;
+    private Long unlockTime;
 
-    private long amount;
+    private Long amount;
 
     // TODO: 13.05.18 what is this? It's not in the docs :(
-    private long state;
+    private Long state;
 
-    private long fee;
+    private Long fee;
 
     private String extra;
 

src/main/java/cash/ird/walletd/model/body/Transfer.java

@@ -11,9 +11,9 @@
 public class Transfer {
 
     @NonNull
-    private long amount;
+    private Long amount;
 
-    private int type;
+    private Integer type;
 
     @NonNull
     private String address;

src/main/java/cash/ird/walletd/model/request/BlockHashRange.java

@@ -1,15 +1,27 @@
 package cash.ird.walletd.model.request;
 
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 @ToString
 public class BlockHashRange extends BlockRange<String> {
 
+    @Getter
+    @Setter
+    private String start;
+
+    @Getter
+    @Setter
+    private long count;
+
+    @Getter
+    private final Type type = Type.HASH;
+
     private BlockHashRange(){
         super();
-        this.setType(Type.HASH);
     }
 
     public static BlockHashRange of(String start, long count) {
@@ -19,13 +31,6 @@ public static BlockHashRange of(String start, long count) {
         return blockHashRange;
     }
 
-    @Override
-    public String getStart() {
-        return this.start;
-    }
 
-    @Override
-    public void setStart(String start) {
-        this.start = start;
-    }
+
 }

src/main/java/cash/ird/walletd/model/request/BlockIndexRange.java

@@ -1,15 +1,25 @@
 package cash.ird.walletd.model.request;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+
 
-@Data
 @EqualsAndHashCode(callSuper = true)
+@ToString
 public class BlockIndexRange extends BlockRange<Long> {
 
+    @Getter
+    @Setter
+    private Long start;
+
+    @Getter
+    @Setter
+    private long count;
+
+    @Getter
+    private final Type type = Type.INDEX;
+
     private BlockIndexRange(){
         super();
-        this.setType(Type.INDEX);
     }
 
     public static BlockIndexRange of(long start, long count) {
@@ -18,14 +28,4 @@ public static BlockIndexRange of(long start, long count) {
         blockIndexRange.setCount(count);
         return blockIndexRange;
     }
-
-    @Override
-    public Long getStart() {
-        return this.start;
-    }
-
-    @Override
-    public void setStart(Long start) {
-        this.start = start;
-    }
 }

src/main/java/cash/ird/walletd/model/request/BlockRange.java

@@ -1,24 +1,21 @@
 package cash.ird.walletd.model.request;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
+@EqualsAndHashCode
 public abstract class BlockRange<T> {
 
-    protected T start;
+    public abstract T getStart();
 
-    @Getter
-    @Setter
-    protected long count;
+    public abstract void setStart(T start);
 
-    @Getter
-    @Setter
-    protected Type type;
+    public abstract long getCount();
 
+    public abstract void setCount(long count);
 
-    public abstract T getStart();
-
-    public abstract void setStart(T start);
+    public abstract Type getType();
 
     public enum Type {
         HASH("blockHash"),

src/main/java/cash/ird/walletd/model/request/Key.java

@@ -1,8 +1,10 @@
 package cash.ird.walletd.model.request;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode
 public abstract class Key {
 
     protected String value;

src/test/groovy/cash/ird/walletd/BeanSpec.groovy

@@ -0,0 +1,39 @@
+package cash.ird.walletd
+
+import nl.jqno.equalsverifier.EqualsVerifier
+import nl.jqno.equalsverifier.Warning
+import org.meanbean.test.BeanTester
+import spock.lang.Specification
+
+import java.lang.reflect.ParameterizedType
+
+abstract class BeanSpec<T> extends Specification {
+
+    Class<T> getBeanClass() {
+        return (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]
+    }
+
+    def "Check Bean Spec"() {
+        expect:
+        new BeanTester().testBean(getBeanClass())
+    }
+
+    def "equalsContract"() {
+        given:
+        def equalsVerifier = EqualsVerifier
+                .forClass(getBeanClass())
+                .suppress(Warning.STRICT_INHERITANCE)
+                .suppress(Warning.NONFINAL_FIELDS)
+
+        customizeEqualsVerifier(equalsVerifier)
+
+        expect:
+        equalsVerifier.verify()
+    }
+
+    @SuppressWarnings("GrMethodMayBeStatic")
+    protected <T> EqualsVerifier<T> customizeEqualsVerifier(EqualsVerifier<T> equalsVerifier){
+        return equalsVerifier
+    }
+
+}

src/test/groovy/cash/ird/walletd/model/body/BalanceTest.groovy

@@ -0,0 +1,7 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class BalanceTest extends BeanSpec<Balance> {
+
+}

src/test/groovy/cash/ird/walletd/model/body/EstimatedFusionTest.groovy

@@ -0,0 +1,6 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class EstimatedFusionTest extends BeanSpec<EstimatedFusion> {
+}

src/test/groovy/cash/ird/walletd/model/body/SpendKeyPairTest.groovy

@@ -0,0 +1,6 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class SpendKeyPairTest extends BeanSpec<SpendKeyPair> {
+}

src/test/groovy/cash/ird/walletd/model/body/StatusTest.groovy

@@ -0,0 +1,6 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class StatusTest extends BeanSpec<Status> {
+}

src/test/groovy/cash/ird/walletd/model/body/TransactionHashBagTest.groovy

@@ -0,0 +1,6 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class TransactionHashBagTest extends BeanSpec<TransactionHashBag> {
+}

src/test/groovy/cash/ird/walletd/model/body/TransactionItemBagTest.groovy

@@ -0,0 +1,6 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class TransactionItemBagTest extends BeanSpec<TransactionItemBag> {
+}

src/test/groovy/cash/ird/walletd/model/body/TransactionTest.groovy

@@ -0,0 +1,6 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class TransactionTest extends BeanSpec<Transaction> {
+}

src/test/groovy/cash/ird/walletd/model/body/TransferTest.groovy

@@ -0,0 +1,15 @@
+package cash.ird.walletd.model.body
+
+import cash.ird.walletd.BeanSpec
+
+class TransferTest extends BeanSpec<Transfer> {
+
+    def "reqArgsConstructor"() {
+        def address = "ir3abc..."
+        when:
+        def sut = Transfer.of(1000, address)
+        then:
+        sut.getAmount() == 1000
+        sut.getAddress() == address
+    }
+}

src/test/groovy/cash/ird/walletd/model/request/BlockHashRangeTest.groovy

@@ -0,0 +1,24 @@
+package cash.ird.walletd.model.request
+
+import cash.ird.walletd.BeanSpec
+import nl.jqno.equalsverifier.EqualsVerifier
+
+class BlockHashRangeTest extends BeanSpec<BlockHashRange> {
+
+    def "static constructor"() {
+        when:
+        def a = BlockHashRange.of("a", 1)
+        then:
+        a.getStart() == "a"
+        a.getCount() == 1
+        a.getType() == BlockRange.Type.HASH
+    }
+
+    @Override
+    protected <T> EqualsVerifier<T> customizeEqualsVerifier(EqualsVerifier<T> equalsVerifier) {
+        equalsVerifier
+                .withRedefinedSuperclass()
+
+        return super.customizeEqualsVerifier(equalsVerifier)
+    }
+}

src/test/groovy/cash/ird/walletd/model/request/BlockIndexRangeTest.groovy

@@ -0,0 +1,25 @@
+package cash.ird.walletd.model.request
+
+import cash.ird.walletd.BeanSpec
+import nl.jqno.equalsverifier.EqualsVerifier
+
+class BlockIndexRangeTest extends BeanSpec<BlockIndexRange> {
+
+    def "static constructor"() {
+        when:
+        def a = BlockIndexRange.of(0, 1)
+        then:
+        a.getStart() == 0
+        a.getCount() == 1
+        a.getType() == BlockRange.Type.INDEX
+    }
+
+    @Override
+    protected <T> EqualsVerifier<T> customizeEqualsVerifier(EqualsVerifier<T> equalsVerifier) {
+        equalsVerifier
+                .withRedefinedSuperclass()
+
+        return super.customizeEqualsVerifier(equalsVerifier)
+    }
+
+}