This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 582e464032dd8cb09038fcf7a640a5d8dcebef8a
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Wed Mar 5 02:51:04 2025 +0800
RATIS-2124. Remove the use of org.junit.Rule. (#1232)
---
.../src/test/java/org/apache/ratis/BaseTest.java | 10 +----
.../ratis/statemachine/RaftSnapshotBaseTest.java | 50 +++++++++++-----------
2 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
b/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
index 3e8e9a0fe..ff912879d 100644
--- a/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
+++ b/ratis-common/src/test/java/org/apache/ratis/BaseTest.java
@@ -27,14 +27,12 @@ import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.CheckedRunnable;
import org.junit.After;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.Timeout;
-import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
@@ -88,6 +86,7 @@ public abstract class BaseTest {
// @Before annotation is retained to support junit 4 tests.
@Before
+ @BeforeEach
public void checkAssumptions() {
final Throwable first = firstException.get();
Assumptions.assumeTrue(first == null, () -> "Already failed with " +
first);
@@ -108,10 +107,6 @@ public abstract class BaseTest {
ExitUtils.assertNotTerminated();
}
- // Retained to support junit 4 tests.
- @Rule
- public final TestName testName = new TestName();
-
private static final Supplier<File> ROOT_TEST_DIR = JavaUtils.memoize(
() -> JavaUtils.callAsUnchecked(() -> {
final File dir = new File(System.getProperty("test.build.data",
"target/test/data"),
@@ -135,8 +130,7 @@ public abstract class BaseTest {
public File getTestDir() {
// This will work for both junit 4 and 5.
- final String name = testCaseName != null ? testCaseName :
testName.getMethodName();
- return new File(getClassTestDir(), name);
+ return new File(getClassTestDir(), testCaseName);
}
@SafeVarargs
diff --git
a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
index fe1a97ddc..507dd63ad 100644
---
a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
@@ -49,10 +49,10 @@ import org.apache.ratis.util.FileUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.Slf4jUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,16 +96,16 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
final RaftLog log = server.getRaftLog();
final long lastIndex = log.getLastEntryTermIndex().getIndex();
final LogEntryProto e = log.get(lastIndex);
- Assert.assertTrue(e.hasMetadataEntry());
+ Assertions.assertTrue(e.hasMetadataEntry());
JavaUtils.attemptRepeatedly(() -> {
- Assert.assertEquals(log.getLastCommittedIndex() - 1,
e.getMetadataEntry().getCommitIndex());
+ Assertions.assertEquals(log.getLastCommittedIndex() - 1,
e.getMetadataEntry().getCommitIndex());
return null;
}, 50, BaseTest.HUNDRED_MILLIS, "CheckMetadataEntry", LOG);
SimpleStateMachine4Testing simpleStateMachine =
SimpleStateMachine4Testing.get(server);
if (isLeader) {
- Assert.assertTrue("Not notified as a leader",
simpleStateMachine.isNotifiedAsLeader());
+ Assertions.assertTrue(simpleStateMachine.isNotifiedAsLeader(), "Not
notified as a leader");
}
final LogEntryProto[] entries = simpleStateMachine.getContent();
long message = 0;
@@ -113,7 +113,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
LOG.info("{}) {} {}", i, message, entries[i].toString().replace("\n", ",
"));
if (entries[i].hasStateMachineLogEntry()) {
final SimpleMessage m = new SimpleMessage("m" + message++);
- Assert.assertArrayEquals(m.getContent().toByteArray(),
+ Assertions.assertArrayEquals(m.getContent().toByteArray(),
entries[i].getStateMachineLogEntry().getLogData().toByteArray());
}
}
@@ -123,7 +123,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
public abstract MiniRaftCluster.Factory<?> getFactory();
- @Before
+ @BeforeEach
public void setup() throws IOException {
final RaftProperties prop = new RaftProperties();
prop.setClass(MiniRaftCluster.STATEMACHINE_CLASS_KEY,
@@ -135,7 +135,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
cluster.start();
}
- @After
+ @AfterEach
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
@@ -155,7 +155,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
try(final RaftClient client = cluster.createClient(leaderId)) {
for (; i < SNAPSHOT_TRIGGER_THRESHOLD * 2 - 1; i++) {
RaftClientReply reply = client.io().send(new SimpleMessage("m" + i));
- Assert.assertTrue(reply.isSuccess());
+ Assertions.assertTrue(reply.isSuccess());
}
}
@@ -164,7 +164,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
// wait for the snapshot to be done
final List<File> snapshotFiles = getSnapshotFiles(cluster, nextIndex -
SNAPSHOT_TRIGGER_THRESHOLD, nextIndex);
JavaUtils.attemptRepeatedly(() -> {
-
Assert.assertTrue(snapshotFiles.stream().anyMatch(RaftSnapshotBaseTest::exists));
+
Assertions.assertTrue(snapshotFiles.stream().anyMatch(RaftSnapshotBaseTest::exists));
return null;
}, 10, ONE_SECOND, "snapshotFile.exist", LOG);
@@ -202,7 +202,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
try(final RaftClient client = cluster.createClient(leaderId)) {
for (; i < SNAPSHOT_TRIGGER_THRESHOLD * 2 - 1; i++) {
RaftClientReply reply = client.io().send(new SimpleMessage("m" + i));
- Assert.assertTrue(reply.isSuccess());
+ Assertions.assertTrue(reply.isSuccess());
}
}
@@ -211,7 +211,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
LOG.info("nextIndex = {}", nextIndex);
final List<File> snapshotFiles = getSnapshotFiles(cluster, nextIndex -
SNAPSHOT_TRIGGER_THRESHOLD, nextIndex);
JavaUtils.attemptRepeatedly(() -> {
-
Assert.assertTrue(snapshotFiles.stream().anyMatch(RaftSnapshotBaseTest::exists));
+
Assertions.assertTrue(snapshotFiles.stream().anyMatch(RaftSnapshotBaseTest::exists));
return null;
}, 10, ONE_SECOND, "snapshotFile.exist", LOG);
verifyTakeSnapshotMetric(cluster.getLeader());
@@ -233,7 +233,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
// generate some more traffic
try(final RaftClient client =
cluster.createClient(cluster.getLeader().getId())) {
- Assert.assertTrue(client.io().send(new SimpleMessage("m" +
i)).isSuccess());
+ Assertions.assertTrue(client.io().send(new SimpleMessage("m" +
i)).isSuccess());
}
// add two more peers
@@ -247,7 +247,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
for (String newPeer : newPeers) {
final RaftServer.Division s =
cluster.getDivision(RaftPeerId.valueOf(newPeer));
SimpleStateMachine4Testing simpleStateMachine =
SimpleStateMachine4Testing.get(s);
- Assert.assertSame(LifeCycle.State.RUNNING,
simpleStateMachine.getLifeCycleState());
+ Assertions.assertSame(LifeCycle.State.RUNNING,
simpleStateMachine.getLifeCycleState());
}
// Verify installSnapshot counter on leader before restart.
@@ -262,7 +262,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
assertLeaderContent(cluster);
// verify that snapshot was taken when stopping the server
- Assert.assertTrue(count < timer.getCount());
+ Assertions.assertTrue(count < timer.getCount());
} finally {
cluster.shutdown();
}
@@ -283,7 +283,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
try(final RaftClient client = cluster.createClient(leaderId)) {
for (; i < SNAPSHOT_TRIGGER_THRESHOLD * 2 - 1; i++) {
RaftClientReply reply = client.io().send(new SimpleMessage("m" + i));
- Assert.assertTrue(reply.isSuccess());
+ Assertions.assertTrue(reply.isSuccess());
}
}
@@ -292,7 +292,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
LOG.info("nextIndex = {}", nextIndex);
final List<File> snapshotFiles = getSnapshotFiles(cluster, nextIndex -
SNAPSHOT_TRIGGER_THRESHOLD, nextIndex);
JavaUtils.attemptRepeatedly(() -> {
-
Assert.assertTrue(snapshotFiles.stream().anyMatch(RaftSnapshotBaseTest::exists));
+
Assertions.assertTrue(snapshotFiles.stream().anyMatch(RaftSnapshotBaseTest::exists));
return null;
}, 10, ONE_SECOND, "snapshotFile.exist", LOG);
verifyTakeSnapshotMetric(cluster.getLeader());
@@ -310,7 +310,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
for (String newPeer : newPeers) {
final RaftServer.Division s =
cluster.getDivision(RaftPeerId.valueOf(newPeer));
SimpleStateMachine4Testing simpleStateMachine =
SimpleStateMachine4Testing.get(s);
- Assert.assertSame(LifeCycle.State.RUNNING,
simpleStateMachine.getLifeCycleState());
+ Assertions.assertSame(LifeCycle.State.RUNNING,
simpleStateMachine.getLifeCycleState());
}
// Verify installSnapshot counter on leader
@@ -324,13 +324,13 @@ public abstract class RaftSnapshotBaseTest extends
BaseTest {
protected void verifyInstallSnapshotMetric(RaftServer.Division leader) {
final LongCounter installSnapshotCounter =
((RaftServerMetricsImpl)leader.getRaftServerMetrics())
.getNumInstallSnapshot();
- Assert.assertNotNull(installSnapshotCounter);
- Assert.assertTrue(installSnapshotCounter.getCount() >= 1);
+ Assertions.assertNotNull(installSnapshotCounter);
+ Assertions.assertTrue(installSnapshotCounter.getCount() >= 1);
}
private static void verifyTakeSnapshotMetric(RaftServer.Division leader) {
Timer timer = getTakeSnapshotTimer(leader);
- Assert.assertTrue(timer.getCount() > 0);
+ Assertions.assertTrue(timer.getCount() > 0);
}
private static Timer getTakeSnapshotTimer(RaftServer.Division leader) {
@@ -338,9 +338,9 @@ public abstract class RaftSnapshotBaseTest extends BaseTest
{
RATIS_APPLICATION_NAME_METRICS,
RATIS_STATEMACHINE_METRICS, RATIS_STATEMACHINE_METRICS_DESC);
Optional<RatisMetricRegistry> opt = MetricRegistries.global().get(info);
- Assert.assertTrue(opt.isPresent());
+ Assertions.assertTrue(opt.isPresent());
RatisMetricRegistry metricRegistry = opt.get();
- Assert.assertNotNull(metricRegistry);
+ Assertions.assertNotNull(metricRegistry);
return
((DefaultTimekeeperImpl)metricRegistry.timer(STATEMACHINE_TAKE_SNAPSHOT_TIMER)).getTimer();
}
}
