From 1fc4632f690aa041dc3f5250112e07617aaabdc9 Mon Sep 17 00:00:00 2001 From: Wenhua Zhang Date: Thu, 23 Sep 2021 12:00:14 +0800 Subject: [PATCH 1/6] feat: remove db after test --- .../vm/ValidateMultiSignContractTest.java | 17 +++++++++++++++++ .../leveldb/RocksDbDataSourceImplTest.java | 12 ++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java b/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java index 883e65a99cc..4ce516cd11f 100644 --- a/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java +++ b/framework/src/test/java/org/tron/common/runtime/vm/ValidateMultiSignContractTest.java @@ -1,12 +1,14 @@ package org.tron.common.runtime.vm; import com.google.protobuf.ByteString; +import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; import org.bouncycastle.util.encoders.Hex; +import org.junit.AfterClass; import org.junit.Test; import org.testng.Assert; import org.tron.common.application.Application; @@ -17,6 +19,7 @@ import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.ByteArray; import org.tron.common.utils.ByteUtil; +import org.tron.common.utils.FileUtil; import org.tron.common.utils.Sha256Hash; import org.tron.common.utils.StringUtil; import org.tron.core.Constant; @@ -55,6 +58,20 @@ public class ValidateMultiSignContractTest { ValidateMultiSign contract = new ValidateMultiSign(); + /** + * Release resources. + */ + @AfterClass + public static void destroy() { + Args.clearParam(); + context.destroy(); + if (FileUtil.deleteDir(new File(dbPath))) { + logger.info("Release resources successful."); + } else { + logger.info("Release resources failure."); + } + } + @Test public void testAddressNonExist() { byte[] hash = Hash.sha3(longData); diff --git a/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java b/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java index ef27e6e6e66..93d3451e7a1 100644 --- a/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java +++ b/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java @@ -18,6 +18,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.storage.rocksdb.RocksDbDataSourceImpl; import org.tron.common.utils.ByteArray; @@ -49,16 +50,23 @@ public class RocksDbDataSourceImplTest { */ @AfterClass public static void destroy() { + String directory =Args.getInstance().getStorage().getDbDirectory(); Args.clearParam(); if (FileUtil.deleteDir(new File(dbPath))) { logger.info("Release resources successful."); } else { logger.info("Release resources failure."); } + + if (FileUtil.deleteDir(new File(dbPath + directory))) { + logger.info("Release resources successful."); + } else { + logger.info("Release resources failure."); + } } - @Before - public void initDb() { + @BeforeClass + public static void initDb() { Args.setParam(new String[]{"--output-directory", dbPath}, "config-test-dbbackup.conf"); dataSourceTest = new RocksDbDataSourceImpl(dbPath + File.separator, "test_rocksDb"); } From c12349c7aff4d2b1b77e324c258defdf97f9a5e0 Mon Sep 17 00:00:00 2001 From: Wenhua Zhang Date: Thu, 23 Sep 2021 12:14:55 +0800 Subject: [PATCH 2/6] typo --- .../tron/common/storage/leveldb/RocksDbDataSourceImplTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java b/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java index 93d3451e7a1..e872b4ddfab 100644 --- a/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java +++ b/framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java @@ -50,7 +50,7 @@ public class RocksDbDataSourceImplTest { */ @AfterClass public static void destroy() { - String directory =Args.getInstance().getStorage().getDbDirectory(); + String directory = Args.getInstance().getStorage().getDbDirectory(); Args.clearParam(); if (FileUtil.deleteDir(new File(dbPath))) { logger.info("Release resources successful."); From aa950df53a6381128255dca07430d7dff5261640 Mon Sep 17 00:00:00 2001 From: Wenhua Zhang Date: Thu, 23 Sep 2021 12:25:10 +0800 Subject: [PATCH 3/6] feat: remove db for EnergyPriceHistoryLoaderTest --- .../core/services/ProposalServiceTest.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java index 4e5d420535c..11c29f59958 100644 --- a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java +++ b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java @@ -6,9 +6,12 @@ import java.io.File; import java.util.HashSet; import java.util.Set; +import lombok.extern.slf4j.Slf4j; import org.junit.After; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.application.TronApplicationContext; import org.tron.common.utils.FileUtil; @@ -21,14 +24,15 @@ import org.tron.core.utils.ProposalUtil.ProposalType; import org.tron.protos.Protocol.Proposal; +@Slf4j public class ProposalServiceTest { - private TronApplicationContext context; - private Manager manager; - private String dbPath = "output_proposal_test"; + private static TronApplicationContext context; + private static Manager manager; + private static String dbPath = "output_proposal_test"; - @Before - public void init() { + @BeforeClass + public static void init() { Args.setParam(new String[]{"-d", dbPath}, Constant.TEST_CONF); context = new TronApplicationContext(DefaultConfig.class); manager = context.getBean(Manager.class); @@ -82,11 +86,14 @@ public void testUpdateEnergyFee() { currentHistory); } - - @After - public void removeDb() { + @AfterClass + public static void removeDb() { Args.clearParam(); context.destroy(); - FileUtil.deleteDir(new File(dbPath)); + if (FileUtil.deleteDir(new File(dbPath))) { + logger.info("Release resources successful."); + } else { + logger.info("Release resources failure."); + } } } From e0c0933e2b27f611ede39ce946875f85f6b0c914 Mon Sep 17 00:00:00 2001 From: Wenhua Zhang Date: Thu, 23 Sep 2021 12:26:39 +0800 Subject: [PATCH 4/6] typo --- .../test/java/org/tron/core/services/ProposalServiceTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java index 11c29f59958..8c28c04c05d 100644 --- a/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java +++ b/framework/src/test/java/org/tron/core/services/ProposalServiceTest.java @@ -7,10 +7,8 @@ import java.util.HashSet; import java.util.Set; import lombok.extern.slf4j.Slf4j; -import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.tron.common.application.TronApplicationContext; From 5d6bfd795ff42628a4280eb2883aee9f5d2680a3 Mon Sep 17 00:00:00 2001 From: Wenhua Zhang Date: Wed, 29 Sep 2021 17:26:32 +0800 Subject: [PATCH 5/6] test: try to modity NodeManagerTest --- .../discover/node/NodeManagerTest.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/framework/src/test/java/org/tron/common/overlay/discover/node/NodeManagerTest.java b/framework/src/test/java/org/tron/common/overlay/discover/node/NodeManagerTest.java index d5706b847a0..f5b870bacdf 100644 --- a/framework/src/test/java/org/tron/common/overlay/discover/node/NodeManagerTest.java +++ b/framework/src/test/java/org/tron/common/overlay/discover/node/NodeManagerTest.java @@ -79,15 +79,16 @@ public static void destroy() { // @Before public static void initManager() throws Exception { nodeManagerClazz = NodeManager.class; - Constructor handlerConstructor - = nodeManagerClazz.getConstructor(ChainBaseManager.class); + // Constructor handlerConstructor + // = nodeManagerClazz.getConstructor(ChainBaseManager.class); manager = context.getBean(Manager.class); - nodeManager = handlerConstructor.newInstance(context.getBean(ChainBaseManager.class)); + // nodeManager = handlerConstructor.newInstance(context.getBean(ChainBaseManager.class)); + nodeManager = new NodeManager(context.getBean(ChainBaseManager.class)); } @Test public void isNodeAliveTest() { - Node node = new Node(new byte[64], "128.0.0.1", 18888, 18888); + Node node = new Node(new byte[64], "128.0.0.1", 18889, 18889); nodeManager.getTable().addNode(node); NodeHandler nodeHandler = new NodeHandler(node, nodeManager); nodeHandler.changeState(NodeHandler.State.ACTIVE); @@ -167,7 +168,7 @@ public int insertValues(int totalNodes) throws Exception { Class nodeClazz = Node.class; Constructor nodeConstructor = nodeClazz.getConstructor(byte[].class, String.class, int.class, int.class); - Node node = nodeConstructor.newInstance(bytes, stringBuilder.toString(), 18888, 18888); + Node node = nodeConstructor.newInstance(bytes, stringBuilder.toString(), 18889, 18889); Field isConnectableField = nodeClazz.getDeclaredField("p2pVersion"); isConnectableField.setAccessible(true); isConnectableField.set(node, Args.getInstance().getNodeP2pVersion()); @@ -183,10 +184,10 @@ public void insertNotConnectibleNodes() throws Exception { Class nodeClazz = Node.class; Constructor nodeConstructor = nodeClazz.getConstructor(byte[].class, String.class, int.class, int.class); - Node wrongNode1 = nodeConstructor.newInstance(new byte[64], "128.0.0.1", 1111, 18888); + Node wrongNode1 = nodeConstructor.newInstance(new byte[64], "128.0.0.1", 1111, 18889); byte[] id = new byte[64]; id[63] = 1; - Node wrongNode2 = nodeConstructor.newInstance(id, "128.0.0.2", 1111, 18888); + Node wrongNode2 = nodeConstructor.newInstance(id, "128.0.0.2", 1111, 18889); Field isConnectableField = nodeClazz.getDeclaredField("p2pVersion"); isConnectableField.setAccessible(true); isConnectableField.set(wrongNode1, 999); @@ -210,9 +211,9 @@ public int getHandlerMapSize() throws Exception { @Test public void dumpActiveNodesTest() { - Node node1 = new Node(new byte[64], "128.0.0.1", 18888, 18888); - Node node2 = new Node(new byte[64], "128.0.0.2", 18888, 18888); - Node node3 = new Node(new byte[64], "128.0.0.3", 18888, 18888); + Node node1 = new Node(new byte[64], "128.0.0.1", 18889, 18889); + Node node2 = new Node(new byte[64], "128.0.0.2", 18889, 18889); + Node node3 = new Node(new byte[64], "128.0.0.3", 18889, 18889); NodeHandler nodeHandler1 = nodeManager.getNodeHandler(node1); NodeHandler nodeHandler2 = nodeManager.getNodeHandler(node2); NodeHandler nodeHandler3 = nodeManager.getNodeHandler(node3); From 10b753678f35e4ccd1cf227be822b3acfae3d5b0 Mon Sep 17 00:00:00 2001 From: Wenhua Zhang Date: Wed, 29 Sep 2021 17:33:51 +0800 Subject: [PATCH 6/6] test: removed unused code --- .../overlay/discover/node/NodeHandlerTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/framework/src/test/java/org/tron/common/overlay/discover/node/NodeHandlerTest.java b/framework/src/test/java/org/tron/common/overlay/discover/node/NodeHandlerTest.java index 98e5e6da913..dfe24f8e644 100644 --- a/framework/src/test/java/org/tron/common/overlay/discover/node/NodeHandlerTest.java +++ b/framework/src/test/java/org/tron/common/overlay/discover/node/NodeHandlerTest.java @@ -9,24 +9,21 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.tron.common.application.Application; import org.tron.common.application.TronApplicationContext; -import org.tron.common.parameter.CommonParameter; import org.tron.common.utils.FileUtil; import org.tron.core.ChainBaseManager; import org.tron.core.Constant; import org.tron.core.config.DefaultConfig; import org.tron.core.config.args.Args; -import org.tron.core.db.Manager; public class NodeHandlerTest { private static final Logger logger = LoggerFactory.getLogger("Test"); - private static Manager dbManager; + // private static Manager dbManager; private static TronApplicationContext context; - private Application appTest; - private CommonParameter argsTest; + // private Application appTest; + // private CommonParameter argsTest; private static Node currNode; private static Node oldNode; private static Node replaceNode; @@ -67,7 +64,7 @@ public static void destroy() { * init nodes. */ public static void initNodes() { - dbManager = context.getBean(Manager.class); + // dbManager = context.getBean(Manager.class); nodeManager = new NodeManager(context.getBean(ChainBaseManager.class)); String currNodeId = "74c11ffad1d59d7b1a56691a0b84a53f0791c92361357364f1d2537" + "898407ef0249bbbf5a4ce8cff9e34e2fdf8bac883540e026d1e5d6ebf536414bdde81198e"; @@ -97,7 +94,7 @@ public void stateNonActiveTest() throws Exception { nh.changeState(NodeHandler.State.NONACTIVE); replaceHandler.changeState(NodeHandler.State.ALIVE); - Assert.assertTrue(!nodeManager.getTable().contains(oldNode)); + Assert.assertFalse(nodeManager.getTable().contains(oldNode)); Assert.assertTrue(nodeManager.getTable().contains(replaceNode)); } }