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

Author: svc-excavator-bot

docker-compose-rule-core/build.gradle

@@ -28,4 +28,12 @@ dependencies {
     testImplementation 'com.github.tomakehurst:wiremock'
 
     integrationTestCompile project.sourceSets.test.output
+    integrationTestImplementation 'org.junit.jupiter:junit-jupiter'
+    integrationTestRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
 }

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/AggressiveShutdownStrategyIntegrationTest.java

@@ -23,7 +23,7 @@
 import com.palantir.docker.compose.logging.DoNothingLogCollector;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AggressiveShutdownStrategyIntegrationTest {
 

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyIntegrationTest.java

@@ -26,7 +26,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AggressiveShutdownWithNetworkCleanupStrategyIntegrationTest {
 

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/DockerComposeManagerNativeHealthcheckIntegrationTest.java

@@ -37,15 +37,15 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class DockerComposeManagerNativeHealthcheckIntegrationTest {
 
     private final ExecutorService pool = Executors.newFixedThreadPool(1);
     private DockerComposeManager docker = null;
 
-    @After
+    @AfterEach
     public void shutdownPool() {
         pool.shutdown();
         if (docker != null) {

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/DockerComposeManagerUpContainerIntegrationTest.java

@@ -27,16 +27,16 @@
 import com.palantir.docker.compose.connection.waiting.ClusterWait;
 import java.io.IOException;
 import org.joda.time.Duration;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DockerComposeManagerUpContainerIntegrationTest {
 
     private static final String SERVICE_NAME = "infinite-netcat-loop";
 
     private DockerComposeManager dockerComposeManager;
 
-    @Before
+    @BeforeEach
     public void before() throws Exception {
         dockerComposeManager = new DockerComposeManager.Builder()
                 .shutdownStrategy(AGGRESSIVE)

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/EventsIntegrationTest.java

@@ -37,7 +37,7 @@
 import com.palantir.docker.compose.events.WaitForServicesEvent;
 import java.util.List;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 @SuppressWarnings("IllegalThrows")

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/HostNetworkedPortsIntegrationTest.java

@@ -25,7 +25,7 @@
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class HostNetworkedPortsIntegrationTest {
     private static HealthCheck<DockerPort> toBeOpen() {

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java

@@ -21,7 +21,7 @@
 import com.palantir.docker.compose.execution.DockerExecutionException;
 import java.io.IOException;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.ExpectedException;
 
 public class RemoveConflictingContainersIntegrationTest {

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/connection/ContainerIntegrationTests.java

@@ -35,7 +35,7 @@
 import java.time.Duration;
 import org.awaitility.core.ConditionFactory;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ContainerIntegrationTests {
 

docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/execution/EnvironmentVariableIntegrationTest.java

@@ -22,15 +22,15 @@
 
 import com.palantir.docker.compose.DockerComposeManager;
 import com.palantir.docker.compose.connection.DockerMachine;
+import java.io.File;
 import java.nio.file.Path;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class EnvironmentVariableIntegrationTest {
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+    @TempDir
+    public File temporaryFolder;
 
     @Test
     public void docker_compose_gets_environment_variables_from_docker_machine_and_passes_it_into_a_test_container()