Polish

Author: eddumelendez

modules/toxiproxy/build.gradle

@@ -6,11 +6,8 @@ dependencies {
 
     testImplementation 'redis.clients:jedis:6.1.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
-    testImplementation project(":testcontainers-junit-jupiter")
     testImplementation platform('org.junit:junit-bom:5.13.4')
-    testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java

@@ -3,8 +3,9 @@
 import eu.rekawek.toxiproxy.Proxy;
 import eu.rekawek.toxiproxy.ToxiproxyClient;
 import eu.rekawek.toxiproxy.model.ToxicDirection;
+import org.junit.jupiter.api.AutoClose;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.junit.jupiter.ManagedNetwork;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
@@ -22,23 +23,29 @@ public class ToxiproxyTest {
     // spotless:off
     // creatingProxy {
     // Create a common docker network so that containers can communicate
-    @ManagedNetwork
+    @AutoClose
     public Network network = Network.newNetwork();
 
     // The target container - this could be anything
-    @org.testcontainers.junit.jupiter.Container
+    @AutoClose
     public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine")
         .withExposedPorts(6379)
         .withNetwork(network)
         .withNetworkAliases("redis");
 
     // Toxiproxy container, which will be used as a TCP proxy
-    @org.testcontainers.junit.jupiter.Container
+    @AutoClose
     public ToxiproxyContainer toxiproxy = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.5.0")
         .withNetwork(network);
     // }
     // spotless:on
 
+    @BeforeEach
+    public void setUp() {
+        redis.start();
+        toxiproxy.start();
+    }
+
     @Test
     public void testDirect() {
         final Jedis jedis = createJedis(redis.getHost(), redis.getFirstMappedPort());