Merge pull request tronprotocol#1556 from tronprotocol/stest_adapt_google_checkstyle

wangzichichi · web-flow · commit 0242b957a65b · 2018-09-20T16:28:07.000+08:00
Stest adapt google checkstyle
diff --git a/src/test/java/stest/tron/wallet/account/WalletTestAccount004.java b/src/test/java/stest/tron/wallet/account/WalletTestAccount004.java
@@ -101,7 +101,8 @@ public void testFreezeBalance() {
       e.printStackTrace();
     }
     //Freeze balance success.
-    Assert.assertTrue(PublicMethed.freezeBalance(fromAddress, 1000000L, 3L, testKey002,blockingStubFull));
+    Assert.assertTrue(PublicMethed.freezeBalance(fromAddress, 1000000L,
+        3L, testKey002,blockingStubFull));
   }
 
   @Test(enabled = true)
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue001.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue001.java
@@ -84,8 +84,8 @@ public void beforeClass() {
     Optional<GrpcAPI.AssetIssueList> queryAssetByAccount = Optional.ofNullable(assetIssueList1);
     if (queryAssetByAccount.get().getAssetIssueCount() == 0) {
       Assert
-          .assertTrue(PublicMethed.sendcoin(noBandwitchAddress, 2048000000, fromAddress, testKey002
-              , blockingStubFull));
+          .assertTrue(PublicMethed.sendcoin(noBandwitchAddress, 2048000000, fromAddress,
+              testKey002, blockingStubFull));
       Long start = System.currentTimeMillis() + 2000;
       Long end = System.currentTimeMillis() + 1000000000;
 
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue003.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue003.java
@@ -151,8 +151,8 @@ public void beforeClass() {
           start, end, 2, description, url,10000L,10000L,
           1L, 3652L, testKey002,blockingStubFull));
       //The asset issue name is chinese name.
-      Assert.assertFalse(PublicMethed.createAssetIssue(fromAddress, chineseAssetIssuename, totalSupply, 1,
-          10, start, end, 2, description, url,10000L,
+      Assert.assertFalse(PublicMethed.createAssetIssue(fromAddress, chineseAssetIssuename,
+          totalSupply, 1, 10, start, end, 2, description, url,10000L,
           10000L,1L, 3652L, testKey002,blockingStubFull));
       //The URL is null.
       Assert.assertFalse(PublicMethed.createAssetIssue(fromAddress, name, totalSupply, 1, 10,
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue007.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue007.java
@@ -96,13 +96,13 @@ public void testParticipateAssetIssueUseParticipaterBandwidth() {
         .sendcoin(asset007Address, sendAmount, fromAddress, testKey002, blockingStubFull));
     //Assert.assertTrue(PublicMethed
     //    .freezeBalance(asset007Address, 100000000L, 3, testKeyForAssetIssue007,
-     //       blockingStubFull));
+    //       blockingStubFull));
     Long start = System.currentTimeMillis() + 2000;
     Long end = System.currentTimeMillis() + 1000000000;
     Assert.assertTrue(PublicMethed
-        .createAssetIssue(asset007Address, name, totalSupply, trxNum, icoNum, start, end, 1, description,
-            url, freeAssetNetLimit, publicFreeAssetNetLimit, 1L, 1L, testKeyForAssetIssue007,
-            blockingStubFull));
+        .createAssetIssue(asset007Address, name, totalSupply, trxNum, icoNum, start, end, 1,
+            description, url, freeAssetNetLimit, publicFreeAssetNetLimit, 1L, 1L,
+            testKeyForAssetIssue007, blockingStubFull));
 
     logger.info(name);
     Assert.assertTrue(PublicMethed.waitProduceNextBlock(blockingStubFull));
@@ -166,7 +166,7 @@ public void testParticipateAssetIssueUseParticipaterBandwidth() {
     participateInfo = PublicMethed.queryAccount(participateAssetCreateKey,blockingStubFull);
     final Long afterBalance = participateInfo.getBalance();
 
-    Assert.assertTrue(beforeBalance  - trxNum*1*icoNum  >= afterBalance);
+    Assert.assertTrue(beforeBalance  - trxNum * 1 * icoNum  >= afterBalance);
   }
 
   @AfterClass(enabled = true)
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue011.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue011.java
@@ -32,7 +32,7 @@ public class WalletTestAssetIssue011 {
 
 
 
-/*  //testng001、testng002、testng003、testng004
+  /*  //testng001、testng002、testng003、testng004
   private static final byte[] fromAddress = Base58
       .decodeFromBase58Check("THph9K2M2nLvkianrMGswRhz5hjSA9fuH7");*/
 
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue012.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue012.java
@@ -96,7 +96,7 @@ public void beforeClass() {
     Optional<GrpcAPI.AssetIssueList> queryAssetByAccount = Optional.ofNullable(assetIssueList1);
     if (queryAssetByAccount.get().getAssetIssueCount() == 0) {
       //Assert.assertTrue(PublicMethed.freezeBalance(fromAddress, 10000000, 3, testKey002,
-       //   blockingStubFull));
+      //   blockingStubFull));
       Assert.assertTrue(PublicMethed
           .sendcoin(asset012Address, sendAmount, fromAddress, testKey002, blockingStubFull));
       Assert.assertTrue(PublicMethed
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue014.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue014.java
@@ -35,7 +35,7 @@ public class WalletTestAssetIssue014 {
 
 
 
-/*  //testng001、testng002、testng003、testng004
+  /*  //testng001、testng002、testng003、testng004
   private static final byte[] fromAddress = Base58
       .decodeFromBase58Check("THph9K2M2nLvkianrMGswRhz5hjSA9fuH7");
   private static final byte[] toAddress = Base58
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue015.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue015.java
@@ -37,7 +37,7 @@ public class WalletTestAssetIssue015 {
 
 
   //testng001、testng002、testng003、testng004
-/*  private static final byte[] fromAddress = Base58
+  /*  private static final byte[] fromAddress = Base58
       .decodeFromBase58Check("THph9K2M2nLvkianrMGswRhz5hjSA9fuH7");
   private static final byte[] toAddress = Base58
       .decodeFromBase58Check("TV75jZpdmP2juMe1dRwGrwpV6AMU6mr1EU");*/
diff --git a/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue018.java b/src/test/java/stest/tron/wallet/assetissue/WalletTestAssetIssue018.java
@@ -122,7 +122,7 @@ public void testSameAssetissueName() {
     //Get asset issue by name
     String asset1Name = name;
     String asset2Name = name + "_1";
-    String asset3Name = name + "_2";
+    final String asset3Name = name + "_2";
     ByteString assetNameBs = ByteString.copyFrom(asset1Name.getBytes());
     GrpcAPI.BytesMessage request = GrpcAPI.BytesMessage.newBuilder().setValue(assetNameBs).build();
     Contract.AssetIssueContract assetIssueByName = blockingStubFull.getAssetIssueByName(request);
diff --git a/src/test/java/stest/tron/wallet/committee/WalletTestCommittee003.java b/src/test/java/stest/tron/wallet/committee/WalletTestCommittee003.java
@@ -115,7 +115,7 @@ public void testApproveProposal() {
 
     Assert.assertTrue(PublicMethed.approveProposal(witness002Address,witnessKey002,proposalId,
         true,blockingStubFull));
-        try {
+    try {
       Thread.sleep(2000);
     } catch (InterruptedException e) {
       e.printStackTrace();
diff --git a/src/test/java/stest/tron/wallet/contract/linkage/ContractLinkage001.java b/src/test/java/stest/tron/wallet/contract/linkage/ContractLinkage001.java
@@ -36,6 +36,7 @@ public class ContractLinkage001 {
       .getStringList("fullnode.ip.list").get(0);
   private Long maxFeeLimit = Configuration.getByPath("testng.conf")
       .getLong("defaultParameter.maxFeeLimit");
+  byte[] contractAddress = null;
 
   ECKey ecKey1 = new ECKey(Utils.getRandom());
   byte[] linkage001Address = ecKey1.getAddress();
@@ -87,15 +88,15 @@ public void deployContentValue() {
     logger.info("before energy usage is " + Long.toString(energyUsage));
 
     Account account = PublicMethed.queryAccount(linkage001Key,blockingStubFull);
-    Long beforeAccountBalance = account.getBalance();
+    final Long beforeAccountBalance = account.getBalance();
     logger.info("before balance is " + Long.toString(account.getBalance()));
     //Value is 1
     txid = PublicMethed.deployContractAndGetTransactionInfoById(contractName,payableAbi,payableCode,
         "",maxFeeLimit, 1L, 100,null,linkage001Key,
         linkage001Address,blockingStubFull);
     infoById = PublicMethed.getTransactionInfoById(txid,blockingStubFull);
     Assert.assertTrue(infoById.get().getResultValue() == 0);
-    byte[] contractAddress = infoById.get().getContractAddress().toByteArray();
+    contractAddress = infoById.get().getContractAddress().toByteArray();
 
     accountResource = PublicMethed.getAccountResource(linkage001Address,blockingStubFull);
     energyLimit = accountResource.getEnergyLimit();
diff --git a/src/test/java/stest/tron/wallet/manual/WalletTestBlock001.java b/src/test/java/stest/tron/wallet/manual/WalletTestBlock001.java
@@ -67,7 +67,8 @@ public void testCurrentBlock() {
     Assert.assertTrue(currentBlock.getBlockHeader().getRawData().getNumber() > 0);
     Assert.assertFalse(currentBlock.getBlockHeader().getRawData().getParentHash().isEmpty());
     Assert.assertTrue(currentBlock.getBlockHeader().getRawData().getWitnessId() >= 0);
-    logger.info("test getcurrentblock is " + Long.toString(currentBlock.getBlockHeader().getRawData().getNumber()));
+    logger.info("test getcurrentblock is " + Long.toString(currentBlock.getBlockHeader()
+        .getRawData().getNumber()));
 
     //Improve coverage.
     currentBlock.equals(currentBlock);
@@ -90,7 +91,8 @@ public void testCurrentBlockFromSolidity() {
     Assert.assertTrue(currentBlock.getBlockHeader().getRawData().getNumber() > 0);
     Assert.assertFalse(currentBlock.getBlockHeader().getRawData().getParentHash().isEmpty());
     Assert.assertTrue(currentBlock.getBlockHeader().getRawData().getWitnessId() >= 0);
-    logger.info("test getcurrentblock in soliditynode is " + Long.toString(currentBlock.getBlockHeader().getRawData().getNumber()));
+    logger.info("test getcurrentblock in soliditynode is " + Long.toString(currentBlock
+        .getBlockHeader().getRawData().getNumber()));
   }
 
   @AfterClass
diff --git a/src/test/java/stest/tron/wallet/manual/WalletTestBlock002.java b/src/test/java/stest/tron/wallet/manual/WalletTestBlock002.java
@@ -69,11 +69,11 @@ public void testGetBlockByNum() {
     }
 
     //The number is large than the currently number, there is no exception when query this number.
-    /*    Long outOfCurrentBlockNum = currentBlockNum + 10000L;
+    Long outOfCurrentBlockNum = currentBlockNum + 10000L;
     NumberMessage.Builder builder1 = NumberMessage.newBuilder();
     builder1.setNum(outOfCurrentBlockNum);
     Block outOfCurrentBlock = blockingStubFull.getBlockByNum(builder1.build());
-    Assert.assertFalse(outOfCurrentBlock.hasBlockHeader());*/
+    Assert.assertFalse(outOfCurrentBlock.hasBlockHeader());
 
     //Query the first block.
     NumberMessage.Builder builder2 = NumberMessage.newBuilder();
@@ -113,11 +113,11 @@ public void testGetBlockByNumFromSolidity() {
     }
 
     //The number is large than the currently number, there is no exception when query this number.
-    /*    Long outOfCurrentBlockNum = currentBlockNum + 10000L;
+    Long outOfCurrentBlockNum = currentBlockNum + 10000L;
     NumberMessage.Builder builder1 = NumberMessage.newBuilder();
     builder1.setNum(outOfCurrentBlockNum);
     Block outOfCurrentBlock = blockingStubSolidity.getBlockByNum(builder1.build());
-    Assert.assertFalse(outOfCurrentBlock.hasBlockHeader());*/
+    Assert.assertFalse(outOfCurrentBlock.hasBlockHeader());
 
     //Query the first block.
     NumberMessage.Builder builder2 = NumberMessage.newBuilder();
@@ -146,6 +146,7 @@ public void testGetBlockByNumFromSolidity() {
     Assert.assertTrue(lastSecondBlock.getBlockHeader().getRawData().getWitnessId() >= 0);
     logger.info("Last second test from solidity succesfully");
   }
+
   @Test(enabled = true)
   public void testGetBlockById() {
 

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ public void testFreezeBalance() {`
`101`	`101`	`e.printStackTrace();`
`102`	`102`	`}`
`103`	`103`	`//Freeze balance success.`
`104`		`- Assert.assertTrue(PublicMethed.freezeBalance(fromAddress, 1000000L, 3L, testKey002,blockingStubFull));`
	`104`	`+ Assert.assertTrue(PublicMethed.freezeBalance(fromAddress, 1000000L,`
	`105`	`+ 3L, testKey002,blockingStubFull));`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`@Test(enabled = true)`