Skip to content

Commit 156050e

Browse files
committed
test(ci):fix test failed
1 parent f25d650 commit 156050e

File tree

5 files changed

+30
-20
lines changed

5 files changed

+30
-20
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();

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@
6060
import org.tron.core.config.DefaultConfig;
6161
import org.tron.core.config.args.Args;
6262
import org.tron.core.db.Manager;
63-
import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT;
64-
import org.tron.core.services.interfaceOnSolidity.RpcApiServiceOnSolidity;
6563
import org.tron.protos.Protocol;
6664
import org.tron.protos.Protocol.Account;
6765
import org.tron.protos.Protocol.Block;
@@ -144,11 +142,11 @@ public static void init() throws IOException {
144142
getInstance().setMetricsPrometheusPort(PublicMethod.chooseRandomPort());
145143
getInstance().setMetricsPrometheusEnable(true);
146144
getInstance().setP2pDisable(true);
147-
String fullNode = String.format("%s:%d", getInstance().getNodeLanIp(),
145+
String fullNode = String.format("%s:%d", Constant.LOCAL_HOST,
148146
getInstance().getRpcPort());
149-
String solidityNode = String.format("%s:%d", getInstance().getNodeLanIp(),
147+
String solidityNode = String.format("%s:%d", Constant.LOCAL_HOST,
150148
getInstance().getRpcOnSolidityPort());
151-
String pBFTNode = String.format("%s:%d", getInstance().getNodeLanIp(),
149+
String pBFTNode = String.format("%s:%d", Constant.LOCAL_HOST,
152150
getInstance().getRpcOnPBFTPort());
153151

154152
ManagedChannel channelFull = ManagedChannelBuilder.forTarget(fullNode)

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
import org.tron.core.Constant;
2626
import org.tron.core.config.DefaultConfig;
2727
import org.tron.core.config.args.Args;
28-
import org.tron.core.services.RpcApiService;
29-
import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT;
30-
import org.tron.core.services.interfaceOnSolidity.RpcApiServiceOnSolidity;
3128

3229
@Slf4j
3330
public class LiteFnQueryGrpcInterceptorTest {
@@ -62,11 +59,11 @@ public static void init() throws IOException {
6259
Args.getInstance().setRpcPBFTEnable(true);
6360
Args.getInstance().setRpcOnPBFTPort(PublicMethod.chooseRandomPort());
6461
Args.getInstance().setP2pDisable(true);
65-
String fullnode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
62+
String fullnode = String.format("%s:%d", Constant.LOCAL_HOST,
6663
Args.getInstance().getRpcPort());
67-
String solidityNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
64+
String solidityNode = String.format("%s:%d", Constant.LOCAL_HOST,
6865
Args.getInstance().getRpcOnSolidityPort());
69-
String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
66+
String pBFTNode = String.format("%s:%d", Constant.LOCAL_HOST,
7067
Args.getInstance().getRpcOnPBFTPort());
7168
channelFull = ManagedChannelBuilder.forTarget(fullnode)
7269
.usePlaintext()

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import org.tron.core.config.DefaultConfig;
3737
import org.tron.core.config.args.Args;
3838
import org.tron.core.services.RpcApiService;
39-
import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT;
40-
import org.tron.core.services.interfaceOnSolidity.RpcApiServiceOnSolidity;
4139
import org.tron.protos.Protocol.Transaction;
4240

4341
@Slf4j
@@ -63,11 +61,11 @@ public static void init() throws IOException {
6361
Args.getInstance().setRpcPBFTEnable(true);
6462
Args.getInstance().setRpcOnPBFTPort(PublicMethod.chooseRandomPort());
6563
Args.getInstance().setP2pDisable(true);
66-
String fullNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
64+
String fullNode = String.format("%s:%d", Constant.LOCAL_HOST,
6765
Args.getInstance().getRpcPort());
68-
String solidityNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
66+
String solidityNode = String.format("%s:%d", Constant.LOCAL_HOST,
6967
Args.getInstance().getRpcOnSolidityPort());
70-
String pBFTNode = String.format("%s:%d", Args.getInstance().getNodeLanIp(),
68+
String pBFTNode = String.format("%s:%d", Constant.LOCAL_HOST,
7169
Args.getInstance().getRpcOnPBFTPort());
7270

7371
ManagedChannel channelFull = ManagedChannelBuilder.forTarget(fullNode)

0 commit comments

Comments
 (0)