Upgrade JUnit4 to Junit5

build.gradle

@@ -37,7 +37,6 @@ buildscript {
 ext.versions = [
         flink    : "1.14.2",
         hadoop   : "2.7.7",
-        junit4   : "4.11",
         junit5   : "5.4.+",
         mockito  : "2.0.+",
         mockito3 : "3.+",
@@ -58,10 +57,6 @@ ext.libraries = [
         flinkRpcImpl   : [
                 "org.apache.flink:flink-rpc-akka:${versions.flink}",
         ],
-        junit4         : [
-                "junit:junit:${versions.junit4}",
-                "junit:junit-dep:${versions.junit4}",
-        ],
         hadoopCommon   : "org.apache.hadoop:hadoop-common:${versions.hadoop}",
         hadoopS3       : "org.apache.hadoop:hadoop-aws:${versions.hadoop}",
         junitJupiter   : [

mantis-client/build.gradle

@@ -21,7 +21,7 @@ dependencies {
 
     implementation libraries.slf4jApi
     implementation libraries.spectatorApi
-    testImplementation libraries.junit4
+    testImplementation libraries.junitJupiter
     testImplementation libraries.mockitoCore
 }
 

mantis-client/src/test/java/MantisSSEJobTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import io.mantisrx.client.MantisClient;
 import io.mantisrx.client.MantisSSEJob;

mantis-common/build.gradle

@@ -44,6 +44,6 @@ dependencies {
     testImplementation libraries.spectatorApi
     testImplementation libraries.commonsLang3
     testImplementation "org.hamcrest:hamcrest-core:1.3"
-    testImplementation libraries.junit4
+    testImplementation libraries.junitJupiter
     testImplementation libraries.mockitoCore
 }

mantis-common/src/test/java/com/mantisrx/common/utils/LabelUtilsTest.java

@@ -16,17 +16,17 @@
 
 package com.mantisrx.common.utils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import io.mantisrx.common.Label;
 import io.mantisrx.shaded.com.fasterxml.jackson.core.JsonProcessingException;
 import io.mantisrx.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 public class LabelUtilsTest {
@@ -189,4 +189,4 @@ public void testSerDe() {
     }
 
 
-}
+}

mantis-common/src/test/java/io/mantisrx/common/AckTest.java

@@ -16,9 +16,9 @@
 
 package io.mantisrx.common;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AckTest {
     private final JsonSerializer serializer = new JsonSerializer();

mantis-common/src/test/java/io/mantisrx/common/WorkerPortsTest.java

@@ -15,12 +15,13 @@
  */
 package io.mantisrx.common;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Arrays;
 import java.util.List;
 import org.apache.commons.lang3.SerializationUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class WorkerPortsTest {
 
@@ -29,31 +30,37 @@ public class WorkerPortsTest {
      * Uses legacy constructor {@link WorkerPorts#WorkerPorts(List)} which expects
      * at least 5 ports: metrics, debug, console, custom.
      */
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void shouldNotConstructWorkerPorts() {
-        // Not enough ports.
-        new WorkerPorts(Arrays.asList(1, 1, 1, 1));
+        assertThrows(IllegalArgumentException.class, () -> {
+            // Not enough ports.
+            new WorkerPorts(Arrays.asList(1, 1, 1, 1));
+        });
     }
 
     /**
      * Uses legacy constructor {@link WorkerPorts#WorkerPorts(List)} which cannot construct
      * a WorkerPorts object, because a worker needs a sink to be useful.
      * Otherwise, other workers can't connect to it.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void shouldNotConstructWorkerPortsWithDuplicatePorts() {
-        // Enough ports, but has duplicate ports.
-        new WorkerPorts(Arrays.asList(1, 1, 1, 1, 1));
+        assertThrows(IllegalStateException.class, () -> {
+            // Enough ports, but has duplicate ports.
+            new WorkerPorts(Arrays.asList(1, 1, 1, 1, 1));
+        });
     }
 
     /**
      * Uses legacy constructor {@link WorkerPorts#WorkerPorts(List)} but was given a port
      * out of range.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void shouldNotConstructWorkerPortsWithInvalidPortRange() {
-        // Enough ports, but given an invalid port range
-        new WorkerPorts(Arrays.asList(1, 1, 1, 1, 65536));
+        assertThrows(IllegalStateException.class, () -> {
+            // Enough ports, but given an invalid port range
+            new WorkerPorts(Arrays.asList(1, 1, 1, 1, 65536));
+        });
     }
 
     /**
@@ -82,4 +89,4 @@ public void testWorkerPortsIsSerializableByJava() {
         byte[] serialized = SerializationUtils.serialize(workerPorts);
         assertEquals(workerPorts, SerializationUtils.deserialize(serialized));
     }
-}
+}

mantis-common/src/test/java/io/mantisrx/common/compression/CompressionUtilsTest.java

@@ -15,7 +15,7 @@
  */
 package io.mantisrx.common.compression;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.mantisrx.common.MantisServerSentEvent;
 import java.io.BufferedReader;
@@ -24,7 +24,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CompressionUtilsTest {
 
@@ -56,7 +56,7 @@ public void shouldTokenizeWithEventsContainingPartialDelimiterMatchesWithCustomD
         List<MantisServerSentEvent> result = CompressionUtils.tokenize(reader, delimiter);
 
         List<String> actual = result.stream().map(e -> e.getEventAsString()).collect(Collectors.toList());
-        assertEquals("Delimiter: '" + delimiter + "'", Arrays.asList(event1,event2,event3), actual);
+        assertEquals(Arrays.asList(event1,event2,event3), actual, "Delimiter: '" + delimiter + "'");
     }
 
     @Test
@@ -76,7 +76,7 @@ public void testDelimiterWiithPrefixMatchingEndOfMEssage() throws Exception {
         List<MantisServerSentEvent> result = CompressionUtils.tokenize(reader, delimiter);
 
         List<String> actual = result.stream().map(e -> e.getEventAsString()).collect(Collectors.toList());
-        assertEquals("Delimiter: '" + delimiter + "'", Arrays.asList(event1,event2,event3), actual);
+        assertEquals(Arrays.asList(event1,event2,event3), actual, "Delimiter: '" + delimiter + "'");
     }
 
     @Test
@@ -102,7 +102,7 @@ public void testMultiline() throws Exception {
         List<MantisServerSentEvent> result = CompressionUtils.tokenize(reader, delimiter);
 
         List<String> actual = result.stream().map(e -> e.getEventAsString()).collect(Collectors.toList());
-        assertEquals("Delimiter: '" + delimiter + "'", Arrays.asList(event1,event2,event3), actual);
+        assertEquals(Arrays.asList(event1,event2,event3), actual, "Delimiter: '" + delimiter + "'");
     }
 
     @Test

mantis-common/src/test/java/io/mantisrx/runtime/MachineDefinitionTest.java

@@ -16,10 +16,10 @@
 
 package io.mantisrx.runtime;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MachineDefinitionTest {
   @Test

mantis-common/src/test/java/io/mantisrx/runtime/descriptor/DeploymentStrategyTest.java

@@ -16,12 +16,12 @@
 
 package io.mantisrx.runtime.descriptor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.mantisrx.common.JsonSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DeploymentStrategyTest {
     private final JsonSerializer serializer = new JsonSerializer();

mantis-common/src/test/java/io/mantisrx/runtime/descriptor/SchedulingInfoTest.java

@@ -18,15 +18,15 @@
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.mantisrx.common.JsonSerializer;
 import io.mantisrx.runtime.MachineDefinition;
 import io.mantisrx.runtime.descriptor.SchedulingInfo.Builder;
 import io.mantisrx.shaded.com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SchedulingInfoTest {
     @Test

mantis-common/src/test/java/io/mantisrx/runtime/descriptor/StageScalingPolicyTest.java

@@ -16,7 +16,7 @@
 
 package io.mantisrx.runtime.descriptor;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.mantisrx.common.JsonSerializer;
 import io.mantisrx.runtime.descriptor.StageScalingPolicy.RollingCount;
@@ -25,7 +25,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StageScalingPolicyTest {
     private final JsonSerializer serializer = new JsonSerializer();

mantis-common/src/test/java/io/mantisrx/runtime/parameter/TestSerialization.java

@@ -16,10 +16,10 @@
 
 package io.mantisrx.runtime.parameter;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.mantisrx.common.JsonSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestSerialization {
     private final JsonSerializer jsonSerializer = new JsonSerializer();

mantis-common/src/test/java/io/reactivx/common/consistenthashing/ConsistentHashTest.java

@@ -17,17 +17,17 @@
 package io.reactivx.common.consistenthashing;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import io.mantisrx.common.network.ConsistentHash;
 import io.mantisrx.common.network.Endpoint;
 import io.mantisrx.common.network.EndpointConfiguration;
 import io.mantisrx.common.network.HashFunctions;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 public class ConsistentHashTest {

mantis-common/src/test/java/io/reactivx/common/consistenthashing/ServerSlotManagerTest.java

@@ -16,9 +16,9 @@
 
 package io.reactivx.common.consistenthashing;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.mantisrx.common.network.HashFunctions;
 import io.mantisrx.common.network.ServerSlotManager;
@@ -28,7 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 public class ServerSlotManagerTest {