Skip to content

Commit ba8200f

Browse files
YrpYrp
committed
fix unittest
1 parent 05119cc commit ba8200f

4 files changed

Lines changed: 32 additions & 9 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ src/main/resources/META-INF/
4949

5050
/output_manager/
5151
/output_witness/
52-
52+
output*
5353
nodeId.properties

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
@Slf4j
4747
public class BroadTest {
4848

49-
private static String dbPath = "output-nodeImplTest/broad";
5049
private static AnnotationConfigApplicationContext context;
5150
private NodeImpl node;
5251
RpcApiService rpcApiService;
@@ -167,7 +166,7 @@ public void init() {
167166
@Override
168167
public void run() {
169168
logger.info("Full node running.");
170-
Args.setParam(new String[]{"--output-directory", dbPath}, "config.conf");
169+
Args.setParam(new String[]{"-d", "output-BroadTest-test"}, "config.conf");
171170
Args cfgArgs = Args.getInstance();
172171
cfgArgs.setNodeListenPort(17889);
173172
cfgArgs.setNodeDiscoveryEnable(false);
@@ -220,8 +219,8 @@ public void run() {
220219
@AfterClass
221220
public static void destroy() {
222221
Args.clearParam();
223-
FileUtil.deleteDir(new File(dbPath));
224-
context.destroy();
222+
FileUtil.deleteDir(new File("output-BroadTest-test"));
223+
// context.destroy();
225224
}
226225

227226
private void prepare() {

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.netty.util.internal.ConcurrentSet;
55
import lombok.extern.slf4j.Slf4j;
66
import org.apache.commons.collections4.CollectionUtils;
7+
import org.junit.AfterClass;
78
import org.junit.Assert;
89
import org.junit.Before;
910
import org.junit.Test;
@@ -18,6 +19,7 @@
1819
import org.tron.common.overlay.server.ChannelManager;
1920
import org.tron.common.overlay.server.SyncPool;
2021
import org.tron.common.utils.ByteArray;
22+
import org.tron.common.utils.FileUtil;
2123
import org.tron.common.utils.ReflectUtils;
2224
import org.tron.common.utils.Sha256Hash;
2325
import org.tron.core.capsule.BlockCapsule;
@@ -32,6 +34,7 @@
3234
import org.tron.core.services.WitnessService;
3335
import org.tron.protos.Protocol;
3436

37+
import java.io.File;
3538
import java.lang.reflect.Field;
3639
import java.util.*;
3740
import java.util.concurrent.ConcurrentHashMap;
@@ -40,6 +43,7 @@
4043

4144
@Slf4j
4245
public class HandleSyncBlockTest {
46+
private static AnnotationConfigApplicationContext context;
4347
private NodeImpl node;
4448
RpcApiService rpcApiService;
4549
PeerClient peerClient;
@@ -147,15 +151,15 @@ public void init() {
147151
@Override
148152
public void run() {
149153
logger.info("Full node running.");
150-
Args.setParam(new String[]{"-d","output-nodeImplTest/handleSyncBlock"}, "config.conf");
154+
Args.setParam(new String[]{"-d","output-handleSyncBlock-test"}, "config.conf");
151155
Args cfgArgs = Args.getInstance();
152156
cfgArgs.setNodeListenPort(17889);
153157
cfgArgs.setNodeDiscoveryEnable(false);
154158
cfgArgs.getSeedNode().getIpList().clear();
155159
cfgArgs.setNeedSyncCheck(false);
156160
cfgArgs.setNodeExternalIp("127.0.0.1");
157161

158-
ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);
162+
context = new AnnotationConfigApplicationContext(DefaultConfig.class);
159163

160164
if (cfgArgs.isHelp()) {
161165
logger.info("Here is the help message.");
@@ -196,6 +200,14 @@ public void run() {
196200
}
197201
}
198202

203+
@AfterClass
204+
public static void destroy() {
205+
Args.clearParam();
206+
FileUtil.deleteDir(new File("output-handleSyncBlock-test"));
207+
// context.destroy();
208+
}
209+
210+
199211
private void prepare() {
200212
try {
201213
ExecutorService advertiseLoopThread = ReflectUtils.getFieldValue(node, "broadPool");

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.apache.commons.collections4.CollectionUtils;
5+
import org.junit.AfterClass;
56
import org.junit.Assert;
67
import org.junit.Before;
78
import org.junit.Test;
@@ -14,6 +15,7 @@
1415
import org.tron.common.overlay.server.Channel;
1516
import org.tron.common.overlay.server.ChannelManager;
1617
import org.tron.common.overlay.server.SyncPool;
18+
import org.tron.common.utils.FileUtil;
1719
import org.tron.common.utils.ReflectUtils;
1820
import org.tron.common.utils.Sha256Hash;
1921
import org.tron.core.capsule.BlockCapsule;
@@ -27,6 +29,7 @@
2729
import org.tron.core.services.WitnessService;
2830
import org.tron.protos.Protocol;
2931

32+
import java.io.File;
3033
import java.lang.reflect.Field;
3134
import java.util.*;
3235
import java.util.concurrent.ConcurrentHashMap;
@@ -35,6 +38,7 @@
3538

3639
@Slf4j
3740
public class StartFetchSyncBlockTest {
41+
private static AnnotationConfigApplicationContext context;
3842
private NodeImpl node;
3943
RpcApiService rpcApiService;
4044
PeerClient peerClient;
@@ -111,15 +115,15 @@ public void init() {
111115
@Override
112116
public void run() {
113117
logger.info("Full node running.");
114-
Args.setParam(new String[]{"-d","output-nodeImplTest/startFetchSyncBlock"}, "config.conf");
118+
Args.setParam(new String[]{"-d","output-startFetchSyncBlock-test"}, "config.conf");
115119
Args cfgArgs = Args.getInstance();
116120
cfgArgs.setNodeListenPort(17889);
117121
cfgArgs.setNodeDiscoveryEnable(false);
118122
cfgArgs.getSeedNode().getIpList().clear();
119123
cfgArgs.setNeedSyncCheck(false);
120124
cfgArgs.setNodeExternalIp("127.0.0.1");
121125

122-
ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);
126+
context = new AnnotationConfigApplicationContext(DefaultConfig.class);
123127

124128
if (cfgArgs.isHelp()) {
125129
logger.info("Here is the help message.");
@@ -166,6 +170,14 @@ public void run() {
166170
}
167171
}
168172

173+
@AfterClass
174+
public static void destroy() {
175+
Args.clearParam();
176+
FileUtil.deleteDir(new File("output-startFetchSyncBlock-test"));
177+
// context.destroy();
178+
179+
}
180+
169181
private void prepare() {
170182
try {
171183
ExecutorService advertiseLoopThread = ReflectUtils.getFieldValue(node, "broadPool");

0 commit comments

Comments
 (0)