RATIS-1977. Remove Junit 4 dependencies. (#1269)

Author: slfan1989

pom.xml

@@ -221,8 +221,10 @@
     <testsThreadCount>4</testsThreadCount>
 
     <slf4j.version>2.0.7</slf4j.version>
-    <junit-bom.version>5.11.2</junit-bom.version>
+    <junit-bom.version>5.12.2</junit-bom.version>
+    <mockito.version>4.11.0</mockito.version>
     <jacoco.version>0.8.12</jacoco.version>
+    <jakarta.annotation.version>1.3.5</jakarta.annotation.version>
     <flaky-test-groups>flaky | org.apache.ratis.test.tag.FlakyTest</flaky-test-groups>
   </properties>
 
@@ -417,12 +419,6 @@
         <scope>test</scope>
         <version>${slf4j.version}</version>
       </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.2</version>
-      </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
@@ -433,13 +429,12 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>4.3.1</version>
+        <version>${mockito.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>annotations-api</artifactId>
-        <version>6.0.53</version>
-        <scope>provided</scope>
+        <groupId>jakarta.annotation</groupId>
+        <artifactId>jakarta.annotation-api</artifactId>
+        <version>${jakarta.annotation.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

ratis-common/pom.xml

@@ -38,12 +38,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -54,11 +48,6 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>

ratis-common/src/test/java/org/apache/ratis/BaseTest.java

@@ -26,8 +26,6 @@
 import org.apache.ratis.util.StringUtils;
 import org.apache.ratis.util.TimeDuration;
 import org.apache.ratis.util.function.CheckedRunnable;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
@@ -72,8 +70,6 @@ public void setFirstException(Throwable e) {
     }
   }
 
-  // TODO: Junit 4 reference should be removed once all the unit tests are migrated to Junit 5.
-
   private String testCaseName;
 
   @BeforeEach
@@ -85,8 +81,6 @@ public void setup(TestInfo testInfo) {
         + "." + (method == null? null : method.getName());
   }
 
-  // @Before annotation is retained to support junit 4 tests.
-  @Before
   @BeforeEach
   public void checkAssumptions() {
     final int leaks = ReferenceCountedLeakDetector.getLeakDetector().getLeakCount();
@@ -99,8 +93,6 @@ public void checkAssumptions() {
     Assumptions.assumeTrue(exited == null, () -> "Already exited with " + exited);
   }
 
-  // @After annotation is retained to support junit 4 tests.
-  @After
   @AfterEach
   public void assertNoFailures() {
     final Throwable e = firstException.get();
@@ -133,7 +125,6 @@ public File getClassTestDir() {
   }
 
   public File getTestDir() {
-    // This will work for both junit 4 and 5.
     return new File(getClassTestDir(), testCaseName);
   }
 

ratis-examples/pom.xml

@@ -117,11 +117,6 @@
       <scope>runtime</scope>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

ratis-proto/pom.xml

@@ -176,8 +176,8 @@
       <artifactId>ratis-thirdparty-misc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>annotations-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
   </dependencies>
 </project>

ratis-server/pom.xml

@@ -65,11 +65,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -80,11 +75,6 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>

ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java

@@ -34,7 +34,7 @@
 import org.apache.ratis.util.Slf4jUtils;
 import org.apache.ratis.util.SizeInBytes;
 import org.junit.jupiter.api.Assertions;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.slf4j.event.Level;
 
@@ -84,7 +84,7 @@ RaftClientReply assertNotLeaderException(RaftPeerId expectedSuggestedLeader,
     final SimpleMessage message = new SimpleMessage(messageId);
     final RaftClientReply reply = rpc.sendRequest(cluster.newRaftClientRequest(ClientId.randomId(), server, message));
     Assertions.assertNotNull(reply);
-    Assume.assumeFalse(reply.isSuccess());
+    Assumptions.assumeFalse(reply.isSuccess());
     final NotLeaderException nle = reply.getNotLeaderException();
     Objects.requireNonNull(nle);
     Assertions.assertEquals(expectedSuggestedLeader, nle.getSuggestedLeader().getId());

ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java

@@ -44,7 +44,8 @@
 import org.apache.ratis.util.Preconditions;
 import org.apache.ratis.util.ProtoUtils;
 import org.apache.ratis.util.TimeDuration;
-import org.junit.AssumptionViolatedException;
+import org.apache.ratis.util.function.CheckedConsumer;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Assertions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -479,18 +480,18 @@ static List<RaftPeer> getPeersWithPriority(List<RaftPeer> peers, RaftPeer sugges
 
   static RaftPeerId changeLeader(MiniRaftCluster cluster, RaftPeerId oldLeader)
       throws Exception {
-    return changeLeader(cluster, oldLeader, AssumptionViolatedException::new);
+    return changeLeader(cluster, oldLeader, Assumptions::abort);
   }
 
-  static RaftPeerId changeLeader(MiniRaftCluster cluster, RaftPeerId oldLeader, Function<String, Exception> constructor)
-      throws Exception {
+  static RaftPeerId changeLeader(MiniRaftCluster cluster, RaftPeerId oldLeader,
+      CheckedConsumer<String, Exception> failToChangeLeaderHandler) throws Exception {
     final String name = JavaUtils.getCallerStackTraceElement().getMethodName() + "-changeLeader";
     cluster.setBlockRequestsFrom(oldLeader.toString(), true);
     try {
       return JavaUtils.attemptRepeatedly(() -> {
         final RaftPeerId newLeader = waitForLeader(cluster).getId();
         if (newLeader.equals(oldLeader)) {
-          throw constructor.apply("Failed to change leader: newLeader == oldLeader == " + oldLeader);
+          failToChangeLeaderHandler.accept("Failed to change leader: newLeader == oldLeader == " + oldLeader);
         }
         LOG.info("Changed leader from " + oldLeader + " to " + newLeader);
         return newLeader;

ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java

@@ -184,7 +184,7 @@ public void testChangeLeader() throws Exception {
   void runTestChangeLeader(MiniRaftCluster cluster) throws Exception {
     RaftPeerId leader = RaftTestUtil.waitForLeader(cluster).getId();
     for(int i = 0; i < 10; i++) {
-      leader = RaftTestUtil.changeLeader(cluster, leader, IllegalStateException::new);
+      leader = RaftTestUtil.changeLeader(cluster, leader, Assertions::fail);
     }
   }
 

ratis-server/src/test/java/org/apache/ratis/server/impl/StateMachineShutdownTests.java

@@ -28,7 +28,10 @@
 import org.apache.ratis.statemachine.impl.SimpleStateMachine4Testing;
 import org.apache.ratis.statemachine.StateMachine;
 import org.apache.ratis.statemachine.TransactionContext;
-import org.junit.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
@@ -121,12 +124,12 @@ public void unblockAllTxns() {
     }
   }
 
-  @Before
+  @BeforeEach
   public void setup() {
     mocked = Mockito.mockStatic(CompletableFuture.class, Mockito.CALLS_REAL_METHODS);
   }
 
-  @After
+  @AfterEach
   public void tearDownClass() {
     if (mocked != null) {
       mocked.close();
@@ -162,10 +165,10 @@ public void testStateMachineShutdownWaitsForApplyTxn() throws Exception {
       RaftClientReply watchReply = client.io().watch(
               logIndex, RaftProtos.ReplicationLevel.ALL_COMMITTED);
       watchReply.getCommitInfos().forEach(
-              val -> Assert.assertTrue(val.getCommitIndex() >= logIndex));
+              val -> Assertions.assertTrue(val.getCommitIndex() >= logIndex));
       final RaftServer.Division secondFollower = cluster.getFollowers().get(1);
       // Second follower is blocked in apply transaction
-      Assert.assertTrue(secondFollower.getInfo().getLastAppliedIndex() < logIndex);
+      Assertions.assertTrue(secondFollower.getInfo().getLastAppliedIndex() < logIndex);
 
       // Now shutdown the follower in a separate thread
       final Thread t = new Thread(secondFollower::close);
@@ -176,24 +179,24 @@ public void testStateMachineShutdownWaitsForApplyTxn() throws Exception {
       // Now unblock the second follower
       long minIndex = ((StateMachineWithConditionalWait) secondFollower.getStateMachine()).blockTxns.stream()
               .min(Comparator.naturalOrder()).get();
-      Assert.assertEquals(2, StateMachineWithConditionalWait.numTxns.values().stream()
+      Assertions.assertEquals(2, StateMachineWithConditionalWait.numTxns.values().stream()
                       .filter(val -> val.get() == 3).count());
       // The second follower should still be blocked in apply transaction
-      Assert.assertTrue(secondFollower.getInfo().getLastAppliedIndex() < minIndex);
+      Assertions.assertTrue(secondFollower.getInfo().getLastAppliedIndex() < minIndex);
       for (long index : ((StateMachineWithConditionalWait) secondFollower.getStateMachine()).blockTxns) {
         if (minIndex != index) {
           ((StateMachineWithConditionalWait) secondFollower.getStateMachine()).unBlockApplyTxn(index);
         }
       }
-      Assert.assertEquals(2, StateMachineWithConditionalWait.numTxns.values().stream()
+      Assertions.assertEquals(2, StateMachineWithConditionalWait.numTxns.values().stream()
               .filter(val -> val.get() == 3).count());
-      Assert.assertTrue(secondFollower.getInfo().getLastAppliedIndex() < minIndex);
+      Assertions.assertTrue(secondFollower.getInfo().getLastAppliedIndex() < minIndex);
       ((StateMachineWithConditionalWait) secondFollower.getStateMachine()).unBlockApplyTxn(minIndex);
 
       // Now wait for the thread
       t.join(5000);
-      Assert.assertEquals(logIndex, secondFollower.getInfo().getLastAppliedIndex());
-      Assert.assertEquals(3, StateMachineWithConditionalWait.numTxns.values().stream()
+      Assertions.assertEquals(logIndex, secondFollower.getInfo().getLastAppliedIndex());
+      Assertions.assertEquals(3, StateMachineWithConditionalWait.numTxns.values().stream()
               .filter(val -> val.get() == 3).count());
 
       cluster.shutdown();