delete db after testcase in tmp dir; short the time cost of some case; optimize some shutdown action

Author: 317787106

framework/src/test/java/org/tron/common/utils/FileUtilTest.java

@@ -67,6 +67,7 @@ public void testReadData_NormalFile() throws IOException {
     try (FileWriter writer = new FileWriter(tempFile.toFile())) {
       writer.write("Hello, World!");
     }
+    tempFile.toFile().deleteOnExit();
 
     char[] buffer = new char[1024];
     int len = readData(tempFile.toString(), buffer);

framework/src/test/java/org/tron/common/utils/client/utils/HttpMethed.java

@@ -2231,7 +2231,7 @@ public static void waitToProduceOneBlock(String httpNode) {
     }
     Integer nextBlockNum = 0;
     Integer times = 0;
-    while (nextBlockNum <= currentBlockNum + 1 && times++ <= 10) {
+    while (nextBlockNum < currentBlockNum + 1 && times++ <= 6) {
       response = HttpMethed.getNowBlock(httpNode);
       responseContent = HttpMethed.parseResponseContent(response);
       if (responseContent.containsKey("block_header")) {

framework/src/test/java/org/tron/core/jsonrpc/BloomTest.java

@@ -131,7 +131,7 @@ private TransactionInfo createTransactionInfo(byte[] address1, byte[] address2)
 
   @Test
   public void benchmarkCreateByTransaction() {
-    int times = 10000;
+    int times = 1000;
 
     // small
     TransactionRetCapsule smallCapsule = new TransactionRetCapsule();

framework/src/test/java/org/tron/core/jsonrpc/ConcurrentHashMapTest.java

@@ -67,7 +67,7 @@ public void run() {
             TronJsonRpcImpl.handleBLockFilter(blockFilterCapsule);
           }
           try {
-            Thread.sleep(randomInt(100, 200));
+            Thread.sleep(randomInt(50, 100));
           } catch (InterruptedException e) {
             e.printStackTrace();
           }
@@ -81,7 +81,7 @@ public void run() {
         for (int t = 1; t <= times * 2; t++) {
 
           try {
-            Thread.sleep(randomInt(100, 200));
+            Thread.sleep(randomInt(50, 100));
           } catch (InterruptedException e) {
             e.printStackTrace();
           }
@@ -111,7 +111,7 @@ public void run() {
         for (int t = 1; t <= times * 2; t++) {
 
           try {
-            Thread.sleep(randomInt(100, 200));
+            Thread.sleep(randomInt(50, 100));
           } catch (InterruptedException e) {
             e.printStackTrace();
           }
@@ -144,7 +144,7 @@ public void run() {
         for (int t = 1; t <= times * 2; t++) {
 
           try {
-            Thread.sleep(randomInt(100, 200));
+            Thread.sleep(randomInt(50, 100));
           } catch (InterruptedException e) {
             e.printStackTrace();
           }

framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java

@@ -41,7 +41,7 @@ public class PrometheusApiServiceTest extends BaseTest {
   static LocalDateTime localDateTime = LocalDateTime.now();
   @Resource
   private DposSlot dposSlot;
-  final int blocks = 512;
+  final int blocks = 100;
   private final String key = PublicMethod.getRandomPrivateKey();
   private final byte[] privateKey = ByteArray.fromHexString(key);
   private static final AtomicInteger port = new AtomicInteger(0);

framework/src/test/java/org/tron/core/services/DelegationServiceTest.java

@@ -4,28 +4,21 @@
 import static org.tron.common.utils.client.Parameter.CommonConstant.ADD_PRE_FIX_BYTE_MAINNET;
 
 import com.google.protobuf.ByteString;
-import io.grpc.ManagedChannelBuilder;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.tron.api.GrpcAPI.BytesMessage;
-import org.tron.api.GrpcAPI.TransactionExtention;
-import org.tron.api.WalletGrpc;
-import org.tron.api.WalletGrpc.WalletBlockingStub;
 import org.tron.common.BaseTest;
 import org.tron.core.Constant;
 import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.config.args.Args;
 import org.tron.core.service.MortgageService;
-import org.tron.protos.contract.StorageContract.UpdateBrokerageContract;
 
 @Slf4j
 public class DelegationServiceTest extends BaseTest {
 
-  private static String fullnode = "127.0.0.1:50051";
   @Resource
   protected MortgageService mortgageService;
 
@@ -82,7 +75,6 @@ private void testWithdraw() {
     long reward2 = (long) ((double) dbManager.getDelegationStore().getReward(1, sr27) / 100000000
         * 10000000);
     long reward = reward1 + reward2;
-    System.out.println("testWithdraw:" + value + ", reward:" + reward);
     Assert.assertEquals(reward, value);
     mortgageService.withdrawReward(sr1);
     accountCapsule = dbManager.getAccountStore().get(sr1);

framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java

@@ -111,6 +111,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class RpcApiServicesTest {
 
+  private static Application appTest;
   private static TronApplicationContext context;
   private static ManagedChannel channelFull = null;
   private static ManagedChannel channelPBFT = null;
@@ -181,7 +182,7 @@ public static void init() throws IOException {
     manager.getAccountStore().put(ownerCapsule.createDbKey(), ownerCapsule);
     manager.getDynamicPropertiesStore().saveAllowShieldedTransaction(1);
     manager.getDynamicPropertiesStore().saveAllowShieldedTRC20Transaction(1);
-    Application appTest = ApplicationFactory.create(context);
+    appTest = ApplicationFactory.create(context);
     appTest.startup();
   }
 
@@ -197,6 +198,7 @@ public static void destroy() {
       channelSolidity.shutdown();
     }
     context.close();
+    appTest.shutdown();
     Args.clearParam();
   }
 

framework/src/test/java/org/tron/core/services/WalletApiTest.java

@@ -3,7 +3,7 @@
 import io.grpc.ManagedChannelBuilder;
 import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -66,10 +66,11 @@ public void listNodesTest() {
     }
   }
 
-  @After
-  public void destroy() {
-    Args.clearParam();
+  @AfterClass
+  public static void destroy() {
     context.destroy();
+    appT.shutdown();
+    Args.clearParam();
   }
 
 }

plugins/src/test/java/org/tron/plugins/DbCopyTest.java

@@ -14,15 +14,15 @@ public class DbCopyTest extends DbTest {
   public void testRunForLevelDB() throws RocksDBException, IOException {
     init(DbTool.DbType.LevelDB);
     String[] args = new String[] { "db", "cp",  INPUT_DIRECTORY,
-        genarateTmpDir()};
+        generateTmpDir()};
     Assert.assertEquals(0, cli.execute(args));
   }
 
   @Test
   public void testRunForRocksDB() throws RocksDBException, IOException {
     init(DbTool.DbType.RocksDB);
     String[] args = new String[] { "db", "cp",  INPUT_DIRECTORY,
-        genarateTmpDir()};
+        generateTmpDir()};
     Assert.assertEquals(0, cli.execute(args));
   }
 
@@ -43,7 +43,7 @@ public void testNotExist() {
   @Test
   public void testEmpty() throws IOException {
     String[] args = new String[] {"db", "cp", temporaryFolder.newFolder().toString(),
-        genarateTmpDir()};
+        generateTmpDir()};
     Assert.assertEquals(0, cli.execute(args));
   }
 
@@ -57,7 +57,7 @@ public void testDestIsExist() throws IOException {
   @Test
   public void testSrcIsFile() throws IOException {
     String[] args = new String[] {"db", "cp", temporaryFolder.newFile().toString(),
-        genarateTmpDir()};
+        generateTmpDir()};
     Assert.assertEquals(403, cli.execute(args));
   }
 

plugins/src/test/java/org/tron/plugins/DbTest.java

@@ -21,7 +21,6 @@ public class DbTest {
   private static final String ACCOUNT = "account";
   private static final String MARKET = DBUtils.MARKET_PAIR_PRICE_TO_ORDER;
   public CommandLine cli = new CommandLine(new Toolkit());
-  String tmpDir = System.getProperty("java.io.tmpdir");
 
   @Rule
   public final TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -51,7 +50,7 @@ private static void initDB(String sourceDir, String dbName, DbTool.DbType dbType
       }
       return;
     }
-    try (DBInterface db =  DbTool.getDB(sourceDir, dbName, dbType)) {
+    try (DBInterface db = DbTool.getDB(sourceDir, dbName, dbType)) {
       if (MARKET.equalsIgnoreCase(dbName)) {
         byte[] sellTokenID1 = ByteArray.fromString("100");
         byte[] buyTokenID1 = ByteArray.fromString("200");
@@ -74,7 +73,6 @@ private static void initDB(String sourceDir, String dbName, DbTool.DbType dbType
             2003L
         );
 
-
         //Use out-of-order insertion，key in store should be 1,2,3
         db.put(pairPriceKey1, "1".getBytes(StandardCharsets.UTF_8));
         db.put(pairPriceKey2, "2".getBytes(StandardCharsets.UTF_8));
@@ -90,10 +88,12 @@ private static void initDB(String sourceDir, String dbName, DbTool.DbType dbType
 
   /**
    * Generate a not-exist temporary directory path.
+   *
    * @return temporary path
    */
-  public String genarateTmpDir() {
-    File dir = Paths.get(tmpDir, UUID.randomUUID().toString()).toFile();
+  public String generateTmpDir() throws IOException {
+    File dir = Paths.get(temporaryFolder.newFolder().toString(), UUID.randomUUID().toString())
+        .toFile();
     dir.deleteOnExit();
     return dir.getPath();
   }