fix(unitTest): replace context with spring test config

Author: lxcmyf

chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java

@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
@@ -122,6 +123,7 @@ public void close() {
       exitThread.interrupt();
       // help GC
       exitThread = null;
+      flushServices.values().forEach(ExecutorService::shutdown);
     } catch (Exception e) {
       logger.warn("exitThread interrupt error", e);
     }

framework/src/test/java/org/tron/common/BaseTest.java

@@ -4,6 +4,7 @@
 import java.io.File;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.AfterClass;
 import org.junit.runner.RunWith;
 import org.springframework.test.annotation.DirtiesContext;
@@ -28,7 +29,6 @@
 public abstract class BaseTest {
 
   protected static String dbPath;
-
   @Resource
   protected Manager dbManager;
   @Resource
@@ -37,7 +37,7 @@ public abstract class BaseTest {
   @AfterClass
   public static void destroy() {
     Args.clearParam();
-    if (FileUtil.deleteDir(new File(dbPath))) {
+    if (StringUtils.isNotEmpty(dbPath) && FileUtil.deleteDir(new File(dbPath))) {
       logger.info("Release resources successful.");
     } else {
       logger.info("Release resources failure.");
@@ -81,5 +81,4 @@ public Protocol.Block getSignedBlock(ByteString witness, long time, byte[] priva
 
     return block.toBuilder().setBlockHeader(blockHeader).build();
   }
-
 }

framework/src/test/java/org/tron/common/runtime/InheritanceTest.java

@@ -1,21 +1,14 @@
 package org.tron.common.runtime;
 
-import java.io.File;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.util.encoders.Hex;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.testng.Assert;
-import org.tron.common.application.Application;
-import org.tron.common.application.ApplicationFactory;
-import org.tron.common.application.TronApplicationContext;
-import org.tron.common.utils.FileUtil;
+import org.tron.common.BaseTest;
 import org.tron.core.Constant;
 import org.tron.core.Wallet;
-import org.tron.core.config.DefaultConfig;
 import org.tron.core.config.args.Args;
-import org.tron.core.db.Manager;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.ReceiptCheckErrException;
@@ -25,54 +18,31 @@
 import org.tron.protos.Protocol.AccountType;
 
 @Slf4j
-public class InheritanceTest {
+public class InheritanceTest extends BaseTest {
 
-  private static final String dbPath = "output_InheritanceTest";
   private static final String OWNER_ADDRESS;
-  private static Runtime runtime;
-  private static Manager dbManager;
-  private static TronApplicationContext context;
-  private static Application appT;
-  private static RepositoryImpl repository;
+  private RepositoryImpl repository;
 
   static {
+    dbPath = "output_InheritanceTest";
     Args.setParam(new String[]{"--output-directory", dbPath, "--debug"}, Constant.TEST_CONF);
-    context = new TronApplicationContext(DefaultConfig.class);
-    appT = ApplicationFactory.create(context);
     OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
   }
 
   /**
    * Init data.
    */
-  @BeforeClass
-  public static void init() {
-    dbManager = context.getBean(Manager.class);
+  @Before
+  public void init() {
     repository = RepositoryImpl.createRoot(StoreFactory.getInstance());
     repository.createAccount(Hex.decode(OWNER_ADDRESS), AccountType.Normal);
     repository.addBalance(Hex.decode(OWNER_ADDRESS), 100000000);
   }
 
-  /**
-   * Release resources.
-   */
-  @AfterClass
-  public static void destroy() {
-    Args.clearParam();
-    context.destroy();
-    if (FileUtil.deleteDir(new File(dbPath))) {
-      logger.info("Release resources successful.");
-    } else {
-      logger.info("Release resources failure.");
-    }
-  }
-
   /**
    * pragma solidity ^0.4.19;
-   *
    * contract foo { uint256 public id=10; function getNumber()  returns (uint256){return 100;}
    * function getName()  returns (string){ return "foo"; } }
-   *
    * contract bar is foo { function getName()  returns (string) { return "bar"; } function getId()
    * returns(uint256){return id;} }
    */
@@ -119,7 +89,7 @@ public void inheritanceTest()
 
     /* ========================== CALL getName() return child value ============================= */
     byte[] triggerData1 = TvmTestUtils.parseAbi("getName()", "");
-    runtime = TvmTestUtils
+    Runtime runtime = TvmTestUtils
         .triggerContractWholeProcessReturnContractAddress(callerAddress, contractAddress,
             triggerData1, 0, 1000000, repository, null);
 

framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java

@@ -1,22 +1,15 @@
 package org.tron.common.runtime;
 
-import java.io.File;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.util.encoders.Hex;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.testng.Assert;
-import org.tron.common.application.Application;
-import org.tron.common.application.ApplicationFactory;
-import org.tron.common.application.TronApplicationContext;
+import org.tron.common.BaseTest;
 import org.tron.common.runtime.vm.DataWord;
-import org.tron.common.utils.FileUtil;
 import org.tron.core.Constant;
 import org.tron.core.Wallet;
-import org.tron.core.config.DefaultConfig;
 import org.tron.core.config.args.Args;
-import org.tron.core.db.Manager;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.ReceiptCheckErrException;
@@ -26,55 +19,33 @@
 import org.tron.protos.Protocol.AccountType;
 
 @Slf4j
-public class InternalTransactionComplexTest {
+public class InternalTransactionComplexTest extends BaseTest {
 
-  private static final String dbPath = "output_InternalTransactionComplexTest";
   private static final String OWNER_ADDRESS;
   private static Runtime runtime;
-  private static Manager dbManager;
-  private static TronApplicationContext context;
-  private static Application appT;
   private static RepositoryImpl repository;
 
   static {
+    dbPath = "output_InternalTransactionComplexTest";
     Args.setParam(new String[]{"--output-directory", dbPath, "--debug", "--support-constant"},
         Constant.TEST_CONF);
-    context = new TronApplicationContext(DefaultConfig.class);
-    appT = ApplicationFactory.create(context);
     OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
   }
 
   /**
    * Init data.
    */
-  @BeforeClass
-  public static void init() {
-    dbManager = context.getBean(Manager.class);
+  @Before
+  public void init() {
     repository = RepositoryImpl.createRoot(StoreFactory.getInstance());
     repository.createAccount(Hex.decode(OWNER_ADDRESS), AccountType.Normal);
     repository.addBalance(Hex.decode(OWNER_ADDRESS), 100000000);
   }
 
-  /**
-   * Release resources.
-   */
-  @AfterClass
-  public static void destroy() {
-    Args.clearParam();
-    context.destroy();
-    if (FileUtil.deleteDir(new File(dbPath))) {
-      logger.info("Release resources successful.");
-    } else {
-      logger.info("Release resources failure.");
-    }
-  }
-
   /**
    * pragma solidity 0.4.24;
-   *
    * // this is to test wither the TVM is returning vars from one contract calling another //
    * contract's functions.
-   *
    * contract callerContract { // lets set up our instance of the new contract calledContract
    * CALLED_INSTANCE; // lets set the contract instance address in the constructor
    * constructor(address _addr) public { CALLED_INSTANCE = calledContract(_addr); } // lets create a
@@ -85,7 +56,6 @@ public static void destroy() {
    * in to temp vars (bool _bool, uint256 _uint, bytes32 _bytes32) = CALLED_INSTANCE.testReturns();
    * // lets write those temp vars to state testCallbackReturns_.someBool = _bool;
    * testCallbackReturns_.someUint = _uint; testCallbackReturns_.someBytes32 = _bytes32; } }
-   *
    * contract calledContract { function testReturns() external pure returns(bool, uint256, bytes32)
    * { return(true, 314159, 0x123456); } }
    */