Merge pull request #1387 from tronprotocol/stest_VM_detail_fee

Refresh the account003 test case, add verify if the new account is exist

Author: pangpangfeng

src/test/java/stest/tron/wallet/account/WalletTestAccount003.java

@@ -99,59 +99,46 @@ public void beforeClass() {
   @Test
   public void testCreateAccount() {
     Account noCreateAccount = queryAccount(lowBalTest, blockingStubFull);
-    if (noCreateAccount.getAccountName().isEmpty()) {
-      Assert.assertTrue(PublicMethed.freezeBalance(fromAddress, 10000000, 3, testKey002,
-          blockingStubFull));
-      Assert.assertTrue(sendCoin(lowBalAddress, 1L, fromAddress, testKey002));
-      //Assert.assertTrue(Sendcoin(Low_Bal_ADDRESS, 1000000L, fromAddress, testKey002));
+    while (noCreateAccount.getBalance() != 0) {
+      ecKey = new ECKey(Utils.getRandom());
+      lowBalAddress = ecKey.getAddress();
+      lowBalTest = ByteArray.toHexString(ecKey.getPrivKeyBytes());
       noCreateAccount = queryAccount(lowBalTest, blockingStubFull);
-      logger.info(Long.toString(noCreateAccount.getBalance()));
-      Assert.assertTrue(noCreateAccount.getBalance() == 1);
-
-      //TestVoteToNonWitnessAccount
-      HashMap<String, String> voteToNonWitnessAccount = new HashMap<String, String>();
-      voteToNonWitnessAccount.put("27dUQbeRLz6BavhUJE6UbNp5AtAtPuzNZv6", "3");
-      HashMap<String, String> voteToInvaildAddress = new HashMap<String, String>();
-      voteToInvaildAddress.put("27cu1ozb4mX3m2afY68FSAqn3HmMp815d48", "4");
-      Assert.assertTrue(freezeBalance(fromAddress, 10000000L, 3L, testKey002));
-      voteWitness(voteToNonWitnessAccount, fromAddress, testKey002);
-      Assert.assertFalse(voteWitness(voteToNonWitnessAccount, fromAddress, testKey002));
-      Assert.assertFalse(voteWitness(voteToInvaildAddress, fromAddress, testKey002));
+    }
 
-      logger.info("vote to non witness account ok!!!");
+    Assert.assertTrue(sendCoin(lowBalAddress, 1L, fromAddress, testKey002));
+    noCreateAccount = queryAccount(lowBalTest, blockingStubFull);
+    logger.info(Long.toString(noCreateAccount.getBalance()));
+    Assert.assertTrue(noCreateAccount.getBalance() == 1);
+
+    //TestVoteToNonWitnessAccount
+    HashMap<String, String> voteToNonWitnessAccount = new HashMap<String, String>();
+    voteToNonWitnessAccount.put("27dUQbeRLz6BavhUJE6UbNp5AtAtPuzNZv6", "3");
+    HashMap<String, String> voteToInvaildAddress = new HashMap<String, String>();
+    voteToInvaildAddress.put("27cu1ozb4mX3m2afY68FSAqn3HmMp815d48", "4");
+    Assert.assertTrue(freezeBalance(fromAddress, 10000000L, 3L, testKey002));
+    voteWitness(voteToNonWitnessAccount, fromAddress, testKey002);
+    Assert.assertFalse(voteWitness(voteToNonWitnessAccount, fromAddress, testKey002));
+    Assert.assertFalse(voteWitness(voteToInvaildAddress, fromAddress, testKey002));
 
-    } else {
-      logger.info(
-          "Please confirm wither the create account test is pass, or you will do it by manual");
-    }
   }
 
   @Test(enabled = true)
   public void testUpdateAccount() {
+    Assert.assertFalse(updateAccount(lowBalAddress,
+        mostLongNamePlusOneChar.getBytes(), lowBalTest));
+    Assert.assertTrue(updateAccount(lowBalAddress, "".getBytes(), lowBalTest));
+    Assert.assertTrue(updateAccount(lowBalAddress, mostLongName.getBytes(), lowBalTest));
     Account tryToUpdateAccount = queryAccount(lowBalTest, blockingStubFull);
-    if (tryToUpdateAccount.getAccountName().isEmpty()) {
-      //Assert.assertFalse(updateAccount(lowBalAddress, "".getBytes(), lowBalTest));
-      Assert.assertFalse(
-          updateAccount(lowBalAddress, mostLongNamePlusOneChar.getBytes(),
-              lowBalTest));
-
-      Assert.assertTrue(updateAccount(lowBalAddress, "".getBytes(), lowBalTest));
-      Assert.assertTrue(updateAccount(lowBalAddress, mostLongName.getBytes(), lowBalTest));
-      tryToUpdateAccount = queryAccount(lowBalTest, blockingStubFull);
-      Assert.assertFalse(tryToUpdateAccount.getAccountName().isEmpty());
-      Assert.assertTrue(updateAccount(lowBalAddress, "secondUpdateName".getBytes(), lowBalTest));
-    }
+    tryToUpdateAccount = queryAccount(lowBalTest, blockingStubFull);
+    Assert.assertFalse(tryToUpdateAccount.getAccountName().isEmpty());
+    Assert.assertTrue(updateAccount(lowBalAddress, "secondUpdateName".getBytes(), lowBalTest));
   }
 
   @Test(enabled = true)
   public void testNoBalanceCreateAssetIssue() {
     Account lowaccount = queryAccount(lowBalTest, blockingStubFull);
     if (lowaccount.getBalance() > 0) {
-      /*            try {
-                Thread.sleep(10000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }*/
       Assert.assertTrue(sendCoin(toAddress, lowaccount.getBalance(), lowBalAddress, lowBalTest));
     }
     //Create AssetIssue failed when there is no enough balance.