Excavator: Switch to JUnit 5 to parallelize tests and speed up CI

client-config/build.gradle

@@ -20,4 +20,8 @@ dependencies {
     annotationProcessor "org.immutables:value"
     compileOnly 'org.immutables:value::annotations'
     implementation 'com.palantir.safe-logging:logger'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
 }

client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java

@@ -37,7 +37,7 @@
 import java.util.List;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class ClientConfigurationsTest {
 

client-config/src/test/java/com/palantir/conjure/java/clients/ConjureClientsTest.java

@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ConjureClientsTest {
 

conjure-java-client-verifier/build.gradle

@@ -15,4 +15,8 @@ dependencies {
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     testImplementation 'org.apache.commons:commons-lang3'
     testImplementation 'com.palantir.safe-logging:logger'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
 }

conjure-java-jackson-serialization/build.gradle

@@ -14,4 +14,8 @@ dependencies {
 
     testImplementation "junit:junit"
     testImplementation "org.assertj:assertj-core"
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
 }

conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java

@@ -44,7 +44,7 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class ObjectMappersTest {
     private static final JsonMapper MAPPER = ObjectMappers.newClientJsonMapper();

conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ShimJdk7ModuleTest.java

@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class ShimJdk7ModuleTest {
 

conjure-java-retrofit2-client/build.gradle

@@ -28,4 +28,9 @@ dependencies {
 
     annotationProcessor "org.immutables:value"
     compileOnly 'org.immutables:value::annotations'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
+    testImplementation 'org.mockito:mockito-junit-jupiter'
 }

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/AsyncSerializableErrorCallAdapterFactoryTest.java

@@ -22,18 +22,21 @@
 import com.palantir.conjure.java.client.retrofit2.AsyncSerializableErrorCallAdapterFactory.CompletableFutureBodyCallAdapter;
 import com.palantir.conjure.java.client.retrofit2.AsyncSerializableErrorCallAdapterFactory.ListenableFutureBodyCallAdapter;
 import java.util.concurrent.CompletableFuture;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class AsyncSerializableErrorCallAdapterFactoryTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Response<String> response;

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/OptionalObjectToStringConverterFactoryTest.java

@@ -34,7 +34,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import retrofit2.http.Header;
 import retrofit2.http.Path;
 import retrofit2.http.Query;

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/QosExceptionThrowingCallAdapterFactoryTest.java

@@ -34,8 +34,8 @@
 import okhttp3.Protocol;
 import okhttp3.ResponseBody;
 import okio.BufferedSource;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.stubbing.Answer;
 import retrofit2.Call;
@@ -74,7 +74,7 @@ public BufferedSource source() {
     private final CallAdapter.Factory factory = new QosExceptionThrowingCallAdapterFactory(delegateFactory);
     private Retrofit retrofit;
 
-    @Before
+    @BeforeEach
     public void before() {
         retrofit = new Retrofit.Builder()
                 .baseUrl(url)

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientApiTest.java

@@ -54,10 +54,10 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 import okio.Buffer;
-import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import retrofit2.Call;
 import retrofit2.Response;
 
@@ -73,7 +73,7 @@ public final class Retrofit2ClientApiTest extends TestBase {
     private HttpUrl url;
     private TestService service;
 
-    @Before
+    @BeforeEach
     public void before() {
         url = server.url("/");
         service = Retrofit2Client.create(

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientBuilderTest.java

@@ -28,7 +28,7 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.ExpectedException;
 
 public final class Retrofit2ClientBuilderTest extends TestBase {

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientConfigRefreshTest.java

@@ -24,7 +24,7 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class Retrofit2ClientConfigRefreshTest extends TestBase {
 

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientProxyTest.java

@@ -33,7 +33,7 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class Retrofit2ClientProxyTest extends TestBase {
 

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/Retrofit2ClientQueryParamHandlingTest.java

@@ -25,9 +25,9 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.Before;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
@@ -39,7 +39,7 @@ public final class Retrofit2ClientQueryParamHandlingTest extends TestBase {
 
     private Service proxy;
 
-    @Before
+    @BeforeEach
     public void before() {
         HttpUrl url = server.url("/");
         proxy = Retrofit2Client.create(

conjure-java-retrofit2-client/src/test/java/com/palantir/conjure/java/client/retrofit2/TracerTest.java

@@ -28,9 +28,9 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.Before;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public final class TracerTest extends TestBase {
 
@@ -42,7 +42,7 @@ public final class TracerTest extends TestBase {
 
     private TestService service;
 
-    @Before
+    @BeforeEach
     public void before() {
         String uri = "http://localhost:" + server.getPort();
         service = Retrofit2Client.create(TestService.class, AGENT, new HostMetricsRegistry(), createTestConfig(uri));

extras/refresh-utils/build.gradle

@@ -10,4 +10,8 @@ dependencies {
     testImplementation "org.jmock:jmock"
     testImplementation "org.mockito:mockito-core"
     testImplementation 'io.reactivex.rxjava2:rxjava'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
 }

extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableProxyInvocationHandlerTest.java

@@ -25,8 +25,8 @@
 
 import com.google.common.reflect.Reflection;
 import java.util.function.Function;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -46,7 +46,7 @@ interface Callable {
     @Mock
     private Callable delegate2;
 
-    @Before
+    @BeforeEach
     public void before() {
         MockitoAnnotations.initMocks(this);
     }

extras/refresh-utils/src/test/java/com/palantir/conjure/java/ext/refresh/RefreshableTest.java

@@ -24,7 +24,7 @@
 import io.reactivex.schedulers.Schedulers;
 import java.util.concurrent.TimeUnit;
 import org.jmock.lib.concurrent.DeterministicScheduler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class RefreshableTest {
 

okhttp-clients/build.gradle

@@ -32,4 +32,9 @@ dependencies {
 
     annotationProcessor "org.immutables:value"
     compileOnly 'org.immutables:value::annotations'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
+    testImplementation 'org.mockito:mockito-junit-jupiter'
 }

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/CatchThrowableInterceptorTest.java

@@ -21,13 +21,16 @@
 
 import java.io.IOException;
 import okhttp3.Interceptor;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public final class CatchThrowableInterceptorTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Interceptor.Chain chain;

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitersTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import com.netflix.concurrency.limits.Limiter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ConcurrencyLimitersTest {
 

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ConcurrencyLimitingInterceptorTest.java

@@ -32,13 +32,16 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okio.BufferedSource;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public final class ConcurrencyLimitingInterceptorTest {
     private static final ConcurrencyLimitingInterceptor interceptor = new ConcurrencyLimitingInterceptor();
 
@@ -54,7 +57,7 @@ public final class ConcurrencyLimitingInterceptorTest {
     private Request request;
     private Response response;
 
-    @Before
+    @BeforeEach
     public void before() {
         request = new Request.Builder()
                 .url("https://localhost:1234/call")

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/DefaultConcurrencyLimitersTest.java

@@ -33,7 +33,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class DefaultConcurrencyLimitersTest {
     private static final ConcurrencyLimiters.Key KEY =

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/ExponentialBackoffTest.java

@@ -20,11 +20,14 @@
 
 import com.google.common.util.concurrent.AtomicDouble;
 import java.time.Duration;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public final class ExponentialBackoffTest {
     private static final Duration ONE_SECOND = Duration.ofSeconds(1);
 

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java

@@ -39,9 +39,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,12 +67,12 @@ public final class FlowControlTest {
             FlowControlTest.class,
             true);
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
         executorService = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         executorService.shutdown();
     }