chore: migrate test code to JUnit5

Author: vlsi

core/src/jarFileTest/java/org/testcontainers/PublicBinaryAPITest.java

@@ -5,8 +5,8 @@
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.runners.Parameterized.Parameters;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Opcodes;
@@ -30,9 +30,9 @@
 
 /**
  * This test checks that we don't expose any shaded class in our public API.
- * We use {@link Parameterized} runner here to create a test per public class in Testcontainers' JAR file.
  */
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("data")
 @RequiredArgsConstructor
 public class PublicBinaryAPITest extends AbstractJarFileTest {
 
@@ -46,7 +46,7 @@ public class PublicBinaryAPITest extends AbstractJarFileTest {
         Assertions.registerFormatterForType(MethodNode.class, it -> it.name + it.desc);
     }
 
-    @Parameters(name = "{0}")
+    @Parameters
     public static List<Object[]> data() throws Exception {
         List<Object[]> result = new ArrayList<>();
 

core/src/test/java/alt/testcontainers/images/OutOfPackageImagePullPolicyTest.java

@@ -1,6 +1,6 @@
 package alt.testcontainers.images;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;

core/src/test/java/org/testcontainers/DaemonTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.File;

core/src/test/java/org/testcontainers/DockerClientFactoryTest.java

@@ -1,8 +1,9 @@
 package org.testcontainers;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.dockerclient.LogToStringContainerCallback;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MockTestcontainersConfigurationRule;
 
@@ -12,9 +13,10 @@
 /**
  * Test for {@link DockerClientFactory}.
  */
+@Testcontainers
 public class DockerClientFactoryTest {
 
-    @Rule
+    @Container
     public MockTestcontainersConfigurationRule configurationMock = new MockTestcontainersConfigurationRule();
 
     @Test

core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.wait.strategy.Wait;
 

core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java

@@ -3,11 +3,10 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.apache.commons.lang3.SystemUtils;
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.utility.CommandLine;
 
@@ -18,7 +17,8 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-@RunWith(Parameterized.class)
+@ParameterizedClass(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
+@MethodSource("data")
 public class ComposeOverridesTest {
 
     private static final String DOCKER_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
@@ -49,7 +49,6 @@ public ComposeOverridesTest(boolean localMode, String expectedEnvVar, File... co
         this.composeFiles = composeFiles;
     }
 
-    @Parameters(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
@@ -61,7 +60,7 @@ public static Iterable<Object[]> data() {
         );
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         if (localMode) {
             Assumptions

core/src/test/java/org/testcontainers/containers/ComposeProfilesOptionTest.java

@@ -1,30 +1,32 @@
 package org.testcontainers.containers;
 
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("local")
 public class ComposeProfilesOptionTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static Boolean[] local() {
         return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
     }
 
-    @Parameterized.Parameter
+    @Parameter(0)
     public boolean localMode;
 
     public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
 
-    @Before
+    @BeforeEach
     public void setUp() {
         if (this.localMode) {
             Assumptions

core/src/test/java/org/testcontainers/containers/ContainerStateTest.java

@@ -1,8 +1,9 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Collections;
 import java.util.List;
@@ -12,10 +13,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(Parameterized.class)
+@ParameterizedClass(name = "{0} ({1} -> {2})")
+@MethodSource("params")
 public class ContainerStateTest {
 
-    @Parameterized.Parameters(name = "{0} ({1} -> {2})")
     public static Object[][] params() {
         return new Object[][] {
             new Object[] { "regular mapping", "80:8080/tcp", Collections.singletonList(80) },
@@ -27,13 +28,13 @@ public static Object[][] params() {
         };
     }
 
-    @Parameterized.Parameter(0)
+    @Parameter(0)
     public String name;
 
-    @Parameterized.Parameter(1)
+    @Parameter(1)
     public String testSet;
 
-    @Parameterized.Parameter(2)
+    @Parameter(2)
     public List<Integer> expectedResult;
 
     @Test

core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.TimeoutException;
 import org.testcontainers.containers.wait.strategy.Wait;
 

core/src/test/java/org/testcontainers/containers/DockerComposeFilesTest.java

@@ -1,7 +1,7 @@
 package org.testcontainers.containers;
 
 import com.google.common.collect.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 

core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java

@@ -2,11 +2,10 @@
 
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.utility.CommandLine;
 
@@ -17,7 +16,8 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-@RunWith(Parameterized.class)
+@ParameterizedClass(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
+@MethodSource("data")
 public class DockerComposeOverridesTest {
 
     private static final File BASE_COMPOSE_FILE = new File("src/test/resources/docker-compose-base.yml");
@@ -46,7 +46,6 @@ public DockerComposeOverridesTest(boolean localMode, String expectedEnvVar, File
         this.composeFiles = composeFiles;
     }
 
-    @Parameters(name = "{index}: local[{0}], composeFiles[{2}], expectedEnvVar[{1}]")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
@@ -58,7 +57,7 @@ public static Iterable<Object[]> data() {
         );
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         if (localMode) {
             Assumptions

core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java

@@ -1,30 +1,31 @@
 package org.testcontainers.containers;
 
 import org.assertj.core.api.Assumptions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.utility.CommandLine;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("parameters")
 public class DockerComposeProfilesOptionTest {
 
-    @Parameterized.Parameters(name = "{0}")
     public static Boolean[] local() {
         return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
     }
 
-    @Parameterized.Parameter
+    @Parameter(0)
     public boolean localMode;
 
     public static final File COMPOSE_FILE = new File("src/test/resources/compose-profile-option/compose-test.yml");
 
-    @Before
+    @BeforeEach
     public void setUp() {
         if (this.localMode) {
             Assumptions

core/src/test/java/org/testcontainers/containers/DockerModelRunnerContainerTest.java

@@ -2,7 +2,7 @@
 
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;

core/src/test/java/org/testcontainers/containers/ExposedHostTest.java

@@ -3,10 +3,10 @@
 import com.google.common.collect.ImmutableMap;
 import com.sun.net.httpserver.HttpServer;
 import lombok.SneakyThrows;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.testcontainers.DockerClientFactory;
@@ -27,7 +27,7 @@ public class ExposedHostTest {
 
     private static HttpServer server;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
         server = HttpServer.create(new InetSocketAddress(0), 0);
         server.createContext(
@@ -44,12 +44,12 @@ public static void setUpClass() throws Exception {
         server.start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() {
         server.stop(0);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         PortForwardingContainer.INSTANCE.reset();
     }

core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 

core/src/test/java/org/testcontainers/containers/GenericContainerTest.java

@@ -17,7 +17,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.assertj.core.api.Assumptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.TestImages;

core/src/test/java/org/testcontainers/containers/JibTest.java

@@ -1,8 +1,8 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectImageResponse;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
@@ -13,7 +13,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Ignore("Jib doesn't work with latest Docker version provided by GH Actions. Jib should be updated")
+@Disabled("Jib doesn't work with latest Docker version provided by GH Actions. Jib should be updated")
 public class JibTest {
 
     @Test

core/src/test/java/org/testcontainers/containers/MultiStageBuildTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.IOException;