Skip to content

Commit 3a6d3c1

Browse files
committed
test(ci):fix test failed
1 parent 36a4679 commit 3a6d3c1

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
import static org.tron.keystore.Wallet.generateRandomBytes;
55

66
import com.google.protobuf.ByteString;
7+
import org.junit.AfterClass;
78
import org.junit.Assert;
9+
import org.junit.BeforeClass;
810
import org.junit.Test;
911
import org.tron.common.utils.ByteArray;
1012
import org.tron.core.capsule.BlockCapsule;
13+
import org.tron.core.config.args.Args;
1114
import org.tron.core.services.jsonrpc.JsonRpcApiUtil;
1215
import org.tron.protos.Protocol.Block;
1316
import org.tron.protos.Protocol.BlockHeader;
@@ -16,6 +19,17 @@
1619

1720
public class ApiUtilTest {
1821

22+
23+
@BeforeClass
24+
public static void init() {
25+
Args.setParam(new String[]{}, "config-localtest.conf");
26+
}
27+
28+
@AfterClass
29+
public static void clear() {
30+
Args.clearParam();
31+
}
32+
1933
@Test
2034
public void testGetBlockID() {
2135
byte[] mockedHash = generateRandomBytes(128);

framework/src/test/java/org/tron/core/net/BaseNet.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.io.File;
1717
import java.io.IOException;
1818
import java.util.Collection;
19+
import java.util.Objects;
1920
import java.util.concurrent.ExecutorService;
2021
import java.util.concurrent.Executors;
2122
import java.util.concurrent.TimeUnit;
@@ -123,10 +124,12 @@ public static void init() throws Exception {
123124

124125
@AfterClass
125126
public static void destroy() {
126-
Collection<PeerConnection> peerConnections = ReflectUtils
127-
.invokeMethod(tronNetDelegate, "getActivePeer");
128-
for (PeerConnection peer : peerConnections) {
129-
peer.getChannel().close();
127+
if (Objects.nonNull(tronNetDelegate)) {
128+
Collection<PeerConnection> peerConnections = ReflectUtils
129+
.invokeMethod(tronNetDelegate, "getActivePeer");
130+
for (PeerConnection peer : peerConnections) {
131+
peer.getChannel().close();
132+
}
130133
}
131134
Args.clearParam();
132135
context.destroy();

0 commit comments

Comments
 (0)