Merge branch 'testcontainers:main' into expose-grpc-endpoint

Author: Eliassen-Steinar

core/src/main/java/org/testcontainers/utility/RyukContainer.java

@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.12.0");
+        super("testcontainers/ryuk:0.13.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

modules/chromadb/build.gradle

@@ -3,6 +3,13 @@ description = "Testcontainers :: ChromaDB"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
     testImplementation 'org.assertj:assertj-core:3.27.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
 }
+
+test {
+    useJUnitPlatform()
+}

modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java

@@ -1,14 +1,14 @@
 package org.testcontainers.chromadb;
 
 import io.restassured.http.ContentType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
 
-public class ChromaDBContainerTest {
+class ChromaDBContainerTest {
 
     @Test
-    public void test() {
+    void test() {
         try ( // container {
             ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.23")
             // }
@@ -29,7 +29,7 @@ public void test() {
     }
 
     @Test
-    public void testVersion2() {
+    void testVersion2() {
         try (ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:1.0.0")) {
             chroma.start();
 

modules/consul/build.gradle

@@ -3,7 +3,14 @@ description = "Testcontainers :: Consul"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}

modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java

@@ -4,8 +4,9 @@
 import com.ecwid.consul.v1.Response;
 import com.ecwid.consul.v1.kv.model.GetValue;
 import io.restassured.RestAssured;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.IOException;
@@ -16,25 +17,30 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-/**
- * This test shows the pattern to use the ConsulContainer @ClassRule for a junit test. It also has tests that ensure
- * the properties were added correctly by reading from Consul with the CLI and over HTTP.
- */
-public class ConsulContainerTest {
+class ConsulContainerTest {
 
-    @ClassRule
-    public static ConsulContainer consulContainer = new ConsulContainer("hashicorp/consul:1.15")
+    private static ConsulContainer consul = new ConsulContainer("hashicorp/consul:1.15")
         .withConsulCommand("kv put config/testing1 value123");
 
+    @BeforeAll
+    static void setup() {
+        consul.start();
+    }
+
+    @AfterAll
+    static void teardown() {
+        consul.stop();
+    }
+
     @Test
-    public void readFirstPropertyPathWithCli() throws IOException, InterruptedException {
-        GenericContainer.ExecResult result = consulContainer.execInContainer("consul", "kv", "get", "config/testing1");
+    void readFirstPropertyPathWithCli() throws IOException, InterruptedException {
+        GenericContainer.ExecResult result = consul.execInContainer("consul", "kv", "get", "config/testing1");
         final String output = result.getStdout().replaceAll("\\r?\\n", "");
         assertThat(output).contains("value123");
     }
 
     @Test
-    public void readFirstSecretPathOverHttpApi() {
+    void readFirstSecretPathOverHttpApi() {
         io.restassured.response.Response response = RestAssured
             .given()
             .when()
@@ -46,11 +52,8 @@ public void readFirstSecretPathOverHttpApi() {
     }
 
     @Test
-    public void writeAndReadMultipleValuesUsingClient() {
-        final ConsulClient consulClient = new ConsulClient(
-            consulContainer.getHost(),
-            consulContainer.getFirstMappedPort()
-        );
+    void writeAndReadMultipleValuesUsingClient() {
+        final ConsulClient consulClient = new ConsulClient(consul.getHost(), consul.getFirstMappedPort());
 
         final Map<String, String> properties = new HashMap<>();
         properties.put("value", "world");
@@ -70,6 +73,6 @@ public void writeAndReadMultipleValuesUsingClient() {
     }
 
     private String getHostAndPort() {
-        return consulContainer.getHost() + ":" + consulContainer.getMappedPort(8500);
+        return consul.getHost() + ":" + consul.getMappedPort(8500);
     }
 }

modules/couchbase/build.gradle

@@ -5,6 +5,9 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:5.1.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'com.couchbase.client:java-client:3.9.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
@@ -15,3 +18,7 @@ tasks.japicmp {
         "org.testcontainers.couchbase.CouchbaseContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}

modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java

@@ -20,7 +20,7 @@
 import com.couchbase.client.java.Cluster;
 import com.couchbase.client.java.Collection;
 import com.couchbase.client.java.json.JsonObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ContainerLaunchException;
 
 import java.time.Duration;
@@ -30,7 +30,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.awaitility.Awaitility.await;
 
-public class CouchbaseContainerTest {
+class CouchbaseContainerTest {
 
     private static final String COUCHBASE_IMAGE_ENTERPRISE = "couchbase/server:enterprise-7.0.3";
 
@@ -41,22 +41,22 @@ public class CouchbaseContainerTest {
     private static final String COUCHBASE_IMAGE_COMMUNITY_RECENT = "couchbase/server:community-7.6.2";
 
     @Test
-    public void testBasicContainerUsageForEnterpriseContainer() {
+    void testBasicContainerUsageForEnterpriseContainer() {
         testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE);
     }
 
     @Test
-    public void testBasicContainerUsageForEnterpriseContainerRecent() {
+    void testBasicContainerUsageForEnterpriseContainerRecent() {
         testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE_RECENT);
     }
 
     @Test
-    public void testBasicContainerUsageForCommunityContainer() {
+    void testBasicContainerUsageForCommunityContainer() {
         testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY);
     }
 
     @Test
-    public void testBasicContainerUsageForCommunityContainerRecent() {
+    void testBasicContainerUsageForCommunityContainerRecent() {
         testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY_RECENT);
     }
 
@@ -89,7 +89,7 @@ private void testBasicContainerUsage(String couchbaseImage) {
     }
 
     @Test
-    public void testBucketIsFlushableIfEnabled() {
+    void testBucketIsFlushableIfEnabled() {
         BucketDefinition bucketDefinition = new BucketDefinition("mybucket").withFlushEnabled(true);
 
         try (
@@ -119,7 +119,7 @@ public void testBucketIsFlushableIfEnabled() {
      * edition which is not supported.
      */
     @Test
-    public void testFailureIfCommunityUsedWithAnalytics() {
+    void testFailureIfCommunityUsedWithAnalytics() {
         try (
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.ANALYTICS)
@@ -136,7 +136,7 @@ public void testFailureIfCommunityUsedWithAnalytics() {
      * edition which is not supported.
      */
     @Test
-    public void testFailureIfCommunityUsedWithEventing() {
+    void testFailureIfCommunityUsedWithEventing() {
         try (
             CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
                 .withEnabledServices(CouchbaseService.KV, CouchbaseService.EVENTING)

modules/database-commons/build.gradle

@@ -3,5 +3,12 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}

modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java

@@ -1,16 +1,16 @@
 package org.testcontainers.ext;
 
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.regex.Pattern;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ScriptScannerTest {
+class ScriptScannerTest {
 
     @Test
-    public void testHugeStringLiteral() {
+    void testHugeStringLiteral() {
         String script = "/* a comment */    \"" + StringUtils.repeat('~', 10000) + "\";";
         ScriptScanner scanner = scanner(script);
         assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.COMMENT);
@@ -20,7 +20,7 @@ public void testHugeStringLiteral() {
     }
 
     @Test
-    public void testPgIdentifierWithDollarSigns() {
+    void testPgIdentifierWithDollarSigns() {
         ScriptScanner scanner = scanner(
             "this$is$a$valid$postgreSQL$identifier  " +
             "$a$While this is a quoted string$a$$ --just followed by a dollar sign"
@@ -32,7 +32,7 @@ public void testPgIdentifierWithDollarSigns() {
     }
 
     @Test
-    public void testQuotedLiterals() {
+    void testQuotedLiterals() {
         ScriptScanner scanner = scanner("'this \\'is a literal' \"this \\\" is a literal\"");
         assertThat(scanner.next()).isEqualTo(ScriptScanner.Lexem.QUOTED_STRING);
         assertThat(scanner.getCurrentMatch()).isEqualTo("'this \\'is a literal'");