Skip to content

Commit f6f2456

Browse files
vividctrlaltvividctrlalt
committed
refactor(test): revert TestEnv rename and withDbEngineOverride changes
Restore 212 test files to develop state. The DB engine override is now handled by Gradle systemProperty injection via Typesafe Config, so individual test files no longer need withDbEngineOverride() wrapping or TestConstants->TestEnv rename.
1 parent ccec7da commit f6f2456

212 files changed

Lines changed: 829 additions & 904 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎framework/src/test/java/org/tron/common/backup/BackupManagerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.junit.Rule;
1313
import org.junit.Test;
1414
import org.junit.rules.TemporaryFolder;
15-
import org.tron.common.TestEnv;
15+
import org.tron.common.TestConstants;
1616
import org.tron.common.backup.BackupManager.BackupStatusEnum;
1717
import org.tron.common.backup.message.KeepAliveMessage;
1818
import org.tron.common.backup.socket.BackupServer;
@@ -31,7 +31,7 @@ public class BackupManagerTest {
3131
@Before
3232
public void setUp() throws Exception {
3333
Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()},
34-
TestEnv.TEST_CONF);
34+
TestConstants.TEST_CONF);
3535
CommonParameter.getInstance().setBackupPort(PublicMethod.chooseRandomPort());
3636
manager = new BackupManager();
3737
backupServer = new BackupServer(manager);

‎framework/src/test/java/org/tron/common/backup/BackupServerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.junit.Test;
99
import org.junit.rules.TemporaryFolder;
1010
import org.junit.rules.Timeout;
11-
import org.tron.common.TestEnv;
11+
import org.tron.common.TestConstants;
1212
import org.tron.common.backup.socket.BackupServer;
1313
import org.tron.common.parameter.CommonParameter;
1414
import org.tron.common.utils.PublicMethod;
@@ -27,7 +27,7 @@ public class BackupServerTest {
2727
@Before
2828
public void setUp() throws Exception {
2929
Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()},
30-
TestEnv.TEST_CONF);
30+
TestConstants.TEST_CONF);
3131
CommonParameter.getInstance().setBackupPort(PublicMethod.chooseRandomPort());
3232
List<String> members = new ArrayList<>();
3333
members.add("127.0.0.2");

‎framework/src/test/java/org/tron/common/config/args/ArgsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.junit.Rule;
1111
import org.junit.Test;
1212
import org.junit.rules.TemporaryFolder;
13-
import org.tron.common.TestEnv;
13+
import org.tron.common.TestConstants;
1414
import org.tron.common.parameter.RateLimiterInitialization;
1515
import org.tron.core.config.args.Args;
1616
import org.tron.core.config.args.CLIParameter;
@@ -24,7 +24,7 @@ public class ArgsTest {
2424
public void init() throws IOException {
2525
Args.setParam(new String[] {"--output-directory",
2626
temporaryFolder.newFolder().toString(), "--p2p-disable", "true",
27-
"--debug"}, TestEnv.TEST_CONF);
27+
"--debug"}, TestConstants.TEST_CONF);
2828
}
2929

3030
@After

‎framework/src/test/java/org/tron/common/logsfilter/EventLoaderTest.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import static org.junit.Assert.assertFalse;
55
import static org.junit.Assert.assertTrue;
66

7-
import java.io.IOException;
8-
import java.net.ServerSocket;
97
import java.util.ArrayList;
108
import java.util.List;
119
import org.junit.Assert;
@@ -19,7 +17,7 @@ public class EventLoaderTest {
1917
public void launchNativeQueue() {
2018
EventPluginConfig config = new EventPluginConfig();
2119
config.setSendQueueLength(1000);
22-
config.setBindPort(getRandomPort());
20+
config.setBindPort(5555);
2321
config.setUseNativeQueue(true);
2422
config.setPluginPath("pluginPath");
2523
config.setServerAddress("serverAddress");
@@ -98,12 +96,4 @@ public void testTransactionLogTrigger() {
9896
tlt.setTimeStamp(1L);
9997
Assert.assertNotNull(tlt.toString());
10098
}
101-
102-
private static int getRandomPort() {
103-
try (ServerSocket socket = new ServerSocket(0)) {
104-
return socket.getLocalPort();
105-
} catch (IOException e) {
106-
throw new RuntimeException(e);
107-
}
108-
}
10999
}

‎framework/src/test/java/org/tron/common/logsfilter/NativeMessageQueueTest.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.tron.common.logsfilter;
22

3-
import java.io.IOException;
4-
import java.net.ServerSocket;
53
import org.junit.Assert;
64
import org.junit.Test;
75
import org.tron.common.logsfilter.nativequeue.NativeMessageQueue;
@@ -11,7 +9,7 @@
119

1210
public class NativeMessageQueueTest {
1311

14-
public int bindPort = getRandomPort();
12+
public int bindPort = 5555;
1513
public String dataToSend = "################";
1614
public String topic = "testTopic";
1715

@@ -55,14 +53,6 @@ public void publishTrigger() {
5553
NativeMessageQueue.getInstance().stop();
5654
}
5755

58-
private static int getRandomPort() {
59-
try (ServerSocket socket = new ServerSocket(0)) {
60-
return socket.getLocalPort();
61-
} catch (IOException e) {
62-
throw new RuntimeException(e);
63-
}
64-
}
65-
6656
public void startSubscribeThread() {
6757
Thread thread = new Thread(() -> {
6858
try (ZContext context = new ZContext()) {

‎framework/src/test/java/org/tron/common/runtime/InheritanceTest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package org.tron.common.runtime;
22

3-
import static org.tron.common.TestEnv.withDbEngineOverride;
4-
53
import lombok.extern.slf4j.Slf4j;
64
import org.bouncycastle.util.encoders.Hex;
75
import org.junit.Assert;
86
import org.junit.Before;
97
import org.junit.Test;
108
import org.tron.common.BaseTest;
11-
import org.tron.common.TestEnv;
9+
import org.tron.common.TestConstants;
1210
import org.tron.core.Wallet;
1311
import org.tron.core.config.args.Args;
1412
import org.tron.core.exception.ContractExeException;
@@ -27,9 +25,7 @@ public class InheritanceTest extends BaseTest {
2725
private static boolean init;
2826

2927
static {
30-
Args.setParam(
31-
withDbEngineOverride("--output-directory", dbPath(), "--debug"),
32-
TestEnv.TEST_CONF);
28+
Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF);
3329
OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
3430
}
3531

@@ -94,6 +90,7 @@ public void inheritanceTest()
9490
.deployContractWholeProcessReturnContractAddress(contractName, callerAddress, ABI, code,
9591
value, fee, consumeUserResourcePercent, null, repository, null);
9692

93+
9794
/* ========================== CALL getName() return child value ============================= */
9895
byte[] triggerData1 = TvmTestUtils.parseAbi("getName()", "");
9996
Runtime runtime = TvmTestUtils

‎framework/src/test/java/org/tron/common/runtime/InternalTransactionComplexTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package org.tron.common.runtime;
22

3-
import static org.tron.common.TestEnv.withDbEngineOverride;
4-
53
import lombok.extern.slf4j.Slf4j;
64
import org.bouncycastle.util.encoders.Hex;
75
import org.junit.Assert;
86
import org.junit.Before;
97
import org.junit.Test;
108
import org.tron.common.BaseTest;
11-
import org.tron.common.TestEnv;
9+
import org.tron.common.TestConstants;
1210
import org.tron.common.runtime.vm.DataWord;
1311
import org.tron.core.Wallet;
1412
import org.tron.core.config.args.Args;
@@ -29,10 +27,8 @@ public class InternalTransactionComplexTest extends BaseTest {
2927
private static boolean init;
3028

3129
static {
32-
Args.setParam(
33-
withDbEngineOverride("--output-directory", dbPath(),
34-
"--debug", "--support-constant"),
35-
TestEnv.TEST_CONF);
30+
Args.setParam(new String[]{"--output-directory", dbPath(), "--debug", "--support-constant"},
31+
TestConstants.TEST_CONF);
3632
OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
3733
}
3834

@@ -94,6 +90,7 @@ public void internalTransactionAsInstanceTest()
9490
+ "000000000000000000000000000000000000000000000000000000000004cb2f"
9591
+ "0000000000000000000000000000000000000000000000000000000000123456");
9692

93+
9794
}
9895

9996
// Just for the caller/called example above

‎framework/src/test/java/org/tron/common/runtime/ProgramResultTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.tron.common.runtime;
22

3-
import static org.tron.common.TestEnv.withDbEngineOverride;
43
import static org.tron.core.capsule.utils.TransactionUtil.buildTransactionInfoInstance;
54
import static org.tron.core.utils.TransactionUtil.generateContractAddress;
65

@@ -14,7 +13,7 @@
1413
import org.junit.Before;
1514
import org.junit.Test;
1615
import org.tron.common.BaseTest;
17-
import org.tron.common.TestEnv;
16+
import org.tron.common.TestConstants;
1817
import org.tron.common.runtime.vm.DataWord;
1918
import org.tron.core.Wallet;
2019
import org.tron.core.capsule.BlockCapsule;
@@ -34,6 +33,7 @@
3433
import org.tron.protos.Protocol.Transaction;
3534
import org.tron.protos.Protocol.Transaction.Result.contractResult;
3635

36+
3737
@Slf4j
3838
public class ProgramResultTest extends BaseTest {
3939

@@ -44,10 +44,8 @@ public class ProgramResultTest extends BaseTest {
4444
private static boolean init;
4545

4646
static {
47-
Args.setParam(
48-
withDbEngineOverride("--output-directory", dbPath(),
49-
"--debug", "--support-constant"),
50-
TestEnv.TEST_CONF);
47+
Args.setParam(new String[]{"--output-directory", dbPath(), "--debug", "--support-constant"},
48+
TestConstants.TEST_CONF);
5149
OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
5250
TRANSFER_TO = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc";
5351
}
@@ -393,13 +391,15 @@ public void timeOutFeeTest()
393391
Assert.assertEquals(trxInfoCapsule.getFee(), 12705900L);
394392
Assert.assertEquals(trxInfoCapsule.getPackingFee(), 12705900L);
395393

394+
396395
traceSuccess.getReceipt().setResult(contractResult.OUT_OF_TIME);
397396

398397
trxInfoCapsule =
399398
buildTransactionInfoInstance(new TransactionCapsule(trx1), null, traceSuccess);
400399
Assert.assertEquals(trxInfoCapsule.getFee(), 12705900L);
401400
Assert.assertEquals(trxInfoCapsule.getPackingFee(), 0L);
402401

402+
403403
}
404404

405405
private byte[] deployC(String contractName)

‎framework/src/test/java/org/tron/common/runtime/RuntimeImplTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.tron.common.runtime;
22

3-
import static org.tron.common.TestEnv.withDbEngineOverride;
43
import static org.tron.common.runtime.TvmTestUtils.generateDeploySmartContractAndGetTransaction;
54
import static org.tron.common.runtime.TvmTestUtils.generateTriggerSmartContractAndGetTransaction;
65

@@ -10,7 +9,7 @@
109
import org.junit.Before;
1110
import org.junit.Test;
1211
import org.tron.common.BaseTest;
13-
import org.tron.common.TestEnv;
12+
import org.tron.common.TestConstants;
1413
import org.tron.core.Wallet;
1514
import org.tron.core.actuator.VMActuator;
1615
import org.tron.core.capsule.AccountCapsule;
@@ -29,6 +28,7 @@
2928
import org.tron.protos.Protocol.Transaction;
3029
import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
3130

31+
3232
@Slf4j
3333

3434
public class RuntimeImplTest extends BaseTest {
@@ -40,9 +40,7 @@ public class RuntimeImplTest extends BaseTest {
4040
private final long creatorTotalBalance = 3_000_000_000L;
4141

4242
static {
43-
Args.setParam(
44-
withDbEngineOverride("--output-directory", dbPath(), "--debug"),
45-
TestEnv.TEST_CONF);
43+
Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF);
4644
callerAddress = Hex
4745
.decode(Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc");
4846
creatorAddress = Hex
@@ -87,6 +85,7 @@ public void init() {
8785
//
8886
// }
8987

88+
9089
@Test
9190
public void getCreatorEnergyLimit2Test() throws ContractValidateException, ContractExeException {
9291

‎framework/src/test/java/org/tron/common/runtime/RuntimeTransferComplexTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.tron.common.runtime;
22

3-
import static org.tron.common.TestEnv.withDbEngineOverride;
43
import static org.tron.core.db.TransactionTrace.convertToTronAddress;
54

65
import lombok.extern.slf4j.Slf4j;
@@ -9,7 +8,7 @@
98
import org.junit.Before;
109
import org.junit.Test;
1110
import org.tron.common.BaseTest;
12-
import org.tron.common.TestEnv;
11+
import org.tron.common.TestConstants;
1312
import org.tron.common.utils.WalletUtil;
1413
import org.tron.common.utils.client.utils.DataWord;
1514
import org.tron.core.Wallet;
@@ -33,9 +32,7 @@ public class RuntimeTransferComplexTest extends BaseTest {
3332
private static boolean init;
3433

3534
static {
36-
Args.setParam(
37-
withDbEngineOverride("--output-directory", dbPath(), "--debug"),
38-
TestEnv.TEST_CONF);
35+
Args.setParam(new String[]{"--output-directory", dbPath(), "--debug"}, TestConstants.TEST_CONF);
3936
OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
4037
TRANSFER_TO = Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc";
4138
}
@@ -452,4 +449,5 @@ private void recoverDeposit() {
452449
repository = RepositoryImpl.createRoot(StoreFactory.getInstance());
453450
}
454451

452+
455453
}

0 commit comments

Comments
 (0)