fix test case can not exit

Author: halibobo1205

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

@@ -34,6 +34,9 @@ public interface Application {
 
   void startServices();
 
+  default void blockUntilShutdown() {
+  }
+
   void shutdownServices();
 
   void addService(Service service);

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

@@ -3,7 +3,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.tron.common.logsfilter.EventPluginLoader;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.config.args.Args;
@@ -77,6 +76,11 @@ public void shutdown() {
   @Override
   public void startServices() {
     services.start();
+  }
+
+  @Override
+  // DO NOT USE THIS METHOD IN TEST CASES
+  public void blockUntilShutdown() {
     services.blockUntilShutdown();
   }
 

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

@@ -23,6 +23,11 @@ public interface Service {
 
   void init(CommonParameter parameter);
 
+  /**
+   * Start the service.
+   * {@link Service#init(CommonParameter parameter) init(CommonParameter parameter)} must be called
+   * before this method.
+   */
   void start();
 
   void stop();

framework/src/main/java/org/tron/program/FullNode.java

@@ -132,5 +132,6 @@ public static void main(String[] args) {
       appT.addService(jsonRpcServiceOnPBFT);
     }
     appT.startup();
+    appT.blockUntilShutdown();
   }
 }

framework/src/main/java/org/tron/program/SolidityNode.java

@@ -93,6 +93,7 @@ public static void main(String[] args) {
     SolidityNode node = new SolidityNode(appT.getDbManager());
     node.start();
     appT.startup();
+    appT.blockUntilShutdown();
   }
 
   private void start() {

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

@@ -256,6 +256,7 @@ public void testGetTransactionByHash() {
 
   @Test
   public void testGetBlockByNumber2() {
+    fullNodeJsonRpcHttpService.init(Args.getInstance());
     fullNodeJsonRpcHttpService.start();
     JsonArray params = new JsonArray();
     params.add(ByteArray.toJsonHex(blockCapsule.getNum()));

framework/src/test/java/org/tron/core/pbft/PbftApiTest.java

@@ -59,6 +59,7 @@ public void pbftapi() throws IOException {
 
     Assert.assertTrue(dynamicPropertiesStore.getLatestBlockHeaderNumber() >= 10);
     commonDataBase.saveLatestPbftBlockNum(6);
+    httpApiOnPBFTService.init(Args.getInstance());
     httpApiOnPBFTService.start();
     CloseableHttpResponse response;
     try (CloseableHttpClient httpClient = HttpClients.createDefault()) {

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

@@ -35,6 +35,7 @@ public class SolidityNodeTest {
    */
   @BeforeClass
   public static void init() {
+    rpcApiService.init(Args.getInstance());
     rpcApiService.start();
   }