Merge pull request #633 from taihaofu/delete_test_folder

add logic to delete db folder after test

Author: huzhenyuan

src/test/java/org/tron/core/net/node/BroadTest.java

@@ -1,5 +1,6 @@
 package org.tron.core.net.node;
 
+import java.io.File;
 import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.List;
@@ -10,6 +11,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -24,6 +26,7 @@
 import org.tron.common.overlay.server.ChannelManager;
 import org.tron.common.overlay.server.MessageQueue;
 import org.tron.common.overlay.server.SyncPool;
+import org.tron.common.utils.FileUtil;
 import org.tron.common.utils.ReflectUtils;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.config.DefaultConfig;
@@ -48,6 +51,7 @@ public class BroadTest {
   PeerClient peerClient;
   ChannelManager channelManager;
   SyncPool pool;
+  private static final String dbPath = "output-nodeImplTest/broad";
 
   private class Condition {
 
@@ -162,7 +166,7 @@ public void init() {
       @Override
       public void run() {
         logger.info("Full node running.");
-        Args.setParam(new String[]{"-d","output-nodeImplTest/broad"}, "config.conf");
+        Args.setParam(new String[]{"-d",dbPath}, "config.conf");
         Args cfgArgs = Args.getInstance();
         cfgArgs.setNodeListenPort(17889);
         cfgArgs.setNodeDiscoveryEnable(false);
@@ -261,4 +265,9 @@ public void run() {
     }
   }
 
+  @After
+  public void destroy() {
+    FileUtil.deleteDir(new File("output-nodeImplTest"));
+  }
+
 }

src/test/java/org/tron/core/net/node/HandleSyncBlockTest.java

@@ -4,6 +4,7 @@
 import io.netty.util.internal.ConcurrentSet;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -18,6 +19,7 @@
 import org.tron.common.overlay.server.ChannelManager;
 import org.tron.common.overlay.server.SyncPool;
 import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.FileUtil;
 import org.tron.common.utils.ReflectUtils;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
@@ -32,6 +34,7 @@
 import org.tron.core.services.WitnessService;
 import org.tron.protos.Protocol;
 
+import java.io.File;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -45,6 +48,7 @@ public class HandleSyncBlockTest {
     PeerClient peerClient;
     ChannelManager channelManager;
     SyncPool pool;
+    private static final String dbPath = "output-nodeImplTest/handleSyncBlock";
 
     private class Condition {
 
@@ -147,7 +151,7 @@ public void init() {
             @Override
             public void run() {
                 logger.info("Full node running.");
-                Args.setParam(new String[]{"-d","output-nodeImplTest/handleSyncBlock"}, "config.conf");
+                Args.setParam(new String[]{"-d",dbPath}, "config.conf");
                 Args cfgArgs = Args.getInstance();
                 cfgArgs.setNodeListenPort(17889);
                 cfgArgs.setNodeDiscoveryEnable(false);
@@ -245,4 +249,9 @@ public void run() {
             e.printStackTrace();
         }
     }
+
+    @After
+    public void destroy() {
+        FileUtil.deleteDir(new File("output-nodeImplTest"));
+    }
 }

src/test/java/org/tron/core/net/node/StartFetchSyncBlockTest.java

@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,6 +15,7 @@
 import org.tron.common.overlay.server.Channel;
 import org.tron.common.overlay.server.ChannelManager;
 import org.tron.common.overlay.server.SyncPool;
+import org.tron.common.utils.FileUtil;
 import org.tron.common.utils.ReflectUtils;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
@@ -27,6 +29,7 @@
 import org.tron.core.services.WitnessService;
 import org.tron.protos.Protocol;
 
+import java.io.File;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -40,6 +43,7 @@ public class StartFetchSyncBlockTest {
     PeerClient peerClient;
     ChannelManager channelManager;
     SyncPool pool;
+    private static final String dbPath = "output-nodeImplTest/startFetchSyncBlockTest";
 
     private class Condition {
 
@@ -111,7 +115,7 @@ public void init() {
             @Override
             public void run() {
                 logger.info("Full node running.");
-                Args.setParam(new String[]{"-d","output-nodeImplTest/startFetchSyncBlock"}, "config.conf");
+                Args.setParam(new String[]{"-d",dbPath}, "config.conf");
                 Args cfgArgs = Args.getInstance();
                 cfgArgs.setNodeListenPort(17889);
                 cfgArgs.setNodeDiscoveryEnable(false);
@@ -215,4 +219,9 @@ public void run() {
             e.printStackTrace();
         }
     }
+
+    @After
+    public void destroy() {
+        FileUtil.deleteDir(new File("output-nodeImplTest"));
+    }
 }