use shoudownnow instead of shutdown in close Channel

Author: 317787106

framework/src/main/java/org/tron/common/application/TronApplicationContext.java

@@ -13,8 +13,10 @@ public TronApplicationContext(DefaultListableBeanFactory beanFactory) {
     super(beanFactory);
   }
 
+  //only used for testcase
   public TronApplicationContext(Class<?>... annotatedClasses) {
     super(annotatedClasses);
+    this.registerShutdownHook();
   }
 
   public TronApplicationContext(String... basePackages) {

framework/src/test/java/org/tron/core/CreateCommonTransactionTest.java

@@ -7,6 +7,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tron.common.BaseTest;
+import org.tron.common.utils.PublicMethod;
 import org.tron.common.utils.ReflectUtils;
 import org.tron.core.Constant;
 import org.tron.core.config.args.Args;
@@ -40,17 +41,18 @@ public void testNoIpv4() throws Exception {
 
   @Test
   public void testFind() {
+    int port = PublicMethod.chooseRandomPort();
     P2pConfig p2pConfig = new P2pConfig();
     p2pConfig.setIp("127.0.0.1");
-    p2pConfig.setPort(34567);
+    p2pConfig.setPort(port);
     ReflectUtils.setFieldValue(tronNetService, "p2pConfig", p2pConfig);
     TronNetService.getP2pService().start(p2pConfig);
 
     service.triggerNext();
     Assert.assertNull(service.getCur());
 
     ReflectUtils.invokeMethod(service, "resetCount");
-    InetSocketAddress cur = new InetSocketAddress("192.168.0.1", 34567);
+    InetSocketAddress cur = new InetSocketAddress("192.168.0.1", port);
     service.setCur(cur);
     service.onDisconnect(cur);
   }

framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java

@@ -189,13 +189,13 @@ public static void init() throws IOException {
   @AfterClass
   public static void destroy() {
     if (channelFull != null) {
-      channelFull.shutdown();
+      channelFull.shutdownNow();
     }
     if (channelPBFT != null) {
-      channelPBFT.shutdown();
+      channelPBFT.shutdownNow();
     }
     if (channelSolidity != null) {
-      channelSolidity.shutdown();
+      channelSolidity.shutdownNow();
     }
     context.close();
     appTest.shutdown();

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

@@ -90,13 +90,13 @@ public static void init() throws IOException {
   @AfterClass
   public static void destroy() throws InterruptedException {
     if (channelFull != null) {
-      channelFull.shutdown();
+      channelFull.shutdownNow();
     }
     if (channelSolidity != null) {
-      channelSolidity.shutdown();
+      channelSolidity.shutdownNow();
     }
     if (channelpBFT != null) {
-      channelpBFT.shutdown();
+      channelpBFT.shutdownNow();
     }
     context.close();
     Args.clearParam();

framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java

@@ -97,13 +97,13 @@ public static void init() throws IOException {
   @AfterClass
   public static void destroy() {
     if (channelFull != null) {
-      channelFull.shutdown();
+      channelFull.shutdownNow();
     }
     if (channelPBFT != null) {
-      channelPBFT.shutdown();
+      channelPBFT.shutdownNow();
     }
     if (channelSolidity != null) {
-      channelSolidity.shutdown();
+      channelSolidity.shutdownNow();
     }
     context.close();
     Args.clearParam();

framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java

@@ -9,6 +9,7 @@
 import org.junit.Test;
 import org.tron.common.BaseTest;
 import org.tron.common.client.DatabaseGrpcClient;
+import org.tron.common.utils.PublicMethod;
 import org.tron.core.Constant;
 import org.tron.core.config.args.Args;
 import org.tron.core.exception.TronError;
@@ -27,6 +28,8 @@ public class SolidityNodeTest extends BaseTest {
 
   static {
     Args.setParam(new String[]{"-d", dbPath(), "--solidity"}, Constant.TEST_CONF);
+    Args.getInstance().setRpcPort(PublicMethod.chooseRandomPort());
+    Args.getInstance().setSolidityHttpPort(PublicMethod.chooseRandomPort());
   }
 
   @Test

framework/src/test/java/org/tron/program/SolidityNodeTest.java

@@ -62,7 +62,7 @@ public void startApp() {
    */
   public void shutdown() throws InterruptedException {
     if (channelFull != null) {
-      channelFull.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+      channelFull.shutdownNow();
     }
     context.close();
   }