Modify testcase

Author: wangqqqqq

.circleci/config.yml

@@ -14,11 +14,11 @@ jobs:
     - checkout
     - run:
         name: multi_os_result
-        command: echo "curl http://60.205.215.34/multi_os_result"
+        command: echo "curl http://47.95.206.44:50080/multi_os_result"
 #
 #    - run:
 #        name: Daily Build Report
-#        command: curl http://60.205.215.34/Daily_Build_Task_Report
+#        command: curl http://47.95.206.44:50080/Daily_Build_Task_Report
 #
 #    - run:
 #        name: Download Links

DownloadLinks.sh

@@ -1,21 +1,21 @@
-PassFlag=`curl -s http://60.205.215.34/Daily_Build_Task_Report | grep "Failed: 0" | wc -c`
+PassFlag=`curl -s http://47.95.206.44:50080/Daily_Build_Task_Report | grep "Failed: 0" | wc -c`
 
 if [ $PassFlag -eq 0 ]; then
     echo "Daily Build Stest Fail"
     echo "To view Daily Replay and Stress Test logs please visit website below on browsers"
-    echo "--- http://60.205.215.34/latestReplayLog"
-    echo "--- http://60.205.215.34/latestStressLog"
+    echo "--- http://47.95.206.44:50080/latestReplayLog"
+    echo "--- http://47.95.206.44:50080/latestStressLog"
 
 else
     echo "Daily Build Stest Pass"
     echo "Build on `date +"%Y-%m-%d"` 3:00:00 (CST), UTC +8"
     echo "Please visit following website to download java-tron.jar on browsers"
-    echo "--- http://60.205.215.34/Daily_Build/java-tron.jar"
+    echo "--- http://47.95.206.44:50080/Daily_Build/jFava-tron.jar"
     echo "To view Daily Replay and Stress Test logs please visit website below on browsers"
-    echo "--- http://60.205.215.34/latestReplayLog"
-    echo "--- http://60.205.215.34/latestStressLog"
+    echo "--- http://47.95.206.44:50080/latestReplayLog"
+    echo "--- http://47.95.206.44:50080/latestStressLog"
     echo "The following compressed package is provided for user to set up Fullnode. Please use Linux OS to Download"
-    echo "--- curl -# -O http://60.205.215.34/Daily_Build/java-tron.tar.gz"
+    echo "--- curl -# -O http://47.95.206.44:50080/Daily_Build/java-tron.tar.gz"
     echo "To unzip file use the command below"
     echo "--- tar -xzvf java-tron.tar.gz"
 fi

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

@@ -385,7 +385,7 @@ public void test4DelegateResourceAboutTransferAsset() {
   }
 
   @Test(enabled = true)
-  public void test5DelegateResourceAboutTriggerContract() {
+  public void test5CanNotDelegateResourceToContract() {
     //Create Account6
     ECKey ecKey6 = new ECKey(Utils.getRandom());
     accountForDeployAddress = ecKey6.getAddress();
@@ -411,61 +411,13 @@ public void test5DelegateResourceAboutTriggerContract() {
         maxFeeLimit, 0L, consumeUserResourcePercent, null, accountForDeployKey,
         accountForDeployAddress, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);
-    //Account4 DelegatedResource of Energy to Contract
-    Assert.assertTrue(PublicMethed.freezeBalanceForReceiver(
+
+    //After 3.6 can not delegate resource to contract
+    Assert.assertFalse(PublicMethed.freezeBalanceForReceiver(
         account4DelegatedResourceAddress, freezeAmount, freezeDuration, 1,
         ByteString.copyFrom(contractAddress), account4DelegatedResourceKey, blockingStubFull));
 
-    //Account4 DelegatedResource Energy to deploy
-    Assert.assertTrue(PublicMethed.freezeBalanceForReceiver(
-        account4DelegatedResourceAddress, freezeAmount, freezeDuration, 1,
-        ByteString.copyFrom(accountForDeployAddress),
-        account4DelegatedResourceKey, blockingStubFull));
-
-    //get Energy of Account013，Account4，Contract before trigger contract
-    final long account013CurrentEnergyUsed = PublicMethed.getAccountResource(
-        account013Address, blockingStubFull).getEnergyUsed();
-    final long account013CurrentBandwidthUsed = PublicMethed.getAccountResource(
-        account013Address, blockingStubFull).getFreeNetUsed();
-    final long account4CurrentEnergyUsed = PublicMethed.getAccountResource(
-        account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
-    final long contractCurrentEnergyUsed = PublicMethed.getAccountResource(
-        contractAddress, blockingStubFull).getEnergyUsed();
-    final long deployCurrentEnergyUsed = PublicMethed.getAccountResource(
-        accountForDeployAddress, blockingStubFull).getEnergyUsed();
-
-    //Account013 trigger contract
-    String txid = PublicMethed.triggerContract(contractAddress,
-        "add2(uint256)", "1", false,
-        0, 1000000000L, "0", 0, account013Address, testKeyForAccount013, blockingStubFull);
-    logger.info(txid);
-    infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
-    logger.info(String.valueOf(infoById.get().getResultValue()));
-    Assert.assertTrue(infoById.get().getResultValue() == 0);
-    //get transaction info of Energy used and Bandwidth used
-    final long contractTriggerEnergyUsed = infoById.get().getReceipt().getOriginEnergyUsage();
-    final long contractTriggerBandwidthUsed = infoById.get().getReceipt().getNetUsage();
-
-    //get Energy of Account013，Account4，Contract after trigger contract
-    final long account013CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
-        account013Address, blockingStubFull).getEnergyUsed();
-    final long account013CurrentBandwidthUsedAfterTrig = PublicMethed.getAccountResource(
-        account013Address, blockingStubFull).getFreeNetUsed();
-    final long account4CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
-        account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
-    final long contractCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
-        contractAddress, blockingStubFull).getEnergyUsed();
-    final long deployCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
-        accountForDeployAddress, blockingStubFull).getEnergyUsed();
-    //compare energy changed
-    Assert.assertTrue(account013CurrentEnergyUsed == account013CurrentEnergyUsedAfterTrig);
-    Assert.assertTrue(account4CurrentEnergyUsed == account4CurrentEnergyUsedAfterTrig);
-    Assert.assertTrue(contractCurrentEnergyUsed == contractCurrentEnergyUsedAfterTrig);
-    Assert.assertTrue(deployCurrentEnergyUsed
-        == deployCurrentEnergyUsedAfterTrig - contractTriggerEnergyUsed);
-    //compare bandwidth of Account013 before and after trigger contract
-    Assert.assertTrue(account013CurrentBandwidthUsed
-        == account013CurrentBandwidthUsedAfterTrig - contractTriggerBandwidthUsed);
+
   }
 
   /**

src/test/java/stest/tron/wallet/contract/scenario/ContractScenario004.java

@@ -81,14 +81,15 @@ public void deployErc20TronToken() {
     String code = retMap.get("byteCode").toString();
     String abi = retMap.get("abI").toString();
 
-    byte[] contractAddress;
     String txid = PublicMethed
         .deployContractAndGetTransactionInfoById(contractName, abi, code, "", maxFeeLimit,
             0L, 100, null, contract004Key, contract004Address, blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     logger.info("Txid is " + txid);
     logger.info("Deploy energytotal is " + infoById.get().getReceipt().getEnergyUsageTotal());
+    byte[] contractAddress;
     contractAddress = infoById.get().getContractAddress().toByteArray();
 
     SmartContract smartContract = PublicMethed.getContract(contractAddress, blockingStubFull);

src/test/java/stest/tron/wallet/contract/scenario/ContractScenario005.java

@@ -84,14 +84,15 @@ public void deployIcoContract() {
     String code = retMap.get("byteCode").toString();
     String abi = retMap.get("abI").toString();
 
-    byte[] contractAddress = null;
     String txid = PublicMethed
         .deployContractAndGetTransactionInfoById(contractName, abi, code, "", maxFeeLimit,
             0L, 100, null, contract005Key, contract005Address, blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     logger.info("Txid is " + txid);
     logger.info("Deploy energytotal is " + infoById.get().getReceipt().getEnergyUsageTotal());
+    byte[] contractAddress = null;
     contractAddress = infoById.get().getContractAddress().toByteArray();
     SmartContract smartContract = PublicMethed.getContract(contractAddress, blockingStubFull);
 

src/test/java/stest/tron/wallet/contract/scenario/ContractScenario006.java

@@ -95,6 +95,7 @@ public void deployFomo3D() {
     String txid = PublicMethed
         .deployContractAndGetTransactionInfoById(contractName, abi, code, "", maxFeeLimit,
             0L, 100, null, contract006Key, contract006Address, blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     contractAddress = infoById.get().getContractAddress().toByteArray();

src/test/java/stest/tron/wallet/contract/scenario/ContractScenario012.java

@@ -99,6 +99,7 @@ public void test1DeployTransactionCoin() {
     String txid = PublicMethed
         .deployContractAndGetTransactionInfoById(contractName, abi, code, "", maxFeeLimit, 0L, 100,
             null, contract012Key, contract012Address, blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
     logger.info("infobyid : --- " + infoById);
     Assert.assertTrue(infoById.get().getResultValue() == 0);

src/test/java/stest/tron/wallet/contract/scenario/ContractScenario013.java

@@ -85,6 +85,7 @@ public void deployTronTrxAndSunContract() {
     txid = PublicMethed.deployContractAndGetTransactionInfoById(contractName, abi, code, "",
         maxFeeLimit, 0L, 100, null, contract013Key, contract013Address, blockingStubFull);
     logger.info(txid);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
     logger.info("energytotal is " + infoById.get().getReceipt().getEnergyUsageTotal());
     Assert.assertTrue(infoById.get().getResultValue() == 0);
@@ -112,6 +113,7 @@ public void triggerTronTrxAndSunContract() {
     String txid = PublicMethed
         .deployContractAndGetTransactionInfoById(contractName, abi, code, "", maxFeeLimit,
             0L, 100, null, contract013Key, contract013Address, blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
     Assert.assertTrue(infoById.get().getResultValue() == 0);
     logger.info("energytotal is " + infoById.get().getReceipt().getEnergyUsageTotal());
@@ -122,6 +124,7 @@ public void triggerTronTrxAndSunContract() {
         "time()", "#", false,
         0, 100000000L, contract013Address, contract013Key, blockingStubFull);
     logger.info(txid);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
     logger.info("result is " + infoById.get().getResultValue());
     logger.info("energytotal is " + infoById.get().getReceipt().getEnergyUsageTotal());

src/test/java/stest/tron/wallet/dailybuild/manual/ContractScenario011.java

@@ -168,6 +168,7 @@ public void deploySaleClockAuction() {
         .deployContractWithConstantParame(contractName, abi, code, "constructor(address,uint256)",
             data, "", maxFeeLimit, 0L, consumeUserResourcePercent, null, deployKey, deployAddress,
             blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     Optional<TransactionInfo> info = PublicMethed
         .getTransactionInfoById(deplTxid, blockingStubFull);
     Assert.assertTrue(info.get().getResultValue() == 0);

src/test/java/stest/tron/wallet/dailybuild/manual/ContractScenario014.java

@@ -115,6 +115,7 @@ public void testTripleTrigger() {
     txid = PublicMethed.deployContractWithConstantParame(contractName, abi1, code1,
         "constructor(address)", parame, "", maxFeeLimit, 0L, 100, null,
         contract014Key, contract014Address, blockingStubFull);
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
     Assert.assertTrue(infoById.get().getResultValue() == 0);
     contractAddress2 = infoById.get().getContractAddress().toByteArray();

src/test/java/stest/tron/wallet/mutisign/WalletTestMutiSign001.java

@@ -284,6 +284,7 @@ public void testMutiSign3ParticipateAssetissue() {
 
     Assert.assertNotNull(txid);
 
+    PublicMethed.waitProduceNextBlock(blockingStubFull);
     infoById = PublicMethed
         .getTransactionInfoById(txid, blockingStubFull);
     balanceAfter = PublicMethed.queryAccount(participateAddress, blockingStubFull)