fix the bug of testcase

Author: 317787106

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

@@ -4,10 +4,13 @@
 import static org.tron.keystore.Wallet.generateRandomBytes;
 
 import com.google.protobuf.ByteString;
+import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tron.common.utils.ByteArray;
 import org.tron.core.capsule.BlockCapsule;
+import org.tron.core.config.args.Args;
 import org.tron.core.services.jsonrpc.JsonRpcApiUtil;
 import org.tron.protos.Protocol.Block;
 import org.tron.protos.Protocol.BlockHeader;
@@ -16,6 +19,16 @@
 
 public class ApiUtilTest {
 
+  @BeforeClass
+  public static void init() {
+    Args.setParam(new String[]{}, "config-localtest.conf");
+  }
+
+  @AfterClass
+  public static void clear() {
+    Args.clearParam();
+  }
+
   @Test
   public void testGetBlockID() {
     byte[] mockedHash = generateRandomBytes(128);

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

@@ -1,24 +1,8 @@
 package org.tron.core.net;
 
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.DefaultMessageSizeEstimator;
-import io.netty.channel.FixedRecvByteBufAllocator;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.ByteToMessageDecoder;
-import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
-import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
-import io.netty.handler.timeout.ReadTimeoutHandler;
-import io.netty.handler.timeout.WriteTimeoutHandler;
-import java.io.File;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -29,13 +13,10 @@
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
 import org.tron.common.parameter.CommonParameter;
-import org.tron.common.utils.FileUtil;
 import org.tron.common.utils.PublicMethod;
-import org.tron.common.utils.ReflectUtils;
 import org.tron.core.Constant;
 import org.tron.core.config.DefaultConfig;
 import org.tron.core.config.args.Args;
-import org.tron.core.net.peer.PeerConnection;
 
 @Slf4j
 public class BaseNet {
@@ -53,30 +34,6 @@ public class BaseNet {
 
   private static ExecutorService executorService = Executors.newFixedThreadPool(1);
 
-  public static Channel connect(ByteToMessageDecoder decoder) throws InterruptedException {
-    NioEventLoopGroup group = new NioEventLoopGroup(1);
-    Bootstrap b = new Bootstrap();
-    b.group(group).channel(NioSocketChannel.class)
-        .handler(new ChannelInitializer<Channel>() {
-          @Override
-          protected void initChannel(Channel ch) throws Exception {
-            ch.config().setRecvByteBufAllocator(new FixedRecvByteBufAllocator(256 * 1024));
-            ch.config().setOption(ChannelOption.SO_RCVBUF, 256 * 1024);
-            ch.config().setOption(ChannelOption.SO_BACKLOG, 1024);
-            ch.pipeline()
-                .addLast("readTimeoutHandler", new ReadTimeoutHandler(600, TimeUnit.SECONDS))
-                .addLast("writeTimeoutHandler", new WriteTimeoutHandler(600, TimeUnit.SECONDS));
-            ch.pipeline().addLast("protoPender", new ProtobufVarint32LengthFieldPrepender());
-            ch.pipeline().addLast("lengthDecode", new ProtobufVarint32FrameDecoder());
-            ch.pipeline().addLast("handshakeHandler", decoder);
-            ch.closeFuture();
-          }
-        }).option(ChannelOption.SO_KEEPALIVE, true)
-        .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 60000)
-        .option(ChannelOption.MESSAGE_SIZE_ESTIMATOR, DefaultMessageSizeEstimator.DEFAULT);
-    return b.connect(Constant.LOCAL_HOST, port).sync().channel();
-  }
-
   @BeforeClass
   public static void init() throws Exception {
     executorService.execute(() -> {
@@ -123,11 +80,6 @@ public static void init() throws Exception {
 
   @AfterClass
   public static void destroy() {
-    Collection<PeerConnection> peerConnections = ReflectUtils
-        .invokeMethod(tronNetDelegate, "getActivePeer");
-    for (PeerConnection peer : peerConnections) {
-      peer.getChannel().close();
-    }
     Args.clearParam();
     context.destroy();
   }

framework/src/test/java/org/tron/core/services/http/GetRewardServletTest.java

@@ -58,15 +58,15 @@ public MockHttpServletRequest createRequest(String contentType) {
   @Before
   public void init() {
     manager.getDynamicPropertiesStore().saveChangeDelegation(1);
-    byte[] sr = decodeFromBase58Check("27VZHn9PFZwNh7o2EporxmLkpe157iWZVkh");
+    byte[] sr = decodeFromBase58Check("27bi7CD8d94AgXY3XFS9A9vx78Si5MqrECz");
     delegationStore.setBrokerage(0, sr, 10);
     delegationStore.setWitnessVote(0, sr, 100000000);
   }
 
   @Test
   public void getRewardValueByJsonTest() {
     int expect = 138181;
-    String jsonParam = "{\"address\": \"27VZHn9PFZwNh7o2EporxmLkpe157iWZVkh\"}";
+    String jsonParam = "{\"address\": \"27bi7CD8d94AgXY3XFS9A9vx78Si5MqrECz\"}";
     MockHttpServletRequest request = createRequest("application/json");
     MockHttpServletResponse response = new MockHttpServletResponse();
     request.setContent(jsonParam.getBytes());
@@ -84,7 +84,7 @@ public void getRewardValueByJsonTest() {
   @Test
   public void getRewardByJsonUTF8Test() {
     int expect = 138181;
-    String jsonParam = "{\"address\": \"27VZHn9PFZwNh7o2EporxmLkpe157iWZVkh\"}";
+    String jsonParam = "{\"address\": \"27bi7CD8d94AgXY3XFS9A9vx78Si5MqrECz\"}";
     MockHttpServletRequest request = createRequest("application/json; charset=utf-8");
     MockHttpServletResponse response = new MockHttpServletResponse();
     request.setContent(jsonParam.getBytes());
@@ -105,7 +105,7 @@ public void getRewardValueTest() {
     MockHttpServletRequest request = createRequest("application/x-www-form-urlencoded");
     MockHttpServletResponse response = new MockHttpServletResponse();
     mortgageService.payStandbyWitness();
-    request.addParameter("address", "27VZHn9PFZwNh7o2EporxmLkpe157iWZVkh");
+    request.addParameter("address", "27bi7CD8d94AgXY3XFS9A9vx78Si5MqrECz");
     getRewardServlet.doPost(request, response);
     try {
       String contentAsString = response.getContentAsString();