Revert mantis-control-plane-server to junit4

Upgrade mockito in mantis-server-worker
Netflix · Apr 10, 2023 · 456ee55 · 456ee55
1 parent 271afb7
commit 456ee55
Show file tree

Hide file tree

Showing 49 changed files with 347 additions and 346 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,9 +38,11 @@ ext.versions = [
         flink    : "1.14.2",
         hadoop   : "2.7.7",
         jsr305   : "3.0.1",
+        junit4   : "4.11",
         junit5   : "5.4.+",
         mockito  : "2.0.+",
         mockito3 : "3.+",
+        mockito4 : "4.8.+",
         spectator: "1.3.+",
         slf4j    : "1.7.0",
         vavr     : "0.9.2",
@@ -57,6 +59,11 @@ ext.libraries = [
         flinkRpcImpl   : [
                 "org.apache.flink:flink-rpc-akka:${versions.flink}",
         ],
+        junit4         : [
+            "junit:junit:${versions.junit4}",
+            "junit:junit-dep:${versions.junit4}",
+            "org.junit.vintage:junit-vintage-engine:${versions.junit5}",
+        ],
         hadoopCommon   : "org.apache.hadoop:hadoop-common:${versions.hadoop}",
         hadoopS3       : "org.apache.hadoop:hadoop-aws:${versions.hadoop}",
         jsr305         : "com.google.code.findbugs:jsr305:${versions.jsr305}", // For Nonnull annotation
@@ -69,6 +76,7 @@ ext.libraries = [
         mockitoAll     : "org.mockito:mockito-all:${versions.mockito}",
         mockitoCore    : "org.mockito:mockito-core:${versions.mockito}",
         mockitoCore3   : "org.mockito:mockito-core:${versions.mockito3}",
+        mockitoCore4   : "org.mockito:mockito-core:${versions.mockito4}",
         mockneat       : "net.andreinc:mockneat:0.4.8",
         rxJava         : "io.reactivex:rxjava:1.3.8",
         rxNettyShaded  : "com.netflix:mantis-rxnetty:0.4.19.1",
@@ -158,7 +166,9 @@ subprojects {
     }
 
     test {
-        useJUnitPlatform()
+        useJUnitPlatform {
+             includeEngines 'junit-jupiter', 'junit-vintage'
+        }
     }
 }
 

diff --git a/mantis-control-plane/mantis-control-plane-server/build.gradle b/mantis-control-plane/mantis-control-plane-server/build.gradle
@@ -55,7 +55,7 @@ dependencies {
 
     testImplementation "com.typesafe.akka:akka-testkit_$scalaBinaryVersion:$akkaVersion"
     testImplementation "com.typesafe.akka:akka-http-testkit_$scalaBinaryVersion:$akkaHttpVersion"
-    testImplementation libraries.junitJupiter
+    testImplementation libraries.junit4
     testImplementation libraries.mockitoCore3
     testImplementation "org.testng:testng:$testngVersion"
     testImplementation testFixtures(project(":mantis-common"))

diff --git a/...tis-control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/JacksonTest.java b/...tis-control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/JacksonTest.java
@@ -16,7 +16,7 @@
 
 package io.mantisrx.master.api.akka.route;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.Assert.*;
 
 import io.mantisrx.common.Ack;
 import io.mantisrx.master.jobcluster.job.MantisJobMetadataView;
@@ -30,7 +30,7 @@
 import java.io.ObjectOutputStream;
 import java.util.List;
 import java.util.Optional;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 
 public class JacksonTest {

diff --git a/...e-server/src/test/java/io/mantisrx/master/api/akka/route/LeaderRedirectionFilterTest.java b/...e-server/src/test/java/io/mantisrx/master/api/akka/route/LeaderRedirectionFilterTest.java
@@ -16,8 +16,8 @@
 
 package io.mantisrx.master.api.akka.route;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 import akka.http.javadsl.server.AllDirectives;
 import akka.http.javadsl.server.Route;
@@ -27,7 +27,7 @@
 import io.mantisrx.server.master.ILeadershipManager;
 import io.mantisrx.server.master.LeaderRedirectionFilter;
 import io.mantisrx.server.master.LeadershipManagerLocalImpl;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class LeaderRedirectionFilterTest extends AllDirectives {
 

diff --git a/...ne-server/src/test/java/io/mantisrx/master/api/akka/route/LeaderRedirectionRouteTest.java b/...ne-server/src/test/java/io/mantisrx/master/api/akka/route/LeaderRedirectionRouteTest.java
@@ -16,9 +16,9 @@
 
 package io.mantisrx.master.api.akka.route;
 
-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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import akka.NotUsed;
 import akka.actor.ActorSystem;
@@ -46,9 +46,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,7 +99,7 @@ private String getResponseMessage(final String msg, final Throwable t) {
     private static final MasterMonitor masterMonitor = new LocalMasterMonitor(fakeMasterDesc);
     private static final ILeadershipManager leadershipMgr = new LeadershipManagerLocalImpl(fakeMasterDesc);
 
-    @BeforeAll
+    @BeforeClass
     public static void setup() throws Exception {
         JobTestHelper.deleteAllFiles();
         JobTestHelper.createDirsIfRequired();
@@ -131,7 +131,7 @@ public static void setup() throws Exception {
         latch.await();
     }
 
-    @AfterAll
+    @AfterClass
     public static void teardown() {
         logger.info("MasterDescriptionRouteTest teardown");
         binding

diff --git a/...ne-server/src/test/java/io/mantisrx/master/api/akka/route/pagination/ListObjectTests.java b/...ne-server/src/test/java/io/mantisrx/master/api/akka/route/pagination/ListObjectTests.java
@@ -16,33 +16,30 @@
 
 package io.mantisrx.master.api.akka.route.pagination;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import scala.Tuple1;
 
 public class ListObjectTests {
 
     private static final Random rnd = new Random(System.currentTimeMillis());
 
-    @Test
+    @Test(expected = RuntimeException.class)
     public void testSortingByInvalidFieldName() {
-        assertThrows(RuntimeException.class, () -> {
-            try {
-                ListObject<TestObject> listobject = new ListObject.Builder<TestObject>()
-                    .withObjects(generateList(10), TestObject.class)
-                    .withSortField("invalidValue")
-                    .withSortAscending(true)
-                    .build();
-            } catch (Exception e) {
-                assertTrue(e.getMessage().contains("Specified sort field is invalid."));
-                throw e;
-            }
-        });
+        try {
+            ListObject<TestObject> listobject = new ListObject.Builder<TestObject>()
+                .withObjects(generateList(10), TestObject.class)
+                .withSortField("invalidValue")
+                .withSortAscending(true)
+                .build();
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("Specified sort field is invalid."));
+            throw e;
+        }
     }
 
     @Test
@@ -113,20 +110,18 @@ public void testSortingByPublicValueFieldNameDescending() {
         }
     }
 
-    @Test
+    @Test(expected = RuntimeException.class)
     public void testSortingByPrivateValueFieldName() {
-        assertThrows(RuntimeException.class, () -> {
-            try {
-                ListObject<TestObject> listobject = new ListObject.Builder<TestObject>()
-                    .withObjects(generateList(10), TestObject.class)
-                    .withSortField("privateValue")
-                    .withSortAscending(true)
-                    .build();
-            } catch (Exception e) {
-                assertTrue(e.getMessage().contains("Cannot access sort field."));
-                throw e;
-            }
-        });
+        try {
+            ListObject<TestObject> listobject = new ListObject.Builder<TestObject>()
+                .withObjects(generateList(10), TestObject.class)
+                .withSortField("privateValue")
+                .withSortAscending(true)
+                .build();
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("Cannot access sort field."));
+            throw e;
+        }
     }
 
     @Test
@@ -179,19 +174,17 @@ public void testPaginationLimit() {
                 .build().list.size() == 5);
     }
 
-    @Test
+    @Test(expected = IllegalStateException.class)
     public void testPaginationInvalidLimit() {
-        assertThrows(IllegalStateException.class, () -> {
-            try {
-                int size = new ListObject.Builder<TestObject>()
-                    .withObjects(generateList(10), TestObject.class)
-                    .withLimit(-1)
-                    .build().list.size();
-            } catch (Exception e) {
-                assertTrue(e.getMessage().contains("limit needs to be greater than 0"));
-                throw e;
-            }
-        });
+        try {
+            int size = new ListObject.Builder<TestObject>()
+                .withObjects(generateList(10), TestObject.class)
+                .withLimit(-1)
+                .build().list.size();
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("limit needs to be greater than 0"));
+            throw e;
+        }
     }
 
     @Test

diff --git a/...plane-server/src/test/java/io/mantisrx/master/api/akka/route/utils/JobRouteUtilsTest.java b/...plane-server/src/test/java/io/mantisrx/master/api/akka/route/utils/JobRouteUtilsTest.java
@@ -16,7 +16,7 @@
 
 package io.mantisrx.master.api.akka.route.utils;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import io.mantisrx.master.jobcluster.job.JobState;
 import io.mantisrx.master.jobcluster.job.worker.WorkerState;
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class JobRouteUtilsTest {
     @Test

diff --git a/...lane-server/src/test/java/io/mantisrx/master/api/akka/route/v0/AgentClusterRouteTest.java b/...lane-server/src/test/java/io/mantisrx/master/api/akka/route/v0/AgentClusterRouteTest.java
@@ -16,9 +16,9 @@
 
 package io.mantisrx.master.api.akka.route.v0;
 
-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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -68,9 +68,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import rx.Observer;
@@ -111,7 +111,7 @@ private String getResponseMessage(final String msg, final Throwable t) {
     private static CompletionStage<ServerBinding> binding;
     private static ActorSystem system = ActorSystem.create("AgentClusterRoutes");
 
-    @BeforeAll
+    @BeforeClass
     public static void setup() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         t = new Thread(() -> {
@@ -156,7 +156,7 @@ public static void setup() throws InterruptedException {
         latch.await();
     }
 
-    @AfterAll
+    @AfterClass
     public static void teardown() {
         logger.info("V0AgentClusterRouteTest teardown");
         binding

diff --git a/...-plane-server/src/test/java/io/mantisrx/master/api/akka/route/v0/JobClusterRouteTest.java b/...-plane-server/src/test/java/io/mantisrx/master/api/akka/route/v0/JobClusterRouteTest.java
@@ -16,9 +16,9 @@
 
 package io.mantisrx.master.api.akka.route.v0;
 
-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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -71,9 +71,9 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -112,7 +112,7 @@ private String getResponseMessage(final String msg, final Throwable t) {
     private static CompletionStage<ServerBinding> binding;
     private static ActorSystem system = ActorSystem.create("JobClusterRoutes");
 
-    @BeforeAll
+    @BeforeClass
     public static void setup() throws Exception {
         TestHelpers.setupMasterConfig();
         final CountDownLatch latch = new CountDownLatch(1);
@@ -152,7 +152,7 @@ public static void setup() throws Exception {
         latch.await();
     }
 
-    @AfterAll
+    @AfterClass
     public static void teardown() {
         logger.info("V0JobClusterRouteTest teardown");
         binding

diff --git a/...control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/v0/JobRouteTest.java b/...control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/v0/JobRouteTest.java
@@ -16,10 +16,10 @@
 
 package io.mantisrx.master.api.akka.route.v0;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;

diff --git a/...server/src/test/java/io/mantisrx/master/api/akka/route/v0/MasterDescriptionRouteTest.java b/...server/src/test/java/io/mantisrx/master/api/akka/route/v0/MasterDescriptionRouteTest.java
@@ -16,9 +16,9 @@
 
 package io.mantisrx.master.api.akka.route.v0;
 
-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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import akka.NotUsed;
 import akka.actor.ActorSystem;