Merge pull request #127 from proximax-storage/issue/mosaic_prop_build…

…er_init fixed initialization of mosaic account property builder
proximax-storage · Sep 25, 2019 · a8bc00a · a8bc00a
2 parents 09da701 + 881a356
commit a8bc00a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/...proximax/sdk/model/transaction/builder/ModifyAccountPropertyMosaicTransactionBuilder.java b/...proximax/sdk/model/transaction/builder/ModifyAccountPropertyMosaicTransactionBuilder.java
@@ -7,9 +7,9 @@
 
 import java.math.BigInteger;
 
-import io.proximax.sdk.model.transaction.ModifyAccountPropertyTransaction;
 import io.proximax.sdk.model.transaction.EntityType;
 import io.proximax.sdk.model.transaction.EntityVersion;
+import io.proximax.sdk.model.transaction.ModifyAccountPropertyTransaction;
 import io.proximax.sdk.model.transaction.UInt64Id;
 
 /**
@@ -18,7 +18,7 @@
 public class ModifyAccountPropertyMosaicTransactionBuilder extends ModifyAccountPropertyTransactionBuilder<UInt64Id> {
 
    public ModifyAccountPropertyMosaicTransactionBuilder() {
-      super(EntityType.ACCOUNT_PROPERTIES_ADDRESS, EntityVersion.ACCOUNT_PROPERTIES_ADDRESS.getValue());
+      super(EntityType.ACCOUNT_PROPERTIES_MOSAIC, EntityVersion.ACCOUNT_PROPERTIES_MOSAIC.getValue());
    }
 
    @Override

diff --git a/...max/sdk/model/transaction/builder/ModifyAccountPropertyAddressTransactionBuilderTest.java b/...max/sdk/model/transaction/builder/ModifyAccountPropertyAddressTransactionBuilderTest.java
@@ -20,6 +20,7 @@
 import io.proximax.sdk.model.account.props.AccountPropertyModification;
 import io.proximax.sdk.model.account.props.AccountPropertyType;
 import io.proximax.sdk.model.blockchain.NetworkType;
+import io.proximax.sdk.model.transaction.EntityType;
 import io.proximax.sdk.model.transaction.ModifyAccountPropertyTransaction;
 
 /**
@@ -39,6 +40,11 @@ void setUp() {
       builder.feeCalculationStrategy(FeeCalculationStrategy.MEDIUM);
    }
 
+   @Test
+   void checkBuilder() {
+      assertEquals(EntityType.ACCOUNT_PROPERTIES_ADDRESS, builder.getType());
+   }
+
    @Test
    void test() {
       Address addr = new Account(new KeyPair(), NETWORK_TYPE).getAddress();

diff --git a/...imax/sdk/model/transaction/builder/ModifyAccountPropertyEntityTransactionBuilderTest.java b/...imax/sdk/model/transaction/builder/ModifyAccountPropertyEntityTransactionBuilderTest.java
@@ -17,8 +17,8 @@
 import io.proximax.sdk.model.account.props.AccountPropertyModification;
 import io.proximax.sdk.model.account.props.AccountPropertyType;
 import io.proximax.sdk.model.blockchain.NetworkType;
-import io.proximax.sdk.model.transaction.ModifyAccountPropertyTransaction;
 import io.proximax.sdk.model.transaction.EntityType;
+import io.proximax.sdk.model.transaction.ModifyAccountPropertyTransaction;
 
 /**
  * {@link ModifyAccountPropertyEntityTransactionBuilder} tests
@@ -37,6 +37,11 @@ void setUp() {
       builder.feeCalculationStrategy(FeeCalculationStrategy.MEDIUM);
    }
 
+   @Test
+   void checkBuilder() {
+      assertEquals(EntityType.ACCOUNT_PROPERTIES_ENTITY_TYPE, builder.getType());
+   }
+
    @Test
    void test() {
       AccountPropertyModification<EntityType> mod = AccountPropertyModification.add(EntityType.MODIFY_CONTRACT);

diff --git a/...imax/sdk/model/transaction/builder/ModifyAccountPropertyMosaicTransactionBuilderTest.java b/...imax/sdk/model/transaction/builder/ModifyAccountPropertyMosaicTransactionBuilderTest.java
@@ -18,6 +18,7 @@
 import io.proximax.sdk.model.account.props.AccountPropertyType;
 import io.proximax.sdk.model.blockchain.NetworkType;
 import io.proximax.sdk.model.mosaic.MosaicId;
+import io.proximax.sdk.model.transaction.EntityType;
 import io.proximax.sdk.model.transaction.ModifyAccountPropertyTransaction;
 import io.proximax.sdk.model.transaction.UInt64Id;
 
@@ -38,12 +39,18 @@ void setUp() {
       builder.feeCalculationStrategy(FeeCalculationStrategy.MEDIUM);
    }
 
+   @Test
+   void checkBuilder() {
+      assertEquals(EntityType.ACCOUNT_PROPERTIES_MOSAIC, builder.getType());
+   }
+
    @Test
    void test() {
       MosaicId mosid = new MosaicId(BigInteger.ONE);
       AccountPropertyModification<UInt64Id> mod = AccountPropertyModification.add(mosid);
       ModifyAccountPropertyTransaction<UInt64Id> trans = builder.propertyType(AccountPropertyType.ALLOW_MOSAIC).modifications(Arrays.asList(mod)).build();
 
+      assertEquals(EntityType.ACCOUNT_PROPERTIES_MOSAIC, trans.getType());
       assertEquals(AccountPropertyType.ALLOW_MOSAIC, trans.getPropertyType());
       assertEquals(1, trans.getPropertyModifications().size());
       assertEquals(mod, trans.getPropertyModifications().get(0));