Migrate tests away from MockTestcontainersConfigurationRule

Author: kcooney

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

@@ -1,24 +1,20 @@
 package org.testcontainers;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 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;
+import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * Test for {@link DockerClientFactory}.
  */
-@Testcontainers
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
 public class DockerClientFactoryTest {
 
-    @Container
-    public MockTestcontainersConfigurationRule configurationMock = new MockTestcontainersConfigurationRule();
-
     @Test
     public void runCommandInsideDockerShouldNotFailIfImageDoesNotExistsLocally() {
         try (DockerRegistryContainer registryContainer = new DockerRegistryContainer()) {

core/src/test/java/org/testcontainers/images/OverrideImagePullPolicyTest.java

@@ -3,23 +3,19 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.testcontainers.DockerRegistryContainer;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.FakeImagePullPolicy;
-import org.testcontainers.utility.MockTestcontainersConfigurationRule;
+import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Testcontainers
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
 public class OverrideImagePullPolicyTest {
 
-    @Container
-    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
-
     private ImagePullPolicy originalInstance;
 
     private ImagePullPolicy originalDefaultImplementation;

core/src/test/java/org/testcontainers/utility/DefaultImageNameSubstitutorTest.java

@@ -2,14 +2,13 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 
-@Testcontainers
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
 public class DefaultImageNameSubstitutorTest {
 
     public static final DockerImageName ORIGINAL_IMAGE = DockerImageName.parse("foo");
@@ -18,9 +17,6 @@ public class DefaultImageNameSubstitutorTest {
 
     private ConfigurationFileImageNameSubstitutor underTest;
 
-    @Container
-    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
-
     @BeforeEach
     public void setUp() {
         underTest = new ConfigurationFileImageNameSubstitutor(TestcontainersConfiguration.getInstance());

core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java

@@ -3,11 +3,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -21,15 +20,12 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.eq;
 
-@Testcontainers
+@ExtendWith(MockTestcontainersConfigurationExtension.class)
 public class ImageNameSubstitutorTest {
 
     @TempDir
     public Path tempFolder;
 
-    @Container
-    public MockTestcontainersConfigurationRule config = new MockTestcontainersConfigurationRule();
-
     private ImageNameSubstitutor originalInstance;
 
     private ImageNameSubstitutor originalDefaultImplementation;