+
-Automatic starting HiveMQ docker containers for JUnit4 and JUnit5 tests.
+Automatic starting HiveMQ docker containers for JUnit5 tests.
This enables testing MQTT client applications and integration testing of custom HiveMQ extensions.
- Community forum: https://community.hivemq.com/
@@ -212,13 +212,13 @@ can be customized as desired.
Add to `build.gradle`:
````groovy
-testImplementation 'org.testcontainers:hivemq:{{latest_version}}'
+testImplementation 'org.testcontainers:testcontainers-hivemq:{{latest_version}}'
````
Add to `build.gradle.kts`:
````kotlin
-testImplementation("org.testcontainers:hivemq:{{latest_version}}")
+testImplementation("org.testcontainers:testcontainers-hivemq:{{latest_version}}")
````
### Maven
@@ -228,7 +228,7 @@ Add to `pom.xml`:
```xml
+ * Supported images: {@code apache/artemis}, {@code apache/activemq-artemis} + *
* Exposed ports: *
-
*
- Console: 8161 @@ -24,6 +26,8 @@ public class ArtemisContainer extends GenericContainer
- Blob: 10000 + *
- Queue: 10001 + *
- Table: 10002 + *
- AMQP: 5672 + *
- Database: 26257 + *
- Console: 8080 + *
- Database: 26257 *
- Console: 8080 *
+ * Supported image: {@code mcr.microsoft.com/azure-storage/azurite} + *
+ * Exposed ports: + *
-
+ *
+ * {@link #withCommand(String...)} cannot be used for this: {@link #configure()} always + * rebuilds the process command and overwrites any previously set command. + * + * @param options additional Azurite flags, for example {@code --skipApiVersionCheck} + * @return this + */ + public AzuriteContainer withCommandOptions(String... options) { + this.commandOptions.addAll(Arrays.asList(options)); + return this; + } + + @Override + protected void configure() { + withCommand(getCommandLine()); + if (this.cert != null) { + logger().info("Using path for cert file: '{}'", this.cert); + withCopyFileToContainer(this.cert, "/cert" + this.certExtension); + if (this.key != null) { + logger().info("Using path for key file: '{}'", this.key); + withCopyFileToContainer(this.key, "/key.pem"); + } + } + } + + /** + * Returns the connection string for the default credentials. + * + * @return connection string + */ + public String getConnectionString() { + return getConnectionString(WELL_KNOWN_ACCOUNT_NAME, WELL_KNOWN_ACCOUNT_KEY); + } + + /** + * Returns the connection string for the account name and key specified. + * + * @param accountName The name of the account + * @param accountKey The account key + * @return connection string + */ + public String getConnectionString(final String accountName, final String accountKey) { + final String protocol = cert != null ? "https" : "http"; + return String.format( + CONNECTION_STRING_FORMAT, + protocol, + accountName, + accountKey, + protocol, + getHost(), + getMappedPort(DEFAULT_BLOB_PORT), + accountName, + protocol, + getHost(), + getMappedPort(DEFAULT_QUEUE_PORT), + accountName, + protocol, + getHost(), + getMappedPort(DEFAULT_TABLE_PORT), + accountName + ); + } + + String getCommandLine() { + final StringBuilder args = new StringBuilder("azurite"); + args.append(" --blobHost ").append(ALLOW_ALL_CONNECTIONS); + args.append(" --queueHost ").append(ALLOW_ALL_CONNECTIONS); + args.append(" --tableHost ").append(ALLOW_ALL_CONNECTIONS); + if (this.cert != null) { + args.append(" --cert ").append("/cert").append(this.certExtension); + if (this.pwd != null) { + args.append(" --pwd ").append(this.pwd); + } else { + args.append(" --key ").append("/key.pem"); + } + } + for (String option : this.commandOptions) { + args.append(" ").append(option); + } + final String cmd = args.toString(); + logger().debug("Using command line: '{}'", cmd); + return cmd; + } +} diff --git a/modules/azure/src/main/java/org/testcontainers/azure/EventHubsEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/EventHubsEmulatorContainer.java new file mode 100644 index 00000000000..257f71a1424 --- /dev/null +++ b/modules/azure/src/main/java/org/testcontainers/azure/EventHubsEmulatorContainer.java @@ -0,0 +1,109 @@ +package org.testcontainers.azure; + +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.Transferable; +import org.testcontainers.utility.DockerImageName; +import org.testcontainers.utility.LicenseAcceptance; + +/** + * Testcontainers implementation for Azure Eventhubs Emulator. + *
+ * Supported image: {@code "mcr.microsoft.com/azure-messaging/eventhubs-emulator"} + *
+ * Exposed ports: + *
-
+ *
+ * Supported image: {@code mcr.microsoft.com/azure-messaging/servicebus-emulator} + *
+ * Exposed port: 5672
+ */
+public class ServiceBusEmulatorContainer extends GenericContainer
+ * Supported image: {@code cassandra}
+ *
+ * Exposed ports: 9042
+ */
+public class CassandraContainer extends GenericContainer
+ * Be aware, that Docker effectively replaces all /etc/cassandra content with the content of config location, so if
+ * Cassandra.yaml in configLocation is absent or corrupted, then Cassandra just won't launch.
+ *
+ * @param configLocation relative classpath with the directory that contains cassandra.yaml and other configuration
+ * files
+ * @return The updated {@link CassandraContainer}.
+ */
+ public CassandraContainer withConfigurationOverride(String configLocation) {
+ this.configLocation = configLocation;
+ return self();
+ }
+
+ /**
+ * Initialize Cassandra with init CQL script
+ *
+ * CQL script will be applied after container is started (see using WaitStrategy).
+ *
+ * By default, Cassandra has authenticator: AllowAllAuthenticator in cassandra.yaml
+ * If username and password need to be used, then authenticator should be set as PasswordAuthenticator
+ * (through custom Cassandra configuration) and through CQL with default cassandra-cassandra credentials
+ * user management should be modified
+ */
+ public String getUsername() {
+ return USERNAME;
+ }
+
+ /**
+ * Get password
+ *
+ * By default, Cassandra has authenticator: AllowAllAuthenticator in cassandra.yaml
+ * If username and password need to be used, then authenticator should be set as PasswordAuthenticator
+ * (through custom Cassandra configuration) and through CQL with default cassandra-cassandra credentials
+ * user management should be modified
+ */
+ public String getPassword() {
+ return PASSWORD;
+ }
+
+ /**
+ * Retrieve an {@link InetSocketAddress} for connecting to the Cassandra container via the driver.
+ *
+ * @return A InetSocketAddress representation of this Cassandra container's host and port.
+ */
+ public InetSocketAddress getContactPoint() {
+ return new InetSocketAddress(getHost(), getMappedPort(CQL_PORT));
+ }
+
+ /**
+ * Retrieve the Local Datacenter for connecting to the Cassandra container via the driver.
+ *
+ * @return The configured local Datacenter name.
+ */
+ public String getLocalDatacenter() {
+ return getEnvMap().getOrDefault("CASSANDRA_DC", DEFAULT_LOCAL_DATACENTER);
+ }
+}
diff --git a/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
new file mode 100644
index 00000000000..4867b8423e9
--- /dev/null
+++ b/modules/cassandra/src/main/java/org/testcontainers/cassandra/CassandraDatabaseDelegate.java
@@ -0,0 +1,98 @@
+package org.testcontainers.cassandra;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.containers.ExecConfig;
+import org.testcontainers.delegate.AbstractDatabaseDelegate;
+import org.testcontainers.ext.ScriptUtils.ScriptStatementFailedException;
+
+import java.io.IOException;
+
+/**
+ * Cassandra database delegate
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class CassandraDatabaseDelegate extends AbstractDatabaseDelegate
* Exposed ports: 9042
+ *
+ * @deprecated use {@link org.testcontainers.cassandra.CassandraContainer} instead.
*/
+@Deprecated
public class CassandraContainer
+ * Supported images: {@code chromadb/chroma}, {@code ghcr.io/chroma-core/chroma}
+ *
+ * Exposed ports: 8000
+ */
+@Slf4j
+public class ChromaDBContainer extends GenericContainer
+ * Supported image: {@code cockroachdb/cockroach}
+ *
+ * Exposed ports:
+ *
+ *
+ */
+public class CockroachContainer extends JdbcDatabaseContainer
* .withConsulCommand("secrets enable pki")
* .withConsulCommand("secrets enable transit")
diff --git a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java b/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
index 7f1c6d1c207..6e02bff51e8 100644
--- a/modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java
+++ b/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 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);
}
}
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
index 032aacecfed..068e334e2f1 100644
--- a/modules/couchbase/build.gradle
+++ b/modules/couchbase/build.gradle
@@ -3,9 +3,8 @@ description = "Testcontainers :: Couchbase"
dependencies {
api project(':testcontainers')
// TODO use JDK's HTTP client and/or Apache HttpClient5
- shaded 'com.squareup.okhttp3:okhttp:4.12.0'
+ shaded 'com.squareup.okhttp3:okhttp:5.5.0'
- testImplementation 'com.couchbase.client:java-client:3.5.2'
- testImplementation 'org.awaitility:awaitility:4.2.0'
- testImplementation 'org.assertj:assertj-core:3.25.1'
+ testImplementation 'com.couchbase.client:java-client:3.11.2'
+ testImplementation 'org.awaitility:awaitility:4.3.0'
}
diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 5e9a4b45f4d..14997d253af 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -92,8 +92,6 @@ public class CouchbaseContainer extends GenericContainer {
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("couchbase/server");
- private static final String DEFAULT_TAG = "6.5.1";
-
private static final ObjectMapper MAPPER = new ObjectMapper();
private static final OkHttpClient HTTP_CLIENT = new OkHttpClient();
@@ -123,14 +121,7 @@ public class CouchbaseContainer extends GenericContainer {
private boolean isEnterprise = false;
- /**
- * Creates a new couchbase container with the default image and version.
- * @deprecated use {@link #CouchbaseContainer(DockerImageName)} instead
- */
- @Deprecated
- public CouchbaseContainer() {
- this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
- }
+ private boolean hasTlsPorts = false;
/**
* Creates a new couchbase container with the specified image name.
@@ -339,12 +330,20 @@ private void exposePorts() {
}
}
+ @Override
+ protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
+ if (!reused) {
+ containerIsStarting(containerInfo);
+ }
+ }
+
@Override
protected void containerIsStarting(final InspectContainerResponse containerInfo) {
logger().debug("Couchbase container is starting, performing configuration.");
timePhase("waitUntilNodeIsOnline", this::waitUntilNodeIsOnline);
timePhase("initializeIsEnterprise", this::initializeIsEnterprise);
+ timePhase("initializeHasTlsPorts", this::initializeHasTlsPorts);
timePhase("renameNode", this::renameNode);
timePhase("initializeServices", this::initializeServices);
timePhase("setMemoryQuotas", this::setMemoryQuotas);
@@ -356,6 +355,13 @@ protected void containerIsStarting(final InspectContainerResponse containerInfo)
}
}
+ @Override
+ protected void containerIsStarted(InspectContainerResponse containerInfo, boolean reused) {
+ if (!reused) {
+ this.containerIsStarted(containerInfo);
+ }
+ }
+
@Override
protected void containerIsStarted(InspectContainerResponse containerInfo) {
timePhase("createBuckets", this::createBuckets);
@@ -394,6 +400,31 @@ private void initializeIsEnterprise() {
}
}
+ /**
+ * Initializes the {@link #hasTlsPorts} flag.
+ *
+ * Community Edition might support TLS one happy day, so use a "supports TLS" flag separate from
+ * the "enterprise edition" flag.
+ */
+ private void initializeHasTlsPorts() {
+ @Cleanup
+ Response response = doHttpRequest(MGMT_PORT, "/pools/default/nodeServices", "GET", null, true);
+
+ try {
+ String clusterTopology = response.body().string();
+ hasTlsPorts =
+ !MAPPER
+ .readTree(clusterTopology)
+ .path("nodesExt")
+ .path(0)
+ .path("services")
+ .path("mgmtSSL")
+ .isMissingNode();
+ } catch (IOException e) {
+ throw new IllegalStateException("Couchbase /pools/default/nodeServices did not return valid JSON");
+ }
+ }
+
/**
* Rebinds/renames the internal hostname.
*
@@ -503,33 +534,45 @@ private void configureExternalPorts() {
final FormBody.Builder builder = new FormBody.Builder();
builder.add("hostname", getHost());
builder.add("mgmt", Integer.toString(getMappedPort(MGMT_PORT)));
- builder.add("mgmtSSL", Integer.toString(getMappedPort(MGMT_SSL_PORT)));
+ if (hasTlsPorts) {
+ builder.add("mgmtSSL", Integer.toString(getMappedPort(MGMT_SSL_PORT)));
+ }
if (enabledServices.contains(CouchbaseService.KV)) {
builder.add("kv", Integer.toString(getMappedPort(KV_PORT)));
- builder.add("kvSSL", Integer.toString(getMappedPort(KV_SSL_PORT)));
builder.add("capi", Integer.toString(getMappedPort(VIEW_PORT)));
- builder.add("capiSSL", Integer.toString(getMappedPort(VIEW_SSL_PORT)));
+ if (hasTlsPorts) {
+ builder.add("kvSSL", Integer.toString(getMappedPort(KV_SSL_PORT)));
+ builder.add("capiSSL", Integer.toString(getMappedPort(VIEW_SSL_PORT)));
+ }
}
if (enabledServices.contains(CouchbaseService.QUERY)) {
builder.add("n1ql", Integer.toString(getMappedPort(QUERY_PORT)));
- builder.add("n1qlSSL", Integer.toString(getMappedPort(QUERY_SSL_PORT)));
+ if (hasTlsPorts) {
+ builder.add("n1qlSSL", Integer.toString(getMappedPort(QUERY_SSL_PORT)));
+ }
}
if (enabledServices.contains(CouchbaseService.SEARCH)) {
builder.add("fts", Integer.toString(getMappedPort(SEARCH_PORT)));
- builder.add("ftsSSL", Integer.toString(getMappedPort(SEARCH_SSL_PORT)));
+ if (hasTlsPorts) {
+ builder.add("ftsSSL", Integer.toString(getMappedPort(SEARCH_SSL_PORT)));
+ }
}
if (enabledServices.contains(CouchbaseService.ANALYTICS)) {
builder.add("cbas", Integer.toString(getMappedPort(ANALYTICS_PORT)));
- builder.add("cbasSSL", Integer.toString(getMappedPort(ANALYTICS_SSL_PORT)));
+ if (hasTlsPorts) {
+ builder.add("cbasSSL", Integer.toString(getMappedPort(ANALYTICS_SSL_PORT)));
+ }
}
if (enabledServices.contains(CouchbaseService.EVENTING)) {
builder.add("eventingAdminPort", Integer.toString(getMappedPort(EVENTING_PORT)));
- builder.add("eventingSSL", Integer.toString(getMappedPort(EVENTING_SSL_PORT)));
+ if (hasTlsPorts) {
+ builder.add("eventingSSL", Integer.toString(getMappedPort(EVENTING_SSL_PORT)));
+ }
}
@Cleanup
diff --git a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
index 691dc1307ef..b973d5eff2a 100644
--- a/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
+++ b/modules/couchbase/src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java
@@ -20,9 +20,8 @@
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 org.testcontainers.utility.DockerImageName;
import java.time.Duration;
import java.util.function.Consumer;
@@ -31,53 +30,45 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.awaitility.Awaitility.await;
-public class CouchbaseContainerTest {
+class CouchbaseContainerTest {
- private static final DockerImageName COUCHBASE_IMAGE_ENTERPRISE = DockerImageName.parse(
- "couchbase/server:enterprise-7.0.3"
- );
+ private static final String COUCHBASE_IMAGE_ENTERPRISE = "couchbase/server:enterprise-7.0.3";
- private static final DockerImageName COUCHBASE_IMAGE_COMMUNITY = DockerImageName.parse(
- "couchbase/server:community-7.0.2"
- );
+ private static final String COUCHBASE_IMAGE_ENTERPRISE_RECENT = "couchbase/server:enterprise-7.6.2";
- @Test
- public void testBasicContainerUsageForEnterpriseContainer() {
- // bucket_definition {
- BucketDefinition bucketDefinition = new BucketDefinition("mybucket");
- // }
-
- try (
- // container_definition {
- CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_ENTERPRISE)
- .withBucket(bucketDefinition)
- // }
- ) {
- setUpClient(
- container,
- cluster -> {
- Bucket bucket = cluster.bucket(bucketDefinition.getName());
- bucket.waitUntilReady(Duration.ofSeconds(10L));
+ private static final String COUCHBASE_IMAGE_COMMUNITY = "couchbase/server:community-7.0.2";
- Collection collection = bucket.defaultCollection();
+ private static final String COUCHBASE_IMAGE_COMMUNITY_RECENT = "couchbase/server:community-7.6.2";
- collection.upsert("foo", JsonObject.create().put("key", "value"));
+ @Test
+ void testBasicContainerUsageForEnterpriseContainer() {
+ testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE);
+ }
- JsonObject fooObject = collection.get("foo").contentAsObject();
+ @Test
+ void testBasicContainerUsageForEnterpriseContainerRecent() {
+ testBasicContainerUsage(COUCHBASE_IMAGE_ENTERPRISE_RECENT);
+ }
- assertThat(fooObject.getString("key")).isEqualTo("value");
- }
- );
- }
+ @Test
+ void testBasicContainerUsageForCommunityContainer() {
+ testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY);
}
@Test
- public void testBasicContainerUsageForCommunityContainer() {
+ void testBasicContainerUsageForCommunityContainerRecent() {
+ testBasicContainerUsage(COUCHBASE_IMAGE_COMMUNITY_RECENT);
+ }
+
+ private void testBasicContainerUsage(String couchbaseImage) {
+ // bucket_definition {
BucketDefinition bucketDefinition = new BucketDefinition("mybucket");
+ // }
try (
- CouchbaseContainer container = new CouchbaseContainer(COUCHBASE_IMAGE_COMMUNITY)
- .withBucket(bucketDefinition)
+ // container_definition {
+ CouchbaseContainer container = new CouchbaseContainer(couchbaseImage).withBucket(bucketDefinition)
+ // }
) {
setUpClient(
container,
@@ -98,7 +89,7 @@ public void testBasicContainerUsageForCommunityContainer() {
}
@Test
- public void testBucketIsFlushableIfEnabled() {
+ void testBucketIsFlushableIfEnabled() {
BucketDefinition bucketDefinition = new BucketDefinition("mybucket").withFlushEnabled(true);
try (
@@ -128,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)
@@ -145,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)
diff --git a/modules/cratedb/build.gradle b/modules/cratedb/build.gradle
index 683b9c1a373..62405d559b2 100644
--- a/modules/cratedb/build.gradle
+++ b/modules/cratedb/build.gradle
@@ -1,10 +1,11 @@
description = "Testcontainers :: JDBC :: CrateDB"
dependencies {
- api project(':jdbc')
+ api project(':testcontainers-jdbc')
- testImplementation project(':jdbc-test')
- testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
+ testRuntimeOnly 'org.postgresql:postgresql:42.7.12'
- compileOnly 'org.jetbrains:annotations:24.1.0'
+ testImplementation project(':testcontainers-jdbc-test')
+
+ compileOnly 'org.jetbrains:annotations:26.1.0'
}
diff --git a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
index 039128174c1..d91704eba3d 100644
--- a/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
+++ b/modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java
@@ -47,7 +47,7 @@ public CrateDBContainer(final DockerImageName dockerImageName) {
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
withCommand("crate -C discovery.type=single-node");
- this.waitStrategy = Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200);
+ waitingFor(Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200));
addExposedPort(CRATEDB_PG_PORT);
addExposedPort(CRATEDB_HTTP_PORT);
diff --git a/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java b/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
index 54ef9704ac5..2c20afe6680 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
package org.testcontainers.jdbc.cratedb;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.testcontainers.jdbc.AbstractJDBCDriverTest;
import java.util.Arrays;
import java.util.EnumSet;
-@RunWith(Parameterized.class)
-public class CrateDBJDBCDriverTest extends AbstractJDBCDriverTest {
+class CrateDBJDBCDriverTest extends AbstractJDBCDriverTest {
- @Parameterized.Parameters(name = "{index} - {0}")
public static Iterable data() {
return Arrays.asList(
new Object[][] {
diff --git a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
index 19ce83cd8ae..803b9173218 100644
--- a/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
+++ b/modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java
@@ -1,6 +1,6 @@
package org.testcontainers.junit.cratedb;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.CrateDBTestImages;
import org.testcontainers.cratedb.CrateDBContainer;
import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -12,15 +12,18 @@
import static org.assertj.core.api.Assertions.assertThat;
-public class SimpleCrateDBTest extends AbstractContainerDatabaseTest {
+class SimpleCrateDBTest extends AbstractContainerDatabaseTest {
static {
// Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
}
@Test
- public void testSimple() throws SQLException {
- try (CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)) {
+ void testSimple() throws SQLException {
+ try ( // container {
+ CrateDBContainer cratedb = new CrateDBContainer("crate:5.2.5")
+ // }
+ ) {
cratedb.start();
ResultSet resultSet = performQuery(cratedb, "SELECT 1");
@@ -31,7 +34,7 @@ public void testSimple() throws SQLException {
}
@Test
- public void testCommandOverride() throws SQLException {
+ void testCommandOverride() throws SQLException {
try (
CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
.withCommand("crate -C discovery.type=single-node -C cluster.name=testcontainers")
@@ -40,12 +43,12 @@ public void testCommandOverride() throws SQLException {
ResultSet resultSet = performQuery(cratedb, "select name from sys.cluster");
String result = resultSet.getString(1);
- assertThat(result).as("cluster name should be overriden").isEqualTo("testcontainers");
+ assertThat(result).as("cluster name should be overridden").isEqualTo("testcontainers");
}
}
@Test
- public void testExplicitInitScript() throws SQLException {
+ void testExplicitInitScript() throws SQLException {
try (
CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
.withInitScript("somepath/init_cratedb.sql")
diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
index 9b125464596..345b354d739 100644
--- a/modules/database-commons/build.gradle
+++ b/modules/database-commons/build.gradle
@@ -2,6 +2,4 @@ description = "Testcontainers :: Database-Commons"
dependencies {
api project(':testcontainers')
-
- testImplementation 'org.assertj:assertj-core:3.25.1'
}
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
index 686527e9364..8350f7fbf38 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptScanner.java
@@ -141,7 +141,12 @@ Lexem next() {
return Lexem.SEPARATOR;
} else if (matchesSingleLineComment() || matchesMultilineComment()) {
return Lexem.COMMENT;
- } else if (matchesQuotedString('\'') || matchesQuotedString('"') || matchesDollarQuotedString()) {
+ } else if (
+ matchesQuotedString('\'') ||
+ matchesQuotedString('"') ||
+ matchesQuotedString('`') ||
+ matchesDollarQuotedString()
+ ) {
return Lexem.QUOTED_STRING;
} else if (matches(identifier)) {
return Lexem.IDENTIFIER;
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
index ba05b71e7bd..d71f6f3ac3d 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
@@ -36,7 +36,7 @@ void split() {
//skip
break;
case WHITESPACE:
- if (!sb.toString().endsWith(" ")) {
+ if (sb.length() == 0 || sb.charAt(sb.length() - 1) != ' ') {
sb.append(' ');
}
break;
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
index 419bcbf9e9a..b78ac4d63c4 100644
--- a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
+++ b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -27,6 +27,7 @@
import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.script.ScriptException;
@@ -273,7 +274,7 @@ public static void executeDatabaseScript(
LOGGER.info("Executing database script from " + scriptPath);
}
- long startTime = System.currentTimeMillis();
+ long startTime = System.nanoTime();
List statements = new LinkedList<>();
if (separator == null) {
@@ -306,7 +307,7 @@ public static void executeDatabaseScript(
closeableDelegate.execute(statements, scriptPath, continueOnError, ignoreFailedDrops);
}
- long elapsedTime = System.currentTimeMillis() - startTime;
+ long elapsedTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime);
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Executed database script from " + scriptPath + " in " + elapsedTime + " ms.");
}
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java
index 7e24026c4ec..a82305a0a6e 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptScannerTest.java
+++ b/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'");
diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
index baaf3bbd08c..cb0e33162f4 100644
--- a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
+++ b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -1,6 +1,6 @@
package org.testcontainers.ext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Arrays;
@@ -10,10 +10,10 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-public class ScriptSplittingTest {
+class ScriptSplittingTest {
@Test
- public void testStringDemarcation() {
+ void testStringDemarcation() {
String script = "SELECT 'foo `bar`'; SELECT 'foo -- `bar`'; SELECT 'foo /* `bar`';";
List expected = Arrays.asList("SELECT 'foo `bar`'", "SELECT 'foo -- `bar`'", "SELECT 'foo /* `bar`'");
@@ -22,7 +22,7 @@ public void testStringDemarcation() {
}
@Test
- public void testIssue1547Case1() {
+ void testIssue1547Case1() {
String script =
"create database if not exists ttt;\n" +
"\n" +
@@ -51,7 +51,7 @@ public void testIssue1547Case1() {
}
@Test
- public void testIssue1547Case2() {
+ void testIssue1547Case2() {
String script =
"CREATE TABLE bar (\n" +
" end_time VARCHAR(255)\n" +
@@ -69,7 +69,16 @@ public void testIssue1547Case2() {
}
@Test
- public void testUnusualSemicolonPlacement() {
+ void testSplittingEnquotedSemicolon() {
+ String script = "CREATE TABLE `bar;bar` (\n" + " end_time VARCHAR(255)\n" + ");";
+
+ List expected = Arrays.asList("CREATE TABLE `bar;bar` ( end_time VARCHAR(255) )");
+
+ splitAndCompare(script, expected);
+ }
+
+ @Test
+ void testUnusualSemicolonPlacement() {
String script = "SELECT 1;;;;;SELECT 2;\n;SELECT 3\n; SELECT 4;\n SELECT 5";
List expected = Arrays.asList("SELECT 1", "SELECT 2", "SELECT 3", "SELECT 4", "SELECT 5");
@@ -78,7 +87,7 @@ public void testUnusualSemicolonPlacement() {
}
@Test
- public void testCommentedSemicolon() {
+ void testCommentedSemicolon() {
String script =
"CREATE TABLE bar (\n" + " foo VARCHAR(255)\n" + "); \nDROP PROCEDURE IF EXISTS -- ;\n" + " count_foo";
@@ -91,7 +100,7 @@ public void testCommentedSemicolon() {
}
@Test
- public void testStringEscaping() {
+ void testStringEscaping() {
String script =
"SELECT \"a /* string literal containing comment characters like -- here\";\n" +
"SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\";\n" +
@@ -107,7 +116,7 @@ public void testStringEscaping() {
}
@Test
- public void testBlockCommentExclusion() {
+ void testBlockCommentExclusion() {
String script = "INSERT INTO bar (foo) /* ; */ VALUES ('hello world');";
List expected = Arrays.asList("INSERT INTO bar (foo) VALUES ('hello world')");
@@ -116,7 +125,7 @@ public void testBlockCommentExclusion() {
}
@Test
- public void testBeginEndKeywordCorrectDetection() {
+ void testBeginEndKeywordCorrectDetection() {
String script =
"INSERT INTO something_end (begin_with_the_token, another_field) /*end*/ VALUES /* end */ (' begin ', `end`)-- begin\n;";
@@ -128,7 +137,7 @@ public void testBeginEndKeywordCorrectDetection() {
}
@Test
- public void testCommentInStrings() {
+ void testCommentInStrings() {
String script =
"CREATE TABLE bar (foo VARCHAR(255));\n" +
"\n" +
@@ -152,7 +161,7 @@ public void testCommentInStrings() {
}
@Test
- public void testMultipleBeginEndDetection() {
+ void testMultipleBeginEndDetection() {
String script =
"CREATE TABLE bar (foo VARCHAR(255));\n" +
"\n" +
@@ -196,7 +205,7 @@ public void testMultipleBeginEndDetection() {
}
@Test
- public void testProcedureBlock() {
+ void testProcedureBlock() {
String script =
"CREATE PROCEDURE count_foo()\n" +
" BEGIN\n" +
@@ -255,7 +264,7 @@ public void testProcedureBlock() {
}
@Test
- public void testUnclosedBlockComment() {
+ void testUnclosedBlockComment() {
String script = "SELECT 'foo `bar`'; /*";
assertThatThrownBy(() -> doSplit(script, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR))
.isInstanceOf(ScriptUtils.ScriptParseException.class)
@@ -263,7 +272,7 @@ public void testUnclosedBlockComment() {
}
@Test
- public void testIssue1452Case() {
+ void testIssue1452Case() {
String script =
"create table test (text VARCHAR(255));\n" +
"\n" +
@@ -279,7 +288,7 @@ public void testIssue1452Case() {
}
@Test
- public void testIfLoopBlocks() {
+ void testIfLoopBlocks() {
String script =
"BEGIN\n" +
" rec_loop: LOOP\n" +
@@ -301,7 +310,7 @@ public void testIfLoopBlocks() {
}
@Test
- public void testIfLoopBlocksSpecificSeparator() {
+ void testIfLoopBlocksSpecificSeparator() {
String script =
"BEGIN\n" +
" rec_loop: LOOP\n" +
@@ -327,14 +336,14 @@ public void testIfLoopBlocksSpecificSeparator() {
}
@Test
- public void oracleStyleBlocks() {
+ void oracleStyleBlocks() {
String script = "BEGIN END; /\n" + "BEGIN END;";
List expected = Arrays.asList("BEGIN END;", "BEGIN END;");
splitAndCompare(script, expected, "/");
}
@Test
- public void testMultiProcedureMySQLScript() {
+ void testMultiProcedureMySQLScript() {
String script =
"CREATE PROCEDURE doiterate(p1 INT)\n" +
" BEGIN\n" +
@@ -389,7 +398,7 @@ public void testMultiProcedureMySQLScript() {
}
@Test
- public void testDollarQuotedStrings() {
+ void testDollarQuotedStrings() {
String script =
"CREATE FUNCTION f ()\n" +
"RETURNS INT\n" +
@@ -409,7 +418,7 @@ public void testDollarQuotedStrings() {
}
@Test
- public void testNestedDollarQuotedString() {
+ void testNestedDollarQuotedString() {
//see https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING
String script =
"CREATE FUNCTION f() AS $function$\n" +
@@ -430,7 +439,7 @@ public void testNestedDollarQuotedString() {
}
@Test
- public void testUnclosedDollarQuotedString() {
+ void testUnclosedDollarQuotedString() {
String script = "SELECT $tag$ ..... $";
assertThatThrownBy(() -> doSplit(script, ScriptUtils.DEFAULT_STATEMENT_SEPARATOR))
.isInstanceOf(ScriptUtils.ScriptParseException.class)
@@ -461,12 +470,12 @@ private List doSplit(String script, String separator) {
}
@Test
- public void testIgnoreDelimitersInLiteralsAndComments() {
+ void testIgnoreDelimitersInLiteralsAndComments() {
assertThat(ScriptUtils.containsSqlScriptDelimiters("'@' /*@*/ \"@\" $tag$@$tag$ --@", "@")).isFalse();
}
@Test
- public void testContainsDelimiters() {
+ void testContainsDelimiters() {
assertThat(ScriptUtils.containsSqlScriptDelimiters("'@' /*@*/ @ \"@\" --@", "@")).isTrue();
}
}
diff --git a/modules/databend/build.gradle b/modules/databend/build.gradle
new file mode 100644
index 00000000000..7a779d3ca20
--- /dev/null
+++ b/modules/databend/build.gradle
@@ -0,0 +1,8 @@
+description = "Testcontainers :: JDBC :: Databend"
+
+dependencies {
+ api project(':testcontainers-jdbc')
+
+ testImplementation project(':testcontainers-jdbc-test')
+ testRuntimeOnly 'com.databend:databend-jdbc:0.4.6'
+}
diff --git a/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainer.java b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainer.java
new file mode 100644
index 00000000000..389c8c44963
--- /dev/null
+++ b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainer.java
@@ -0,0 +1,112 @@
+package org.testcontainers.databend;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for Databend.
+ *
+ * Supported image: {@code datafuselabs/databend}
+ *
+ * Exposed ports:
+ *
+ * - Database: 8000
+ *
+ */
+public class DatabendContainer extends JdbcDatabaseContainer {
+
+ static final String NAME = "databend";
+
+ static final DockerImageName DOCKER_IMAGE_NAME = DockerImageName.parse("datafuselabs/databend");
+
+ private static final Integer HTTP_PORT = 8000;
+
+ private static final String DRIVER_CLASS_NAME = "com.databend.jdbc.DatabendDriver";
+
+ private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+
+ private static final String TEST_QUERY = "SELECT 1";
+
+ private String databaseName = "default";
+
+ private String username = "databend";
+
+ private String password = "databend";
+
+ public DatabendContainer(String dockerImageName) {
+ this(DockerImageName.parse(dockerImageName));
+ }
+
+ public DatabendContainer(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DOCKER_IMAGE_NAME);
+
+ addExposedPorts(HTTP_PORT);
+ waitingFor(Wait.forHttp("/").forResponsePredicate(response -> response.equals("Ok.")));
+ }
+
+ @Override
+ protected void configure() {
+ withEnv("QUERY_DEFAULT_USER", this.username);
+ withEnv("QUERY_DEFAULT_PASSWORD", this.password);
+ }
+
+ @Override
+ public Set getLivenessCheckPortNumbers() {
+ return new HashSet<>(getMappedPort(HTTP_PORT));
+ }
+
+ @Override
+ public String getDriverClassName() {
+ return DRIVER_CLASS_NAME;
+ }
+
+ @Override
+ public String getJdbcUrl() {
+ return (
+ JDBC_URL_PREFIX +
+ getHost() +
+ ":" +
+ getMappedPort(HTTP_PORT) +
+ "/" +
+ this.databaseName +
+ constructUrlParameters("?", "&")
+ );
+ }
+
+ @Override
+ public String getUsername() {
+ return this.username;
+ }
+
+ @Override
+ public String getPassword() {
+ return this.password;
+ }
+
+ @Override
+ public String getDatabaseName() {
+ return this.databaseName;
+ }
+
+ @Override
+ public String getTestQueryString() {
+ return TEST_QUERY;
+ }
+
+ @Override
+ public DatabendContainer withUsername(String username) {
+ this.username = username;
+ return this;
+ }
+
+ @Override
+ public DatabendContainer withPassword(String password) {
+ this.password = password;
+ return this;
+ }
+}
diff --git a/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainerProvider.java b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainerProvider.java
new file mode 100644
index 00000000000..9142bebcfd3
--- /dev/null
+++ b/modules/databend/src/main/java/org/testcontainers/databend/DatabendContainerProvider.java
@@ -0,0 +1,28 @@
+package org.testcontainers.databend;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+
+public class DatabendContainerProvider extends JdbcDatabaseContainerProvider {
+
+ private static final String DEFAULT_TAG = "v1.2.615";
+
+ @Override
+ public boolean supports(String databaseType) {
+ return databaseType.equals(DatabendContainer.NAME);
+ }
+
+ @Override
+ public JdbcDatabaseContainer newInstance() {
+ return newInstance(DEFAULT_TAG);
+ }
+
+ @Override
+ public JdbcDatabaseContainer newInstance(String tag) {
+ if (tag != null) {
+ return new DatabendContainer(DatabendContainer.DOCKER_IMAGE_NAME.withTag(tag));
+ } else {
+ return newInstance();
+ }
+ }
+}
diff --git a/modules/databend/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider b/modules/databend/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
new file mode 100644
index 00000000000..ead69e77bee
--- /dev/null
+++ b/modules/databend/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider
@@ -0,0 +1 @@
+org.testcontainers.databend.DatabendContainerProvider
diff --git a/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
new file mode 100644
index 00000000000..984f42979c4
--- /dev/null
+++ b/modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java
@@ -0,0 +1,44 @@
+package org.testcontainers.databend;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.db.AbstractContainerDatabaseTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DatabendContainerTest extends AbstractContainerDatabaseTest {
+
+ @Test
+ void testSimple() throws SQLException {
+ try ( // container {
+ DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
+ // }
+ ) {
+ databend.start();
+
+ ResultSet resultSet = performQuery(databend, "SELECT 1");
+
+ int resultSetInt = resultSet.getInt(1);
+ assertThat(resultSetInt).isEqualTo(1);
+ }
+ }
+
+ @Test
+ void customCredentialsWithUrlParams() throws SQLException {
+ try (
+ DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
+ .withUsername("test")
+ .withPassword("test")
+ .withUrlParam("ssl", "false")
+ ) {
+ databend.start();
+
+ ResultSet resultSet = performQuery(databend, "SELECT 1;");
+
+ int resultSetInt = resultSet.getInt(1);
+ assertThat(resultSetInt).isEqualTo(1);
+ }
+ }
+}
diff --git a/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java b/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
new file mode 100644
index 00000000000..2f3a030919f
--- /dev/null
+++ b/modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java
@@ -0,0 +1,17 @@
+package org.testcontainers.databend;
+
+import org.testcontainers.jdbc.AbstractJDBCDriverTest;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+
+class DatabendJDBCDriverTest extends AbstractJDBCDriverTest {
+
+ public static Iterable data() {
+ return Arrays.asList(
+ new Object[][] { //
+ { "jdbc:tc:databend://hostname/databasename", EnumSet.of(Options.PmdKnownBroken) },
+ }
+ );
+ }
+}
diff --git a/modules/databend/src/test/resources/logback-test.xml b/modules/databend/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/databend/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+ %d{HH:mm:ss.SSS} %-5level %logger - %msg%n
+
+
+
+
+
+
+
diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle
index 0d5532dd36c..afae0bfd751 100644
--- a/modules/db2/build.gradle
+++ b/modules/db2/build.gradle
@@ -1,9 +1,8 @@
description = "Testcontainers :: JDBC :: DB2"
dependencies {
- api project(':jdbc')
+ api project(':testcontainers-jdbc')
- testImplementation project(':jdbc-test')
- testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
- testImplementation 'org.assertj:assertj-core:3.25.1'
+ testImplementation project(':testcontainers-jdbc-test')
+ testRuntimeOnly 'com.ibm.db2:jcc:12.1.5.0'
}
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
index 0cde8f0dee3..19dbc6a58ac 100644
--- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
+++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -1,5 +1,6 @@
package org.testcontainers.containers;
+import com.github.dockerjava.api.model.Capability;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.LicenseAcceptance;
@@ -17,7 +18,9 @@
*
* - Database: 50000
*
+ * @deprecated use {@link org.testcontainers.db2.Db2Container} instead.
*/
+@Deprecated
public class Db2Container extends JdbcDatabaseContainer {
public static final String NAME = "db2";
@@ -57,7 +60,7 @@ public Db2Container(final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_NEW_IMAGE_NAME, DEFAULT_IMAGE_NAME);
- withPrivilegedMode(true);
+ withCreateContainerCmdModifier(cmd -> cmd.withCapAdd(Capability.IPC_LOCK).withCapAdd(Capability.IPC_OWNER));
this.waitStrategy =
new LogMessageWaitStrategy()
.withRegEx(".*Setup has completed\\..*")
@@ -78,7 +81,7 @@ protected Set getLivenessCheckPorts() {
@Override
protected void configure() {
- // If license was not accepted programatically, check if it was accepted via resource file
+ // If license was not accepted programmatically, check if it was accepted via resource file
if (!getEnvMap().containsKey("LICENSE")) {
LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
acceptLicense();
diff --git a/modules/db2/src/main/java/org/testcontainers/db2/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/db2/Db2Container.java
new file mode 100644
index 00000000000..bdd182599e5
--- /dev/null
+++ b/modules/db2/src/main/java/org/testcontainers/db2/Db2Container.java
@@ -0,0 +1,143 @@
+package org.testcontainers.db2;
+
+import com.github.dockerjava.api.model.Capability;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.LicenseAcceptance;
+
+import java.time.Duration;
+import java.util.Set;
+
+/**
+ * Testcontainers implementation for IBM DB2.
+ *
+ * Supported images: {@code icr.io/db2_community/db2}, {@code ibmcom/db2}
+ *
+ * Exposed ports:
+ *
+ * - Database: 50000
+ *
+ */
+public class Db2Container extends JdbcDatabaseContainer {
+
+ public static final String NAME = "db2";
+
+ private static final DockerImageName DEFAULT_NEW_IMAGE_NAME = DockerImageName.parse("icr.io/db2_community/db2");
+
+ public static final int DB2_PORT = 50000;
+
+ private String databaseName = "test";
+
+ private String username = "db2inst1";
+
+ private String password = "foobar1234";
+
+ public Db2Container(String dockerImageName) {
+ this(DockerImageName.parse(dockerImageName));
+ }
+
+ public Db2Container(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DEFAULT_NEW_IMAGE_NAME);
+
+ withCreateContainerCmdModifier(cmd -> cmd.withCapAdd(Capability.IPC_LOCK).withCapAdd(Capability.IPC_OWNER));
+ waitingFor(Wait.forLogMessage(".*Setup has completed\\..*", 1).withStartupTimeout(Duration.ofMinutes(10)));
+
+ addExposedPort(DB2_PORT);
+ }
+
+ /**
+ * @return the ports on which to check if the container is ready
+ * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
+ */
+ @Override
+ @Deprecated
+ protected Set getLivenessCheckPorts() {
+ return super.getLivenessCheckPorts();
+ }
+
+ @Override
+ protected void configure() {
+ // If license was not accepted programmatically, check if it was accepted via resource file
+ if (!getEnvMap().containsKey("LICENSE")) {
+ LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+ acceptLicense();
+ }
+
+ addEnv("DBNAME", databaseName);
+ addEnv("DB2INSTANCE", username);
+ addEnv("DB2INST1_PASSWORD", password);
+
+ // These settings help the DB2 container start faster
+ if (!getEnvMap().containsKey("AUTOCONFIG")) {
+ addEnv("AUTOCONFIG", "false");
+ }
+ if (!getEnvMap().containsKey("ARCHIVE_LOGS")) {
+ addEnv("ARCHIVE_LOGS", "false");
+ }
+ }
+
+ /**
+ * Accepts the license for the DB2 container by setting the LICENSE=accept
+ * variable as described at https://hub.docker.com/r/ibmcom/db2
+ */
+ public Db2Container acceptLicense() {
+ addEnv("LICENSE", "accept");
+ return this;
+ }
+
+ @Override
+ public String getDriverClassName() {
+ return "com.ibm.db2.jcc.DB2Driver";
+ }
+
+ @Override
+ public String getJdbcUrl() {
+ String additionalUrlParams = constructUrlParameters(":", ";", ";");
+ return "jdbc:db2://" + getHost() + ":" + getMappedPort(DB2_PORT) + "/" + databaseName + additionalUrlParams;
+ }
+
+ @Override
+ public String getUsername() {
+ return username;
+ }
+
+ @Override
+ public String getPassword() {
+ return password;
+ }
+
+ @Override
+ public String getDatabaseName() {
+ return databaseName;
+ }
+
+ @Override
+ public Db2Container withUsername(String username) {
+ this.username = username;
+ return this;
+ }
+
+ @Override
+ public Db2Container withPassword(String password) {
+ this.password = password;
+ return this;
+ }
+
+ @Override
+ public Db2Container withDatabaseName(String dbName) {
+ this.databaseName = dbName;
+ return this;
+ }
+
+ @Override
+ protected void waitUntilContainerStarted() {
+ getWaitStrategy().waitUntilReady(this);
+ }
+
+ @Override
+ protected String getTestQueryString() {
+ return "SELECT 1 FROM SYSIBM.SYSDUMMY1";
+ }
+}
diff --git a/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java b/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
index b0bfc869272..002d030b1c5 100644
--- a/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
+++ b/modules/db2/src/test/java/org/testcontainers/Db2TestImages.java
@@ -3,5 +3,5 @@
import org.testcontainers.utility.DockerImageName;
public interface Db2TestImages {
- DockerImageName DB2_IMAGE = DockerImageName.parse("ibmcom/db2:11.5.0.0a");
+ DockerImageName DB2_IMAGE = DockerImageName.parse("icr.io/db2_community/db2:11.5.8.0");
}
diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/db2/Db2ContainerTest.java
similarity index 78%
rename from modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
rename to modules/db2/src/test/java/org/testcontainers/db2/Db2ContainerTest.java
index 2cffbdb117a..6b17d1583f7 100644
--- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
+++ b/modules/db2/src/test/java/org/testcontainers/db2/Db2ContainerTest.java
@@ -1,8 +1,7 @@
-package org.testcontainers.junit.db2;
+package org.testcontainers.db2;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.Db2TestImages;
-import org.testcontainers.containers.Db2Container;
import org.testcontainers.db.AbstractContainerDatabaseTest;
import java.sql.ResultSet;
@@ -10,11 +9,14 @@
import static org.assertj.core.api.Assertions.assertThat;
-public class SimpleDb2Test extends AbstractContainerDatabaseTest {
+class Db2ContainerTest extends AbstractContainerDatabaseTest {
@Test
- public void testSimple() throws SQLException {
- try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) {
+ void testSimple() throws SQLException {
+ try ( // container {
+ Db2Container db2 = new Db2Container("icr.io/db2_community/db2:11.5.8.0").acceptLicense()
+ // }
+ ) {
db2.start();
ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
@@ -26,7 +28,7 @@ public void testSimple() throws SQLException {
}
@Test
- public void testSimpleWithNewImage() throws SQLException {
+ void testSimpleWithNewImage() throws SQLException {
try (Db2Container db2 = new Db2Container("icr.io/db2_community/db2:11.5.8.0").acceptLicense()) {
db2.start();
@@ -39,7 +41,7 @@ public void testSimpleWithNewImage() throws SQLException {
}
@Test
- public void testWithAdditionalUrlParamInJdbcUrl() {
+ void testWithAdditionalUrlParamInJdbcUrl() {
try (
Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE)
.withUrlParam("sslConnection", "false")
diff --git a/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
index 4a03f824a28..cfa74c8017a 100644
--- a/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
+++ b/modules/db2/src/test/java/org/testcontainers/jdbc/db2/DB2JDBCDriverTest.java
@@ -1,16 +1,12 @@
package org.testcontainers.jdbc.db2;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.testcontainers.jdbc.AbstractJDBCDriverTest;
import java.util.Arrays;
import java.util.EnumSet;
-@RunWith(Parameterized.class)
-public class DB2JDBCDriverTest extends AbstractJDBCDriverTest {
+class DB2JDBCDriverTest extends AbstractJDBCDriverTest {
- @Parameterized.Parameters(name = "{index} - {0}")
public static Iterable data() {
return Arrays.asList(
new Object[][] { //
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
deleted file mode 100644
index be947cc349e..00000000000
--- a/modules/dynalite/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-description = "Testcontainers :: Dynalite (deprecated)"
-
-dependencies {
- api project(':testcontainers')
-
- compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
- testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
- testImplementation 'org.assertj:assertj-core:3.25.2'
-}
diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
deleted file mode 100644
index 2a73ce6f022..00000000000
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.testcontainers.dynamodb;
-
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
-/**
- * Container for Dynalite, a DynamoDB clone.
- *
- * @deprecated use localstack module instead
- */
-public class DynaliteContainer extends GenericContainer {
-
- private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("quay.io/testcontainers/dynalite");
-
- private static final String DEFAULT_TAG = "v1.2.1-1";
-
- private static final int MAPPED_PORT = 4567;
-
- /**
- * @deprecated use {@link #DynaliteContainer(DockerImageName)} instead
- */
- @Deprecated
- public DynaliteContainer() {
- this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
- }
-
- public DynaliteContainer(String dockerImageName) {
- this(DockerImageName.parse(dockerImageName));
- }
-
- public DynaliteContainer(final DockerImageName dockerImageName) {
- super(dockerImageName);
- dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-
- withExposedPorts(MAPPED_PORT);
- }
-
- /**
- * Gets a preconfigured {@link AmazonDynamoDB} client object for connecting to this
- * container.
- *
- * @return preconfigured client
- */
- public AmazonDynamoDB getClient() {
- return AmazonDynamoDBClientBuilder
- .standard()
- .withEndpointConfiguration(getEndpointConfiguration())
- .withCredentials(getCredentials())
- .build();
- }
-
- /**
- * Gets {@link AwsClientBuilder.EndpointConfiguration}
- * that may be used to connect to this container.
- *
- * @return endpoint configuration
- */
- public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration() {
- return new AwsClientBuilder.EndpointConfiguration(
- "http://" + this.getHost() + ":" + this.getMappedPort(MAPPED_PORT),
- null
- );
- }
-
- /**
- * Gets an {@link AWSCredentialsProvider} that may be used to connect to this container.
- *
- * @return dummy AWS credentials
- */
- public AWSCredentialsProvider getCredentials() {
- return new AWSStaticCredentialsProvider(new BasicAWSCredentials("dummy", "dummy"));
- }
-}
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
deleted file mode 100644
index 10e02566d16..00000000000
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.testcontainers.dynamodb;
-
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
-import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;
-import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
-import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
-import com.amazonaws.services.dynamodbv2.model.KeyType;
-import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
-import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
-import com.amazonaws.services.dynamodbv2.model.TableDescription;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class DynaliteContainerTest {
-
- private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse(
- "quay.io/testcontainers/dynalite:v1.2.1-1"
- );
-
- @Rule
- public DynaliteContainer dynamoDB = new DynaliteContainer(DYNALITE_IMAGE);
-
- @Test
- public void simpleTestWithManualClientCreation() {
- final AmazonDynamoDB client = AmazonDynamoDBClientBuilder
- .standard()
- .withEndpointConfiguration(dynamoDB.getEndpointConfiguration())
- .withCredentials(dynamoDB.getCredentials())
- .build();
-
- runTest(client);
- }
-
- @Test
- public void simpleTestWithProvidedClient() {
- final AmazonDynamoDB client = dynamoDB.getClient();
-
- runTest(client);
- }
-
- private void runTest(AmazonDynamoDB client) {
- CreateTableRequest request = new CreateTableRequest()
- .withAttributeDefinitions(new AttributeDefinition("Name", ScalarAttributeType.S))
- .withKeySchema(new KeySchemaElement("Name", KeyType.HASH))
- .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L))
- .withTableName("foo");
-
- client.createTable(request);
-
- final TableDescription tableDescription = client.describeTable("foo").getTable();
-
- assertThat(tableDescription).as("the description is not null").isNotNull();
- assertThat(tableDescription.getTableName()).as("the table has the right name").isEqualTo("foo");
- assertThat(tableDescription.getKeySchema().get(0).getAttributeName())
- .as("the name has the right primary key")
- .isEqualTo("Name");
- }
-}
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
index 56399a509d9..7f57916e991 100644
--- a/modules/elasticsearch/build.gradle
+++ b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
dependencies {
api project(':testcontainers')
- testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.12.0"
- testImplementation "org.elasticsearch.client:transport:7.17.17"
- testImplementation 'org.assertj:assertj-core:3.25.2'
+
+ testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.4.3"
+ testImplementation "org.elasticsearch.client:transport:7.17.29"
}
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
index 940d6924c5e..2080d21649a 100644
--- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -1,13 +1,12 @@
package org.testcontainers.elasticsearch;
-import com.github.dockerjava.api.command.InspectContainerResponse;
import com.github.dockerjava.api.exception.NotFoundException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.ComparableVersion;
import org.testcontainers.utility.DockerImageName;
@@ -66,31 +65,19 @@ public class ElasticsearchContainer extends GenericContainer= 8
+ private static final String DEFAULT_CERT_PATH = "/usr/share/elasticsearch/config/certs/http_ca.crt";
@Deprecated
private boolean isOss = false;
private final boolean isAtLeastMajorVersion8;
- private Optional caCertAsBytes = Optional.empty();
-
- private String certPath = "/usr/share/elasticsearch/config/certs/http_ca.crt";
-
- /**
- * @deprecated use {@link #ElasticsearchContainer(DockerImageName)} instead
- */
- @Deprecated
- public ElasticsearchContainer() {
- this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
- }
+ private String certPath = "";
/**
* Create an Elasticsearch Container by passing the full docker image name
+ *
* @param dockerImageName Full docker image name as a {@link String}, like: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
*/
public ElasticsearchContainer(String dockerImageName) {
@@ -99,6 +86,7 @@ public ElasticsearchContainer(String dockerImageName) {
/**
* Create an Elasticsearch Container by passing the full docker image name
+ *
* @param dockerImageName Full docker image name as a {@link DockerImageName}, like: DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:7.9.2")
*/
public ElasticsearchContainer(final DockerImageName dockerImageName) {
@@ -133,26 +121,10 @@ public ElasticsearchContainer(final DockerImageName dockerImageName) {
// matches 7.x JSON logging with whitespace between message field and content
// matches 6.x text logging with node name in brackets and just a 'started' message till the end of the line
String regex = ".*(\"message\":\\s?\"started[\\s?|\"].*|] started\n$)";
- setWaitStrategy(new LogMessageWaitStrategy().withRegEx(regex));
+ setWaitStrategy(Wait.forLogMessage(regex, 1));
if (isAtLeastMajorVersion8) {
withPassword(ELASTICSEARCH_DEFAULT_PASSWORD);
- }
- }
-
- @Override
- protected void containerIsStarted(InspectContainerResponse containerInfo) {
- if (isAtLeastMajorVersion8 && StringUtils.isNotEmpty(certPath)) {
- try {
- byte[] bytes = copyFileFromContainer(certPath, IOUtils::toByteArray);
- if (bytes.length > 0) {
- this.caCertAsBytes = Optional.of(bytes);
- }
- } catch (NotFoundException e) {
- // just emit an error message, but do not throw an exception
- // this might be ok, if the docker image is accidentally looking like version 8 or latest
- // can happen if Elasticsearch is repackaged, i.e. with custom plugins
- log.warn("CA cert under " + certPath + " not found.");
- }
+ withCertPath(DEFAULT_CERT_PATH);
}
}
@@ -162,17 +134,36 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
* @return byte array optional containing the CA cert extracted from the docker container
*/
public Optional caCertAsBytes() {
- return caCertAsBytes;
+ if (StringUtils.isBlank(certPath)) {
+ return Optional.empty();
+ }
+ try {
+ byte[] bytes = copyFileFromContainer(certPath, IOUtils::toByteArray);
+ if (bytes.length > 0) {
+ return Optional.of(bytes);
+ }
+ } catch (NotFoundException e) {
+ // just emit an error message, but do not throw an exception
+ // this might be ok, if the docker image is accidentally looking like version 8 or latest
+ // can happen if Elasticsearch is repackaged, i.e. with custom plugins
+ log.warn("CA cert under " + certPath + " not found.");
+ }
+ return Optional.empty();
}
/**
- * A SSL context based on the self signed CA, so that using this SSL Context allows to connect to the Elasticsearch service
+ * A SSL context based on the self-signed CA, so that using this SSL Context allows to connect to the Elasticsearch service
* @return a customized SSL Context
*/
public SSLContext createSslContextFromCa() {
try {
CertificateFactory factory = CertificateFactory.getInstance("X.509");
- Certificate trustedCa = factory.generateCertificate(new ByteArrayInputStream(caCertAsBytes.get()));
+ Certificate trustedCa = factory.generateCertificate(
+ new ByteArrayInputStream(
+ caCertAsBytes()
+ .orElseThrow(() -> new IllegalStateException("CA cert under " + certPath + " not found."))
+ )
+ );
KeyStore trustStore = KeyStore.getInstance("pkcs12");
trustStore.load(null, null);
trustStore.setCertificateEntry("ca", trustedCa);
@@ -190,13 +181,13 @@ public SSLContext createSslContextFromCa() {
/**
* Define the Elasticsearch password to set. It enables security behind the scene for major version below 8.0.0.
* It's not possible to use security with the oss image.
- * @param password Password to set
+ * @param password Password to set
* @return this
*/
public ElasticsearchContainer withPassword(String password) {
if (isOss) {
throw new IllegalArgumentException(
- "You can not activate security on Elastic OSS Image. " + "Please switch to the default distribution"
+ "You can not activate security on Elastic OSS Image. Please switch to the default distribution"
);
}
withEnv("ELASTIC_PASSWORD", password);
@@ -218,11 +209,101 @@ public ElasticsearchContainer withCertPath(String certPath) {
return this;
}
+ String getCertPath() {
+ return certPath;
+ }
+
public String getHttpHostAddress() {
return getHost() + ":" + getMappedPort(ELASTICSEARCH_DEFAULT_PORT);
}
- @Deprecated // The TransportClient will be removed in Elasticsearch 8. No need to expose this port anymore in the future.
+ /**
+ * Checks env first if this implies HTTP/HTTPS.
+ * Otherwise, detects the scheme used by Elasticsearch using curl
+ *
+ * @return "http" or "https"
+ */
+ String getHttpScheme() {
+ String securityEnabled = getEnvMap().get("xpack.security.enabled");
+ String httpSslEnabled = getEnvMap().get("xpack.security.http.ssl.enabled");
+
+ // Respect explicit user config
+ if ("false".equalsIgnoreCase(securityEnabled) || "false".equalsIgnoreCase(httpSslEnabled)) {
+ return "http";
+ }
+ if ("true".equalsIgnoreCase(httpSslEnabled)) {
+ return "https";
+ }
+
+ if (!isRunning()) {
+ throw new IllegalStateException(
+ "Cannot determine HTTP scheme: environment variables are not set and container is not running for curl probe"
+ );
+ }
+
+ ExecResult httpsResult = null;
+ ExecResult httpResult = null;
+ try {
+ // HTTPS probe: any HTTP response (200/401/403/...) => scheme is HTTPS.
+ // http_code == 000 means we didn't get an HTTP response (TLS/connect failure/timeout).
+ httpsResult =
+ execInContainer(
+ "curl",
+ "-sS",
+ "-k",
+ "--connect-timeout",
+ "2",
+ "--max-time",
+ "4",
+ "-o",
+ "/dev/null",
+ "-w",
+ "%{http_code}",
+ "https://localhost:" + ELASTICSEARCH_DEFAULT_PORT + "/"
+ );
+ if (httpsResult.getExitCode() == 0 && !"000".equals(httpsResult.getStdout().trim())) {
+ return "https";
+ }
+
+ // HTTP probe
+ httpResult =
+ execInContainer(
+ "curl",
+ "-sS",
+ "--connect-timeout",
+ "2",
+ "--max-time",
+ "4",
+ "-o",
+ "/dev/null",
+ "-w",
+ "%{http_code}",
+ "http://localhost:" + ELASTICSEARCH_DEFAULT_PORT + "/"
+ );
+ if (httpResult.getExitCode() == 0 && !"000".equals(httpResult.getStdout().trim())) {
+ return "http";
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to detect protocol via curl", e);
+ }
+
+ throw new RuntimeException(
+ String.format(
+ "Failed to detect protocol via curl. Both HTTPS and HTTP probes failed. " +
+ "HTTPS probe - exit code: %d, stdout: %s, stderr: %s; " +
+ "HTTP probe - exit code: %d, stdout: %s, stderr: %s",
+ httpsResult.getExitCode(),
+ httpsResult.getStdout(),
+ httpsResult.getStderr(),
+ httpResult.getExitCode(),
+ httpResult.getStdout(),
+ httpResult.getStderr()
+ )
+ );
+ }
+
+ // The TransportClient will be removed in Elasticsearch 8. No need to expose this port anymore in the future.
+ @Deprecated
public InetSocketAddress getTcpHost() {
return new InetSocketAddress(getHost(), getMappedPort(ELASTICSEARCH_DEFAULT_TCP_PORT));
}
diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
new file mode 100644
index 00000000000..ee8ce714854
--- /dev/null
+++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java
@@ -0,0 +1,669 @@
+package org.testcontainers.elasticsearch;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.ContainerNetwork;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.Base58;
+import org.testcontainers.utility.ComparableVersion;
+import org.testcontainers.utility.DockerImageName;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Testcontainers implementation for Kibana.
+ * Minimum supported version: {@value MINIMUM_SUPPORTED_VERSION}
+ *
+ * Supports two modes:
+ *
+ * - Managed mode: Kibana automatically connects to an {@link ElasticsearchContainer}.
+ * See KibanaContainerTest#managedModeCanStartAndReachElasticsearchInSameExplicitNetwork()
+ * - External mode: Kibana connects to an external Elasticsearch instance via URL.
+ * See KibanaContainerTest#externalModeCanWorkWithUsernamePassword()
+ *
+ *
+ */
+public class KibanaContainer extends GenericContainer {
+
+ private static final String ES_CA_CERT_PATH = "/usr/share/kibana/config/certs/es-ca.crt";
+
+ private static final Logger log = LoggerFactory.getLogger(KibanaContainer.class);
+
+ private static final int KIBANA_DEFAULT_PORT = 5601;
+
+ private static final String KIBANA_SYSTEM_USER = "kibana_system";
+
+ private static final String MINIMUM_SUPPORTED_VERSION = "8.0.0";
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker.elastic.co/kibana/kibana");
+
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+ private String encryptionKey;
+
+ private ElasticsearchContainer elasticsearch;
+
+ private String elasticsearchUrl;
+
+ private String elasticsearchUsername;
+
+ private String elasticsearchPassword;
+
+ private String elasticsearchServiceAccountToken;
+
+ private byte[] elasticsearchCaCertificate;
+
+ private Duration startupTimeout = Duration.ofSeconds(120);
+
+ /**
+ * If KibanaContainer creates an ad-hoc shared network (managed mode, neither container has an explicit network),
+ * it owns closing it.
+ */
+ private Network createdSharedNetwork;
+
+ /**
+ * Creates a KibanaContainer in managed mode.
+ * Kibana automatically connects to the provided Elasticsearch container.
+ *
+ * @param elasticsearch the Elasticsearch container to connect to
+ */
+ public KibanaContainer(ElasticsearchContainer elasticsearch) {
+ this(buildDockerImageName(elasticsearch));
+ this.elasticsearch = elasticsearch;
+ dependsOn(elasticsearch);
+ }
+
+ /**
+ * Creates a KibanaContainer in external mode.
+ * Use {@link #withElasticsearchUrl(String)} to configure the Elasticsearch connection. Use other methods to provide security credentials and such.
+ *
+ * @param dockerImageName the Docker image name
+ */
+ public KibanaContainer(String dockerImageName) {
+ this(DockerImageName.parse(dockerImageName));
+ }
+
+ /**
+ * Creates a KibanaContainer in external mode.
+ * Use {@link #withElasticsearchUrl(String)} to configure the Elasticsearch connection. Use other methods to provide security credentials and such.
+ *
+ * @param dockerImageName the Docker image name
+ */
+ public KibanaContainer(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ ensureCompatibleVersion(dockerImageName.getVersionPart());
+ dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+ this.encryptionKey = stableConfigKey(dockerImageName);
+
+ withExposedPorts(KIBANA_DEFAULT_PORT);
+ //we have to explicitly set wait the strategy later on in configure, once we know the security configuration
+ setWaitStrategy(null);
+ }
+
+ /**
+ * Sets the encryption key used for Kibana's encrypted saved objects.
+ * The key must be at least 32 characters. When not set, a deterministic default derived from
+ * the image name is used, which is required for {@link #withReuse(boolean)} to work correctly.
+ *
+ * @param encryptionKey the encryption key
+ * @return this container instance
+ */
+ public KibanaContainer withEncryptionKey(String encryptionKey) {
+ if (encryptionKey == null || encryptionKey.length() < 32) {
+ throw new IllegalArgumentException("Kibana encryption key must be at least 32 characters long");
+ }
+ this.encryptionKey = encryptionKey;
+ return this;
+ }
+
+ /**
+ * Enables or disables container reuse across JVM runs.
+ *
+ * Supported in external mode only. When Kibana is configured via
+ * {@link #withElasticsearchUrl(String)}, the container configuration is fully deterministic
+ * and TC can reliably locate the running container on subsequent runs.
+ *
+ *
Reuse is not supported in managed mode (i.e. when this container was created with
+ * an {@link ElasticsearchContainer}). Managed mode introduces several non-deterministic inputs
+ * into the container hash on every run (ad-hoc network ID, random network alias, fresh service
+ * account token), so TC always sees a different hash and starts a fresh container instead of
+ * reusing the existing one. This is a framework-level characteristic that affects any container
+ * connected via {@code withNetwork()} — not specific to {@code KibanaContainer}.
+ *
+ * @param reusable whether to enable container reuse
+ * @return this container instance
+ * @throws IllegalStateException if {@code reusable} is {@code true} and managed mode is active
+ */
+ @Override
+ public KibanaContainer withReuse(boolean reusable) {
+ if (reusable && elasticsearch != null) {
+ throw new IllegalStateException(
+ "withReuse(true) is not supported for KibanaContainer in managed mode. " +
+ "Use external mode (withElasticsearchUrl) to enable reuse."
+ );
+ }
+ return super.withReuse(reusable);
+ }
+
+ /**
+ * Configures the Elasticsearch URL for external mode.
+ *
+ * @param elasticsearchUrl the Elasticsearch URL (e.g., "https://my.fancy.setup.elastic.cloud:9200")
+ * @return this container instance
+ * @throws IllegalStateException if already using managed mode
+ */
+ public KibanaContainer withElasticsearchUrl(String elasticsearchUrl) {
+ if (elasticsearch != null) {
+ throw new IllegalStateException("Cannot set Elasticsearch URL when using Elasticsearch container");
+ }
+ this.elasticsearchUrl = elasticsearchUrl;
+ return this;
+ }
+
+ /**
+ * Configures Kibana to authenticate using the kibana_system user.
+ *
+ * @param password the password for the kibana_system user
+ * @return this container instance
+ */
+ public KibanaContainer withKibanaSystemPassword(String password) {
+ return withKibanaUsernameAndPassword(KIBANA_SYSTEM_USER, password);
+ }
+
+ /**
+ * Configures credentials Kibana will use for authentication.
+ *
+ * @param username the Elasticsearch username (cannot be 'elastic')
+ * @param password the password
+ * @return this container instance
+ * @throws IllegalStateException if a service account token is already configured
+ * @throws IllegalArgumentException if credentials are invalid
+ */
+ public KibanaContainer withKibanaUsernameAndPassword(String username, String password) {
+ if (elasticsearchServiceAccountToken != null) {
+ throw new IllegalStateException(
+ "Conflicting Elasticsearch credentials: provide either a service account token " +
+ "or a username/password pair, not both."
+ );
+ }
+ if (StringUtils.isAnyBlank(username, password)) {
+ throw new IllegalArgumentException("Kibana credentials cannot be blank");
+ }
+ if (!username.equals(username.trim()) || !password.equals(password.trim())) {
+ throw new IllegalArgumentException("Kibana credentials cannot have leading or trailing whitespace");
+ }
+ if ("elastic".equals(username)) {
+ throw new IllegalArgumentException("Username 'elastic' is reserved for internal use by Elasticsearch");
+ }
+
+ this.elasticsearchUsername = username;
+ this.elasticsearchPassword = password;
+ return this;
+ }
+
+ /**
+ * Configures a service account token for Elasticsearch authentication.
+ *
+ * @param token the service account token
+ * @return this container instance
+ * @throws IllegalStateException if username/password credentials are already configured
+ * @throws IllegalArgumentException if token is blank
+ */
+ public KibanaContainer withElasticsearchServiceAccountToken(String token) {
+ if (elasticsearchUsername != null) {
+ throw new IllegalStateException(
+ "Conflicting Elasticsearch credentials: provide either a service account token " +
+ "or a username/password pair, not both."
+ );
+ }
+ if (StringUtils.isBlank(token)) {
+ throw new IllegalArgumentException("Service account token cannot be empty");
+ }
+
+ if (!token.equals(token.trim())) {
+ throw new IllegalArgumentException("Service token cannot have leading or trailing whitespace");
+ }
+ this.elasticsearchServiceAccountToken = token;
+ return this;
+ }
+
+ /**
+ * Configures the Elasticsearch CA certificate for HTTPS connections.
+ *
+ * @param caCertificate the CA certificate in PEM format
+ * @return this container instance
+ * @throws IllegalArgumentException if certificate is empty
+ */
+ public KibanaContainer withElasticsearchCaCertificate(byte[] caCertificate) {
+ if (caCertificate == null || caCertificate.length == 0) {
+ throw new IllegalArgumentException("Elasticsearch CA certificate cannot be empty");
+ }
+ this.elasticsearchCaCertificate = caCertificate;
+ return this;
+ }
+
+ @Override
+ protected void configure() {
+ super.configure();
+
+ addEnv("XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY", encryptionKey);
+ addEnv("SERVER_NAME", "kibana");
+
+ if (elasticsearchCaCertificate != null) {
+ withCopyToContainer(Transferable.of(elasticsearchCaCertificate), ES_CA_CERT_PATH);
+ addEnv("ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES", ES_CA_CERT_PATH);
+ }
+ if (elasticsearch != null) {
+ configureManagedElasticsearch();
+ } else if (elasticsearchUrl != null) {
+ configureExternalElasticsearch();
+ } else {
+ throw new IllegalStateException(
+ "Elasticsearch must be configured either via constructor KibanaContainer(elasticsearch) " +
+ "or via .withElasticsearchUrl() for external Elasticsearch"
+ );
+ }
+ //wait strategy is set in configure, because we don't know the security configuration before
+ configureWaitStrategy();
+ }
+
+ @Override
+ protected void containerIsStarted(InspectContainerResponse containerInfo) {
+ super.containerIsStarted(containerInfo);
+ log.info("Kibana is now ready, it can be accessed at http://{}", getHttpHostAddress());
+ }
+
+ @Override
+ public void stop() {
+ super.stop();
+ if (createdSharedNetwork != null) {
+ try {
+ createdSharedNetwork.close();
+ } catch (Exception e) {
+ log.debug("Failed to close shared network", e);
+ } finally {
+ createdSharedNetwork = null;
+ }
+ }
+ }
+
+ @Override
+ public KibanaContainer withStartupTimeout(Duration startupTimeout) {
+ this.startupTimeout = startupTimeout;
+ return this;
+ }
+
+ private static DockerImageName buildDockerImageName(ElasticsearchContainer elasticsearch) {
+ String esVersion = DockerImageName.parse(elasticsearch.getDockerImageName()).getVersionPart();
+ ensureCompatibleVersion(esVersion);
+ return DEFAULT_IMAGE_NAME.withTag(esVersion);
+ }
+
+ private void configureExternalElasticsearch() {
+ addEnv("ELASTICSEARCH_HOSTS", elasticsearchUrl);
+ if (elasticsearchServiceAccountToken != null) {
+ addEnv("ELASTICSEARCH_SERVICEACCOUNTTOKEN", elasticsearchServiceAccountToken);
+ } else if (elasticsearchUsername != null && elasticsearchPassword != null) {
+ addEnv("ELASTICSEARCH_USERNAME", elasticsearchUsername);
+ addEnv("ELASTICSEARCH_PASSWORD", elasticsearchPassword);
+ } else {
+ log.info(
+ "No Elasticsearch credentials provided for external mode; Kibana will attempt to connect anonymously"
+ );
+ }
+ }
+
+ private void configureManagedElasticsearch() {
+ ensureCorrectNetworkSetupForManagedMode();
+
+ if (getNetwork() == null) {
+ createAdHocNetwork();
+ }
+
+ String protocol = elasticsearch.getHttpScheme();
+
+ String hosts = protocol + "://" + resolveExistingEsDnsNameOnNetwork(getNetwork()) + ":9200";
+ addEnv("ELASTICSEARCH_HOSTS", hosts);
+
+ if ("https".equals(protocol)) {
+ // In managed mode, if Elasticsearch uses HTTPS we must configure Kibana with the ES CA, unless provided by user
+ if (this.elasticsearchCaCertificate == null) {
+ byte[] ca = copyElasticsearchHttpCaCertificateOrThrow();
+
+ withCopyToContainer(Transferable.of(ca), ES_CA_CERT_PATH);
+ addEnv("ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES", ES_CA_CERT_PATH);
+ }
+ if (elasticsearch != null && !getEnvMap().containsKey("ELASTICSEARCH_SSL_VERIFICATIONMODE")) {
+ addEnv("ELASTICSEARCH_SSL_VERIFICATIONMODE", "certificate");
+ }
+ }
+
+ // Elasticsearch 8.x+ has the security enabled by default, so lack of the env var set to false means security is enabled
+ boolean securityDisabled = "false".equalsIgnoreCase(elasticsearch.getEnvMap().get("xpack.security.enabled"));
+
+ if (!securityDisabled) {
+ // Managed mode: authenticate Kibana -> Elasticsearch using a Kibana service account token.
+ // This avoids any password lifecycle management for kibana_system.
+ String token = createKibanaServiceAccountToken(protocol);
+ addEnv("ELASTICSEARCH_SERVICEACCOUNTTOKEN", token);
+ }
+ }
+
+ private byte[] copyElasticsearchHttpCaCertificateOrThrow() {
+ try {
+ return elasticsearch.copyFileFromContainer(elasticsearch.getCertPath(), IOUtils::toByteArray);
+ } catch (Exception e) {
+ throw new IllegalStateException(
+ "Failed to copy Elasticsearch HTTP CA certificate from '" +
+ elasticsearch.getCertPath() +
+ "'. " +
+ "In managed HTTPS mode, KibanaContainer requires access to the Elasticsearch HTTP CA.",
+ e
+ );
+ }
+ }
+
+ private void ensureCorrectNetworkSetupForManagedMode() {
+ Network esNetwork = elasticsearch.getNetwork();
+ Network kbNetwork = this.getNetwork();
+
+ if ((esNetwork == null) != (kbNetwork == null)) {
+ throw new IllegalStateException(
+ "Managed mode requires either both containers share the same explicit network, " +
+ "or neither specifies a network (KibanaContainer will create one). "
+ );
+ }
+
+ // Both explicit: must be same
+ if (esNetwork != kbNetwork) {
+ throw new IllegalStateException(
+ "Elasticsearch and Kibana have different networks configured. " +
+ "In managed mode both containers must share the same explicit network instance, " +
+ "or neither must define a network."
+ );
+ }
+ }
+
+ private void createAdHocNetwork() {
+ // Fully managed: create ad-hoc network and own it.
+ createdSharedNetwork = Network.newNetwork();
+ withNetwork(createdSharedNetwork);
+
+ // Managed-mode safety rule: by the time Kibana is configuring itself, Elasticsearch must already be
+ // started (via dependsOn)
+ String esId = requireElasticsearchContainerId();
+
+ // Elasticsearch is already created/started. Attach it to the ad-hoc network.
+ // We don't need to provide an explicit alias - we'll use the container name for DNS resolution.
+ // Equivalent of https://docs.docker.com/reference/cli/docker/network/connect/
+ connectRunningContainerToNetwork(esId, createdSharedNetwork);
+ }
+
+ private String resolveExistingEsDnsNameOnNetwork(Network network) {
+ String esId = requireElasticsearchContainerId();
+
+ InspectContainerResponse info = DockerClientFactory.instance().client().inspectContainerCmd(esId).exec();
+
+ Map networks = info.getNetworkSettings().getNetworks();
+ if (networks == null) {
+ throw new IllegalStateException("Elasticsearch container has no network configuration");
+ }
+
+ // Try to find the network endpoint - Docker may key by network name or ID
+ ContainerNetwork endpoint = findNetworkEndpoint(networks, network);
+ if (endpoint == null) {
+ throw new IllegalStateException(
+ "Elasticsearch container is not connected to the expected network. " +
+ "Ensure both containers use the same Network instance."
+ );
+ }
+
+ // Prefer user-defined network aliases (skip Testcontainers auto-generated tc-* aliases)
+ if (endpoint.getAliases() != null && !endpoint.getAliases().isEmpty()) {
+ for (String alias : endpoint.getAliases()) {
+ if (StringUtils.isNotBlank(alias)) {
+ String cleaned = alias.trim();
+ // Skip Testcontainers auto-generated aliases (tc-*), prefer user-defined ones
+ if (!cleaned.startsWith("tc-")) {
+ log.info("Using Elasticsearch network alias: {}", cleaned);
+ return cleaned;
+ }
+ }
+ }
+ }
+
+ // Fallback: use container name
+ String containerName = info.getName();
+ if (containerName != null && !containerName.trim().isEmpty()) {
+ String dnsName = containerName.replaceFirst("^/", "").trim();
+ log.info("No user-defined network alias found, using Elasticsearch container name: {}", dnsName);
+ return dnsName;
+ }
+
+ throw new IllegalStateException(
+ "Cannot determine Elasticsearch DNS name. " +
+ "When using a custom network, set a network alias on the Elasticsearch container."
+ );
+ }
+
+ private ContainerNetwork findNetworkEndpoint(Map networks, Network network) {
+ // Try network ID first
+ ContainerNetwork endpoint = networks.get(network.getId());
+ if (endpoint != null) {
+ return endpoint;
+ }
+
+ // Try network name as fallback (Docker may key by name instead of ID)
+ try {
+ String networkName = DockerClientFactory
+ .instance()
+ .client()
+ .inspectNetworkCmd()
+ .withNetworkId(network.getId())
+ .exec()
+ .getName();
+ if (networkName != null) {
+ return networks.get(networkName);
+ }
+ } catch (Exception e) {
+ // Ignore and return null
+ }
+
+ return null;
+ }
+
+ private String requireElasticsearchContainerId() {
+ String id = elasticsearch.getContainerId();
+ if (StringUtils.isBlank(id)) {
+ throw new IllegalStateException(
+ "Elasticsearch containerId is not available. In managed mode, Elasticsearch must be started via dependsOn(elasticsearch) " +
+ "before KibanaContainer is started."
+ );
+ }
+ return id.trim();
+ }
+
+ private void connectRunningContainerToNetwork(String containerId, Network network) {
+ String networkId = network.getId();
+
+ try {
+ DockerClientFactory
+ .instance()
+ .client()
+ .connectToNetworkCmd()
+ .withContainerId(containerId)
+ .withNetworkId(networkId)
+ .exec();
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to connect Elasticsearch container to ad-hoc shared network", e);
+ }
+ }
+
+ private static void ensureCompatibleVersion(String esVersion) {
+ ComparableVersion comparableVersion = new ComparableVersion(esVersion);
+ if (comparableVersion.isLessThan(MINIMUM_SUPPORTED_VERSION)) {
+ throw new IllegalArgumentException(
+ String.format(
+ "Kibana version %s is not supported. Minimum version is %s",
+ comparableVersion,
+ MINIMUM_SUPPORTED_VERSION
+ )
+ );
+ }
+ }
+
+ private String createKibanaServiceAccountToken(String protocol) {
+ if (elasticsearch == null) {
+ throw new IllegalStateException("Cannot create service account token in external mode");
+ }
+
+ String elasticPassword = elasticsearch
+ .getEnvMap()
+ .getOrDefault("ELASTIC_PASSWORD", ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD);
+
+ // Create a unique token name to avoid collisions if the same ES container is reused.
+ String tokenName = "tc-kibana-" + Base58.randomString(12);
+
+ String endpoint = protocol + "://localhost:9200/_security/service/elastic/kibana/credential/token/" + tokenName;
+
+ return Unreliables.retryUntilSuccess(
+ 45,
+ TimeUnit.SECONDS,
+ () -> {
+ String curlTlsArgs = "";
+ if ("https".equals(protocol)) {
+ // In managed HTTPS mode, use the Elasticsearch HTTP CA for curl.
+ curlTlsArgs = " --cacert '" + elasticsearch.getCertPath() + "'";
+ }
+
+ String curlCommand = String.format(
+ "curl -sS%s -u \"elastic:$1\" -H 'Content-Type: application/json' -X POST '%s'",
+ curlTlsArgs,
+ endpoint
+ );
+
+ Container.ExecResult result = elasticsearch.execInContainer(
+ "/bin/sh",
+ "-c",
+ curlCommand,
+ "sh",
+ elasticPassword
+ );
+
+ String stdout = (result.getStdout() == null) ? "" : result.getStdout();
+ String stderr = (result.getStderr() == null) ? "" : result.getStderr();
+
+ if (result.getExitCode() != 0) {
+ throw new RuntimeException(
+ "Failed to create Kibana service account token. Exit code: " +
+ result.getExitCode() +
+ ", stdout: " +
+ stdout +
+ ", stderr: " +
+ stderr
+ );
+ }
+
+ JsonNode json = OBJECT_MAPPER.readTree(stdout);
+ JsonNode value = json.path("token").path("value");
+ if (value.isTextual() && !value.asText().trim().isEmpty()) {
+ return value.asText().trim();
+ }
+
+ throw new RuntimeException("Service account token response did not contain token.value: " + stdout);
+ }
+ );
+ }
+
+ private static String stableConfigKey(DockerImageName imageName) {
+ // UUID v3 (name-based) gives a deterministic 32-character string from the image name,
+ // keeping xpack.encryptedSavedObjects.encryptionKey identical across JVM runs —
+ // a prerequisite for container reuse. Call withEncryptionKey() for real secret management.
+ return UUID
+ .nameUUIDFromBytes(imageName.asCanonicalNameString().getBytes(StandardCharsets.UTF_8))
+ .toString()
+ .replace("-", "");
+ }
+
+ /**
+ * Returns the HTTP host address for accessing Kibana.
+ *
+ * @return the host address in the format "host:port"
+ */
+ public String getHttpHostAddress() {
+ return getHost() + ":" + getMappedPort(KIBANA_DEFAULT_PORT);
+ }
+
+ private void configureWaitStrategy() {
+ if (this.getWaitStrategy() != null) {
+ // the user might have set a custom wait strategy
+ return;
+ }
+ HttpWaitStrategy strategy = Wait
+ .forHttp("/api/status")
+ .forPort(KIBANA_DEFAULT_PORT)
+ .forStatusCode(200)
+ .forResponsePredicate(this::isKibanaReady);
+
+ // Add authentication if we have Elasticsearch credentials available
+ String serviceToken = getEnvMap().get("ELASTICSEARCH_SERVICEACCOUNTTOKEN");
+ String username = getEnvMap().get("ELASTICSEARCH_USERNAME");
+ String password = getEnvMap().get("ELASTICSEARCH_PASSWORD");
+
+ if (serviceToken != null) {
+ strategy = strategy.withHeader("Authorization", "Bearer " + serviceToken);
+ } else if (username != null && password != null) {
+ strategy = strategy.withBasicCredentials(username, password);
+ }
+
+ setWaitStrategy(strategy.withStartupTimeout(this.startupTimeout));
+ }
+
+ private boolean isKibanaReady(String body) {
+ try {
+ JsonNode json = OBJECT_MAPPER.readTree(body);
+ JsonNode status = json.path("status");
+
+ String overallLevel = status.path("overall").path("level").asText(null);
+ String elasticsearchLevel = status.path("core").path("elasticsearch").path("level").asText(null);
+ String savedObjectsLevel = status.path("core").path("savedObjects").path("level").asText(null);
+
+ boolean overallAvailable = "available".equalsIgnoreCase(overallLevel);
+ boolean elasticsearchAvailable = "available".equalsIgnoreCase(elasticsearchLevel);
+ boolean savedObjectsAvailable = "available".equalsIgnoreCase(savedObjectsLevel);
+
+ boolean isReady = overallAvailable && elasticsearchAvailable && savedObjectsAvailable;
+
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "Kibana status check: READY={} (overall={}, elasticsearch={}, savedObjects={})",
+ isReady,
+ overallLevel,
+ elasticsearchLevel,
+ savedObjectsLevel
+ );
+ }
+
+ return isReady;
+ } catch (Exception e) {
+ log.debug("Kibana status check: FAILED to parse response - {}", e.getMessage());
+ return false;
+ }
+ }
+}
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
index 2b832f28a16..52cd78b4a34 100644
--- a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -16,13 +16,14 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.RemoteDockerImage;
+import org.testcontainers.images.builder.Transferable;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
@@ -33,7 +34,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
-public class ElasticsearchContainerTest {
+class ElasticsearchContainerTest {
/**
* Elasticsearch version which should be used for the Tests
@@ -58,7 +59,7 @@ public class ElasticsearchContainerTest {
private RestClient anonymousClient = null;
- @After
+ @AfterEach
public void stopRestClient() throws IOException {
if (client != null) {
client.close();
@@ -73,10 +74,10 @@ public void stopRestClient() throws IOException {
@SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
@Test
@Deprecated // We will remove this test in the future
- public void elasticsearchDeprecatedCtorTest() throws IOException {
+ void elasticsearchDeprecatedCtorTest() throws IOException {
// Create the elasticsearch container.
try (
- ElasticsearchContainer container = new ElasticsearchContainer().withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
+ ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
) {
// Start the container. This step might take some time...
container.start();
@@ -95,7 +96,7 @@ public void elasticsearchDeprecatedCtorTest() throws IOException {
}
@Test
- public void elasticsearchDefaultTest() throws IOException {
+ void elasticsearchDefaultTest() throws IOException {
// Create the elasticsearch container.
try (
ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
@@ -117,7 +118,7 @@ public void elasticsearchDefaultTest() throws IOException {
}
@Test
- public void elasticsearchSecuredTest() throws IOException {
+ void elasticsearchSecuredTest() throws IOException {
try (
ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
.withPassword(ELASTICSEARCH_PASSWORD)
@@ -137,7 +138,7 @@ public void elasticsearchSecuredTest() throws IOException {
}
@Test
- public void elasticsearchVersion() throws IOException {
+ void elasticsearchVersion() throws IOException {
try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
container.start();
Response response = getClient(container).performRequest(new Request("GET", "/"));
@@ -148,7 +149,7 @@ public void elasticsearchVersion() throws IOException {
}
@Test
- public void elasticsearchVersion83() throws IOException {
+ void elasticsearchVersion83() throws IOException {
try (
ElasticsearchContainer container = new ElasticsearchContainer(
"docker.elastic.co/elasticsearch/elasticsearch:8.3.0"
@@ -162,7 +163,7 @@ public void elasticsearchVersion83() throws IOException {
}
@Test
- public void elasticsearchOssImage() throws IOException {
+ void elasticsearchOssImage() throws IOException {
try (
// ossContainer {
ElasticsearchContainer container = new ElasticsearchContainer(
@@ -181,8 +182,8 @@ public void elasticsearchOssImage() throws IOException {
}
@Test
- public void restClientClusterHealth() throws IOException {
- // httpClientContainer {
+ void restClientClusterHealth() throws IOException {
+ // httpClientContainer7 {
// Create the elasticsearch container.
try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
// Start the container. This step might take some time...
@@ -207,13 +208,92 @@ public void restClientClusterHealth() throws IOException {
// }}
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
- // httpClientContainer {{
+ // httpClientContainer7 {{
}
// }
}
@Test
- public void restClientSecuredClusterHealth() throws IOException {
+ void restClientClusterHealthElasticsearch8() throws IOException {
+ // httpClientContainer8 {
+ // Create the elasticsearch container.
+ try (
+ ElasticsearchContainer container = new ElasticsearchContainer(
+ "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+ )
+ ) {
+ // Start the container. This step might take some time...
+ container.start();
+
+ // Do whatever you want with the rest client ...
+ final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(
+ AuthScope.ANY,
+ new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+ );
+
+ client =
+ RestClient
+ // use HTTPS for Elasticsearch 8
+ .builder(HttpHost.create("https://" + container.getHttpHostAddress()))
+ .setHttpClientConfigCallback(httpClientBuilder -> {
+ httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+ // SSL is activated by default in Elasticsearch 8
+ httpClientBuilder.setSSLContext(container.createSslContextFromCa());
+ return httpClientBuilder;
+ })
+ .build();
+
+ Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+ // }}
+ assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+ assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
+ // httpClientContainer8 {{
+ }
+ // }
+ }
+
+ @Test
+ void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException {
+ // httpClientContainerNoSSL8 {
+ // Create the elasticsearch container.
+ try (
+ ElasticsearchContainer container = new ElasticsearchContainer(
+ "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+ )
+ // disable SSL
+ .withEnv("xpack.security.transport.ssl.enabled", "false")
+ .withEnv("xpack.security.http.ssl.enabled", "false")
+ ) {
+ // Start the container. This step might take some time...
+ container.start();
+
+ // Do whatever you want with the rest client ...
+ final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(
+ AuthScope.ANY,
+ new UsernamePasswordCredentials(ELASTICSEARCH_USERNAME, ELASTICSEARCH_PASSWORD)
+ );
+
+ client =
+ RestClient
+ .builder(HttpHost.create(container.getHttpHostAddress()))
+ .setHttpClientConfigCallback(httpClientBuilder -> {
+ return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+ })
+ .build();
+
+ Response response = client.performRequest(new Request("GET", "/_cluster/health"));
+ // }}
+ assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+ assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
+ // httpClientContainerNoSSL8 {{
+ }
+ // }
+ }
+
+ @Test
+ void restClientSecuredClusterHealth() throws IOException {
// httpClientSecuredContainer {
// Create the elasticsearch container.
try (
@@ -250,7 +330,7 @@ public void restClientSecuredClusterHealth() throws IOException {
@SuppressWarnings("deprecation") // The TransportClient will be removed in Elasticsearch 8.
@Test
- public void transportClientClusterHealth() {
+ void transportClientClusterHealth() {
// transportClientContainer {
// Create the elasticsearch container.
try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
@@ -276,7 +356,7 @@ public void transportClientClusterHealth() {
}
@Test
- public void incompatibleSettingsTest() {
+ void incompatibleSettingsTest() {
// The OSS image can not use security feature
assertThat(
catchThrowable(() -> {
@@ -289,21 +369,7 @@ public void incompatibleSettingsTest() {
}
@Test
- public void testElasticsearch8SecureByDefault() throws Exception {
- try (
- ElasticsearchContainer container = new ElasticsearchContainer(
- "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
- )
- ) {
- // Start the container. This step might take some time...
- container.start();
-
- assertClusterHealthResponse(container);
- }
- }
-
- @Test
- public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
+ void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
try (ElasticsearchContainer container = new ElasticsearchContainer("elasticsearch:8.1.2")) {
container.start();
@@ -312,7 +378,7 @@ public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
}
@Test
- public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
+ void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
final MountableFile mountableFile = MountableFile.forClasspathResource("http_ca.crt");
String caPath = "/tmp/http_ca.crt";
try (
@@ -334,7 +400,7 @@ public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exceptio
}
@Test
- public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
+ void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
final HttpWaitStrategy httpsWaitStrategy = Wait
.forHttps("/")
.forPort(9200)
@@ -357,7 +423,7 @@ public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception
}
@Test
- public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
+ void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
// this test exists for custom images by users that use the `latest` tag
// even though the version might be older than version 8
// this tags an old 7.x version as :latest
@@ -376,7 +442,50 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
}
@Test
- public void testElasticsearchDefaultMaxHeapSize() throws Exception {
+ void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Exception {
+ String customizedCertPath = "/usr/share/elasticsearch/config/certs/http_ca_customized.crt";
+ try (
+ ElasticsearchContainer container = new ElasticsearchContainer(
+ "docker.elastic.co/elasticsearch/elasticsearch:7.17.15"
+ )
+ .withPassword(ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD)
+ .withEnv("xpack.security.enabled", "true")
+ .withEnv("xpack.security.http.ssl.enabled", "true")
+ .withEnv("xpack.security.http.ssl.key", "/usr/share/elasticsearch/config/certs/elasticsearch.key")
+ .withEnv(
+ "xpack.security.http.ssl.certificate",
+ "/usr/share/elasticsearch/config/certs/elasticsearch.crt"
+ )
+ .withEnv("xpack.security.http.ssl.certificate_authorities", customizedCertPath)
+ // these lines show how certificates can be created self-made way
+ // obviously this shouldn't be done in prod environment, where proper and officially signed keys should be present
+ .withCopyToContainer(
+ Transferable.of(
+ "#!/bin/bash\n" +
+ "mkdir -p /usr/share/elasticsearch/config/certs;" +
+ "openssl req -x509 -newkey rsa:4096 -keyout /usr/share/elasticsearch/config/certs/elasticsearch.key -out /usr/share/elasticsearch/config/certs/elasticsearch.crt -days 365 -nodes -subj \"/CN=localhost\";" +
+ "openssl x509 -outform der -in /usr/share/elasticsearch/config/certs/elasticsearch.crt -out " +
+ customizedCertPath +
+ "; chown -R elasticsearch /usr/share/elasticsearch/config/certs/",
+ 555
+ ),
+ "/usr/share/elasticsearch/generate-certs.sh"
+ )
+ // because we need to generate the certificates before Elasticsearch starts, the entry command has to be tuned accordingly
+ .withCommand(
+ "sh",
+ "-c",
+ "/usr/share/elasticsearch/generate-certs.sh && /usr/local/bin/docker-entrypoint.sh"
+ )
+ .withCertPath(customizedCertPath)
+ ) {
+ container.start();
+ assertClusterHealthResponse(container);
+ }
+ }
+
+ @Test
+ void testElasticsearchDefaultMaxHeapSize() throws Exception {
long defaultHeapSize = 2147483648L;
try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
@@ -386,7 +495,7 @@ public void testElasticsearchDefaultMaxHeapSize() throws Exception {
}
@Test
- public void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exception {
+ void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exception {
long customHeapSize = 1574961152;
try (
@@ -399,7 +508,7 @@ public void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exc
}
@Test
- public void testElasticsearchCustomMaxHeapSizeInJvmOptionsFile() throws Exception {
+ void testElasticsearchCustomMaxHeapSizeInJvmOptionsFile() throws Exception {
long customHeapSize = 1574961152;
try (
@@ -493,4 +602,37 @@ private void assertClusterHealthResponse(ElasticsearchContainer container) throw
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
assertThat(EntityUtils.toString(response.getEntity())).contains("cluster_name");
}
+
+ @Test
+ void testGetHttpSchemeForElasticsearch7ReturnsHttp() {
+ try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
+ container.start();
+ assertThat(container.getHttpScheme()).isEqualTo("http");
+ }
+ }
+
+ @Test
+ void testGetHttpSchemeForElasticsearch8ReturnsHttps() {
+ try (
+ ElasticsearchContainer container = new ElasticsearchContainer(
+ "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+ )
+ ) {
+ container.start();
+ assertThat(container.getHttpScheme()).isEqualTo("https");
+ }
+ }
+
+ @Test
+ void testGetHttpSchemeForElasticsearch8WithSslDisabledReturnsHttp() {
+ try (
+ ElasticsearchContainer container = new ElasticsearchContainer(
+ "docker.elastic.co/elasticsearch/elasticsearch:8.1.2"
+ )
+ .withEnv("xpack.security.http.ssl.enabled", "false")
+ ) {
+ container.start();
+ assertThat(container.getHttpScheme()).isEqualTo("http");
+ }
+ }
}
diff --git a/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java
new file mode 100644
index 00000000000..0099b5613ca
--- /dev/null
+++ b/modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java
@@ -0,0 +1,515 @@
+package org.testcontainers.elasticsearch;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.assertj.core.api.Assertions;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.Testcontainers;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+class KibanaContainerTest {
+
+ public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+ private static final String ES_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch:9.2.4";
+
+ @Test
+ void cannotCreateKibanaContainerForVersionLessThan8() {
+ Assertions
+ .assertThatThrownBy(() -> new KibanaContainer("docker.elastic.co/kibana/kibana:7.17.29"))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessageContaining("is not supported");
+ }
+
+ @Test
+ void managedModeCanStartAndReachElasticsearchInSameExplicitNetwork() throws IOException {
+ // managedModeCanStartAndReachElasticsearchInSameExplicitNetwork {
+ try (
+ Network network = Network.newNetwork();
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withNetwork(network);
+ KibanaContainer kibana = new KibanaContainer(es).withNetwork(network)
+ ) {
+ es.start();
+ kibana.start();
+
+ String status = getKibanaStatus(kibana);
+ Assertions.assertThat(status).isEqualTo("available");
+ }
+ // }
+ }
+
+ @Test
+ void managedModeCannotStartWithOnlyESNetworkExplicit() {
+ Network network = Network.newNetwork();
+ try (
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withNetwork(network);
+ KibanaContainer kibana = new KibanaContainer(es)
+ ) {
+ Assertions
+ .assertThatThrownBy(kibana::start)
+ .isInstanceOf(ContainerLaunchException.class)
+ .satisfies(ex -> {
+ Assertions
+ .assertThat(ex.getCause())
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("explicit network");
+ });
+ }
+ }
+
+ @Test
+ void managedModeCannotStartWithDifferentExplicitNetworks() {
+ try (
+ Network esNetwork = Network.newNetwork();
+ Network kibanaNetwork = Network.newNetwork();
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withNetwork(esNetwork);
+ KibanaContainer kibana = new KibanaContainer(es).withNetwork(kibanaNetwork)
+ ) {
+ Assertions
+ .assertThatThrownBy(kibana::start)
+ .isInstanceOf(ContainerLaunchException.class)
+ .satisfies(ex -> {
+ Assertions
+ .assertThat(ex.getCause())
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("different networks");
+ });
+ }
+ }
+
+ @Test
+ void managedModeUsesCustomNetworkAliasInExplicitNetwork() throws Exception {
+ final String customEsAlias = "my-custom-es-alias";
+
+ try (
+ Network network = Network.newNetwork();
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+ .withNetwork(network)
+ .withNetworkAliases(customEsAlias);
+ KibanaContainer kibana = new KibanaContainer(es).withNetwork(network)
+ ) {
+ kibana.start();
+
+ Assertions.assertThat(kibana.isRunning()).isTrue();
+
+ // Verify Kibana uses the custom alias (not auto-generated tc-* alias)
+ Container.ExecResult result = kibana.execInContainer("sh", "-c", "env | grep ELASTICSEARCH_HOSTS");
+
+ Assertions.assertThat(result.getStdout()).contains(customEsAlias).contains(":9200");
+ }
+ }
+
+ @Test
+ void managedModeCanStartAndReachElasticsearchWithoutExplicitNetwork() throws IOException {
+ try (
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE);
+ KibanaContainer kibana = new KibanaContainer(es)
+ ) {
+ kibana.start();
+
+ String status = getKibanaStatus(kibana);
+ Assertions.assertThat(status).isEqualTo("available");
+ }
+ }
+
+ @Test
+ void managedModeCanStartWithoutElasticsearchSecurity() throws IOException {
+ try (
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE).withEnv("xpack.security.enabled", "false");
+ KibanaContainer kibana = new KibanaContainer(es)
+ ) {
+ kibana.start();
+
+ String status = getKibanaStatus(kibana);
+ Assertions.assertThat(status).isEqualTo("available");
+ }
+ }
+
+ @Test
+ void managedModeCanStartWithoutElasticsearchHttps() throws IOException {
+ try (
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+ .withEnv("xpack.security.enabled", "true")
+ .withEnv("xpack.security.http.ssl.enabled", "false");
+ KibanaContainer kibana = new KibanaContainer(es)
+ ) {
+ es.start();
+ kibana.start();
+
+ String status = getKibanaStatus(kibana);
+ Assertions.assertThat(status).isEqualTo("available");
+ }
+ }
+
+ @Test
+ void externalModeFailsWithConflictingCredentials() {
+ Assertions
+ .assertThatThrownBy(() -> {
+ new KibanaContainer("docker.elastic.co/kibana/kibana:8.0.0")
+ .withKibanaUsernameAndPassword("user", "pass")
+ .withElasticsearchServiceAccountToken("token");
+ })
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Conflicting Elasticsearch credentials");
+ }
+
+ @Test
+ void managedModeFailsWhenSettingElasticsearchUrl() {
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE);
+ Assertions
+ .assertThatThrownBy(() -> {
+ new KibanaContainer(es).withElasticsearchUrl("http://somewhere.over.the.rainbow:9200");
+ })
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Cannot set Elasticsearch URL when using Elasticsearch container");
+ }
+
+ @Test
+ void failsWhenNoElasticsearchConfigured() {
+ try (KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:8.0.0")) {
+ Assertions
+ .assertThatThrownBy(kibana::start)
+ .isInstanceOf(ContainerLaunchException.class)
+ .satisfies(ex -> {
+ Assertions
+ .assertThat(ex.getCause())
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Elasticsearch must be configured");
+ });
+ }
+ }
+
+ @Test
+ void externalModeCanWorkWithUsernamePassword() throws IOException, InterruptedException {
+ final String esHostname = "elasticsearch";
+
+ // externalModeCanWorkWithUsernamePassword {
+ try (
+ Network network = Network.newNetwork();
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+ .withNetwork(network)
+ .withNetworkAliases(esHostname)
+ .withEnv("xpack.security.http.ssl.enabled", "false")
+ ) {
+ es.start();
+ String kibanaSystemPassword = setKibanaSystemPassword(es);
+
+ try (
+ KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:9.2.2") //this minor version is intentionally below ES version
+ .withNetwork(network)
+ .withElasticsearchUrl("http://" + esHostname + ":9200")
+ .withKibanaSystemPassword(kibanaSystemPassword)
+ ) {
+ kibana.start();
+ String status = getKibanaStatus(kibana);
+ Assertions.assertThat(status).isEqualTo("available");
+ }
+ }
+ // }
+ }
+
+ @Test
+ void externalModeCanWorkWithoutCredentials() throws IOException {
+ final String esHostname = "elasticsearch";
+
+ try (
+ Network network = Network.newNetwork();
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+ .withNetwork(network)
+ .withNetworkAliases(esHostname)
+ .withEnv("xpack.security.enabled", "false")
+ .withEnv("xpack.security.http.ssl.enabled", "false");
+ KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:9.2.4")
+ .withNetwork(network)
+ .withElasticsearchUrl("http://" + esHostname + ":9200")
+ ) {
+ es.start();
+ kibana.start();
+ String status = getKibanaStatus(kibana);
+ Assertions.assertThat(status).isEqualTo("available");
+ }
+ }
+
+ @Test
+ void externalModeCanStartAndReachElasticsearchWithCertAndServiceToken() throws Exception {
+ byte[] caCrt;
+ byte[] nodeCrt;
+ byte[] nodeKey;
+
+ String esHostname = "elasticsearch";
+
+ String instancesYml =
+ "instances:\n" +
+ " - name: es01\n" +
+ " dns: [ \"localhost\", \"" +
+ esHostname +
+ "\", \"es01\" ]\n" +
+ " ip: [ \"127.0.0.1\" ]\n";
+
+ try (
+ ElasticsearchContainer setup = new ElasticsearchContainer(ES_IMAGE)
+ .withEnv("discovery.type", "single-node")
+ .withCopyToContainer(
+ Transferable.of(instancesYml.getBytes(StandardCharsets.UTF_8), 0644),
+ "/tmp/instances.yml"
+ )
+ ) {
+ setup.start();
+
+ // Run certutil inside the running container and write outputs inside the container FS
+ Container.ExecResult execResult = setup.execInContainer(
+ "bash",
+ "-lc",
+ "set -euo pipefail && " +
+ "mkdir -p /tmp/out && " +
+ "cd /usr/share/elasticsearch && " +
+ "bin/elasticsearch-certutil ca --silent --pem --out /tmp/out/ca.zip && " +
+ "unzip -o /tmp/out/ca.zip -d /tmp/out && " +
+ "bin/elasticsearch-certutil cert --silent --pem --in /tmp/instances.yml --ca-cert /tmp/out/ca/ca.crt --ca-key /tmp/out/ca/ca.key --out /tmp/out/certs.zip && " +
+ "unzip -o /tmp/out/certs.zip -d /tmp/out"
+ );
+ Assertions.assertThat(execResult.getExitCode()).isEqualTo(0);
+
+ // copy the certificates and key from the container, so we can use them later
+ caCrt = setup.copyFileFromContainer("/tmp/out/ca/ca.crt", IOUtils::toByteArray);
+ nodeCrt = setup.copyFileFromContainer("/tmp/out/es01/es01.crt", IOUtils::toByteArray);
+ nodeKey = setup.copyFileFromContainer("/tmp/out/es01/es01.key", IOUtils::toByteArray);
+ }
+
+ try (
+ Network network = Network.newNetwork();
+ ElasticsearchContainer es = new ElasticsearchContainer(
+ "docker.elastic.co/elasticsearch/elasticsearch:9.2.4"
+ )
+ .withNetwork(network)
+ .withNetworkAliases(esHostname)
+ ) {
+ applyTls(es, caCrt, nodeCrt, nodeKey);
+ es.start();
+ String kibanaServiceAccountToken = createKibanaServiceAccountToken(es);
+
+ try (
+ KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:9.2.4")
+ // network is needed only because the ES we try to access via explicit mode is operated by non-public Docker
+ .withNetwork(network)
+ .withElasticsearchUrl("https://" + esHostname + ":9200")
+ .withElasticsearchServiceAccountToken(kibanaServiceAccountToken)
+ .withElasticsearchCaCertificate(es.caCertAsBytes().get())
+ ) {
+ kibana.start();
+ String status = getKibanaStatus(kibana);
+ Assertions.assertThat(status).isEqualTo("available");
+ }
+ }
+ }
+
+ private static String setKibanaSystemPassword(ElasticsearchContainer elasticsearch) throws IOException {
+ String kibanaPassword = "kibana-system-" + System.currentTimeMillis();
+
+ try (CloseableHttpClient httpClient = createHttpClient(elasticsearch)) {
+ String url = String.format(
+ "%s://%s/_security/user/kibana_system/_password",
+ elasticsearch.getHttpScheme(),
+ elasticsearch.getHttpHostAddress()
+ );
+ HttpPost request = new HttpPost(url);
+ request.setHeader("Content-Type", "application/json");
+ request.setEntity(new StringEntity("{\"password\":\"" + kibanaPassword + "\"}"));
+
+ HttpResponse response = httpClient.execute(request);
+ int statusCode = response.getStatusLine().getStatusCode();
+ String body = EntityUtils.toString(response.getEntity());
+
+ if (statusCode != 200) {
+ throw new IllegalStateException(
+ "Failed to set kibana_system password. HTTP " + statusCode + ", body=" + body
+ );
+ }
+
+ // ES 9.x returns {} on success; older versions may return {"acknowledged":true}
+ // Just validate that the body is valid JSON.
+ try {
+ OBJECT_MAPPER.readTree(body.isEmpty() ? "{}" : body);
+ } catch (IOException e) {
+ throw new IllegalStateException("Non-JSON response body: " + body, e);
+ }
+
+ return kibanaPassword;
+ }
+ }
+
+ private static String createKibanaServiceAccountToken(ElasticsearchContainer elasticsearch) throws IOException {
+ String tokenName = "kibana-token-" + System.currentTimeMillis();
+
+ try (CloseableHttpClient httpClient = createHttpClient(elasticsearch)) {
+ String url = String.format(
+ "%s://%s/_security/service/elastic/kibana/credential/token/%s",
+ elasticsearch.getHttpScheme(),
+ elasticsearch.getHttpHostAddress(),
+ tokenName
+ );
+ HttpPost request = new HttpPost(url);
+ request.setHeader("Content-Type", "application/json");
+
+ HttpResponse response = httpClient.execute(request);
+ int statusCode = response.getStatusLine().getStatusCode();
+ String body = EntityUtils.toString(response.getEntity());
+
+ if (statusCode != 200) {
+ throw new IllegalStateException(
+ "Failed to create Kibana service account token. HTTP " + statusCode + ", body=" + body
+ );
+ }
+
+ // Expected JSON:
+ // {"created":true,"token":{"name":"...","value":"AAEAA..."}}
+ try {
+ JsonNode root = OBJECT_MAPPER.readTree(body);
+ JsonNode tokenValue = root.path("token").path("value");
+
+ if (tokenValue.isMissingNode() || tokenValue.isNull()) {
+ throw new IllegalStateException("Token value not found in response: " + body);
+ }
+
+ return tokenValue.asText();
+ } catch (IOException e) {
+ throw new IllegalStateException("Failed to parse token response: " + body, e);
+ }
+ }
+ }
+
+ private static CloseableHttpClient createHttpClient(ElasticsearchContainer elasticsearch) {
+ String elasticPassword = elasticsearch.getEnvMap().get("ELASTIC_PASSWORD");
+ HttpClientBuilder clientBuilder = HttpClientBuilder.create();
+
+ if (StringUtils.isNotBlank(elasticPassword)) {
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(
+ AuthScope.ANY,
+ new UsernamePasswordCredentials("elastic", elasticPassword)
+ );
+ clientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+ }
+
+ String scheme = elasticsearch.getHttpScheme();
+ if ("https".equals(scheme)) {
+ SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(
+ elasticsearch.createSslContextFromCa()
+ );
+ clientBuilder.setSSLSocketFactory(sslSocketFactory);
+ }
+
+ return clientBuilder.build();
+ }
+
+ private static String getKibanaStatus(KibanaContainer kibana) throws IOException {
+ try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
+ String url = "http://" + kibana.getHttpHostAddress() + "/api/status";
+ HttpResponse response = httpClient.execute(new org.apache.http.client.methods.HttpGet(url));
+ int statusCode = response.getStatusLine().getStatusCode();
+ String body = EntityUtils.toString(response.getEntity());
+
+ if (statusCode != 200) {
+ throw new IllegalStateException("Failed to get Kibana status. HTTP " + statusCode + ", body=" + body);
+ }
+
+ JsonNode json = OBJECT_MAPPER.readTree(body);
+ String status = json.path("status").path("overall").path("level").asText(null);
+ if (status == null) {
+ throw new IllegalStateException("Kibana status response missing 'status.overall.level' field: " + body);
+ }
+ return status;
+ }
+ }
+
+ @Test
+ void withReuseShouldReuseTheSameContainer() {
+ Assumptions
+ .assumeThat(TestcontainersConfiguration.getInstance().environmentSupportsReuse())
+ .as("testcontainers.reuse.enable must be true")
+ .isTrue();
+
+ final String kibanaImage = "docker.elastic.co/kibana/kibana:9.2.4";
+
+ // Testcontainers.exposeHostPorts + host.testcontainers.internal lets Kibana reach ES
+ // from inside the container on any platform (Linux Docker Engine included).
+ // No withNetwork() on Kibana keeps the hash fully deterministic:
+ // - no dynamic network ID
+ // - the random tc-* alias added by GenericContainer's constructor is only serialised
+ // into the CreateContainerCmd when withNetwork() has been called, so it is absent here
+ // The host.testcontainers.internal extra-host IP is the same for kibana1 and kibana2
+ // because they start in the same JVM (same PortForwardingContainer instance).
+ // The first Kibana container must stay running while the second one starts, because
+ // withReuse(true) only skips JVM-shutdown cleanup — an explicit stop() still removes the
+ // container, so there would be nothing to find.
+ try (
+ ElasticsearchContainer es = new ElasticsearchContainer(ES_IMAGE)
+ .withEnv("xpack.security.enabled", "false")
+ .withEnv("xpack.security.http.ssl.enabled", "false")
+ ) {
+ es.start();
+ int esMappedPort = es.getMappedPort(9200);
+ Testcontainers.exposeHostPorts(esMappedPort);
+ String esUrl = "http://" + GenericContainer.INTERNAL_HOST_HOSTNAME + ":" + esMappedPort;
+
+ KibanaContainer kibana1 = new KibanaContainer(kibanaImage).withElasticsearchUrl(esUrl).withReuse(true);
+ KibanaContainer kibana2 = new KibanaContainer(kibanaImage).withElasticsearchUrl(esUrl).withReuse(true);
+
+ try {
+ kibana1.start();
+ // kibana2 is started while kibana1 is still running; the reuse mechanism should
+ // find kibana1's container by hash and return the same container ID.
+ kibana2.start();
+
+ Assertions
+ .assertThat(kibana2.getContainerId())
+ .as("KibanaContainer with withReuse(true) should reuse the same container on subsequent starts")
+ .isEqualTo(kibana1.getContainerId());
+ } finally {
+ kibana1.stop();
+ kibana2.stop();
+ }
+ }
+ }
+
+ private static void applyTls(ElasticsearchContainer c, byte[] caCrt, byte[] nodeCrt, byte[] nodeKey) {
+ final String certDir = "/usr/share/elasticsearch/config/certs";
+
+ // Copy provided materials
+ c.withCopyToContainer(Transferable.of(caCrt, 0644), certDir + "/http_ca.crt");
+ c.withCopyToContainer(Transferable.of(nodeCrt, 0644), certDir + "/http.crt");
+ c.withCopyToContainer(Transferable.of(nodeKey, 0644), certDir + "/http.key");
+
+ // Disable ES bootstrap TLS autoconfiguration
+ c.withEnv("xpack.security.autoconfiguration.enabled", "false");
+ c.withEnv("xpack.security.enabled", "true");
+
+ // Configure ONLY HTTP TLS using exactly the provided files
+ c.withEnv("xpack.security.http.ssl.enabled", "true");
+ c.withEnv("xpack.security.http.ssl.certificate_authorities", "certs/http_ca.crt");
+ c.withEnv("xpack.security.http.ssl.certificate", "certs/http.crt");
+ c.withEnv("xpack.security.http.ssl.key", "certs/http.key");
+ }
+}
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
index 30f74c94b70..3a020bdb759 100644
--- a/modules/gcloud/build.gradle
+++ b/modules/gcloud/build.gradle
@@ -3,12 +3,11 @@ description = "Testcontainers :: GCloud"
dependencies {
api project(':testcontainers')
- testImplementation platform("com.google.cloud:libraries-bom:26.30.0")
+ testImplementation platform("com.google.cloud:libraries-bom:26.84.0")
testImplementation 'com.google.cloud:google-cloud-bigquery'
testImplementation 'com.google.cloud:google-cloud-datastore'
testImplementation 'com.google.cloud:google-cloud-firestore'
testImplementation 'com.google.cloud:google-cloud-pubsub'
testImplementation 'com.google.cloud:google-cloud-spanner'
testImplementation 'com.google.cloud:google-cloud-bigtable'
- testImplementation 'org.assertj:assertj-core:3.25.1'
}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
index 6c305a50537..6590c6cab5b 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigQueryEmulatorContainer.java
@@ -7,7 +7,10 @@
*
* Supported image: {@code ghcr.io/goccy/bigquery-emulator}
*
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.BigQueryEmulatorContainer} instead.
*/
+@Deprecated
public class BigQueryEmulatorContainer extends GenericContainer {
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/goccy/bigquery-emulator");
@@ -33,6 +36,10 @@ public String getEmulatorHttpEndpoint() {
return String.format("http://%s:%d", getHost(), getMappedPort(HTTP_PORT));
}
+ public Integer getEmulatorGrpcPort() {
+ return getMappedPort(GRPC_PORT);
+ }
+
public String getProjectId() {
return PROJECT_ID;
}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
index 0325b58e745..288cd499e37 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/BigtableEmulatorContainer.java
@@ -1,6 +1,6 @@
package org.testcontainers.containers;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.DockerImageName;
/**
@@ -9,7 +9,10 @@
* Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
*
* Default port is 9000.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.BigtableEmulatorContainer} instead.
*/
+@Deprecated
public class BigtableEmulatorContainer extends GenericContainer {
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
@@ -33,7 +36,7 @@ public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
withExposedPorts(PORT);
- setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*running.*$"));
+ setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
withCommand("/bin/sh", "-c", CMD);
}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
index eb86fa3932f..cbe27e303f4 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/DatastoreEmulatorContainer.java
@@ -9,7 +9,10 @@
* Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
*
* Default port is 8081.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.DatastoreEmulatorContainer} instead.
*/
+@Deprecated
public class DatastoreEmulatorContainer extends GenericContainer {
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
index 1d3ec4a01d1..3c8d12f82ad 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/FirestoreEmulatorContainer.java
@@ -1,6 +1,6 @@
package org.testcontainers.containers;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.DockerImageName;
/**
@@ -9,7 +9,10 @@
* Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
*
* Default port is 8080.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.FirestoreEmulatorContainer} instead.
*/
+@Deprecated
public class FirestoreEmulatorContainer extends GenericContainer {
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
@@ -24,6 +27,8 @@ public class FirestoreEmulatorContainer extends GenericContainer
* Default port is 8085.
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.PubSubEmulatorContainer} instead.
*/
+@Deprecated
public class PubSubEmulatorContainer extends GenericContainer {
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
@@ -33,7 +36,7 @@ public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
withExposedPorts(8085);
- setWaitStrategy(new LogMessageWaitStrategy().withRegEx("(?s).*started.*$"));
+ setWaitStrategy(Wait.forLogMessage(".*started.*$", 1));
withCommand("/bin/sh", "-c", CMD);
}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
index ff36bddd1b2..76a95d4c4ac 100644
--- a/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
+++ b/modules/gcloud/src/main/java/org/testcontainers/containers/SpannerEmulatorContainer.java
@@ -1,13 +1,16 @@
package org.testcontainers.containers;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.DockerImageName;
/**
* A Spanner container. Default ports: 9010 for GRPC and 9020 for HTTP.
*
* Supported image: {@code gcr.io/cloud-spanner-emulator/emulator}
+ *
+ * @deprecated use {@link org.testcontainers.gcloud.SpannerEmulatorContainer} instead.
*/
+@Deprecated
public class SpannerEmulatorContainer extends GenericContainer {
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
@@ -27,7 +30,7 @@ public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
withExposedPorts(GRPC_PORT, HTTP_PORT);
- setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Cloud Spanner emulator running\\..*"));
+ setWaitStrategy(Wait.forLogMessage(".*Cloud Spanner emulator running\\..*", 1));
}
/**
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigQueryEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigQueryEmulatorContainer.java
new file mode 100644
index 00000000000..b5d00bf374a
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigQueryEmulatorContainer.java
@@ -0,0 +1,44 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for BigQuery.
+ *
+ * Supported image: {@code ghcr.io/goccy/bigquery-emulator}
+ *
+ */
+public class BigQueryEmulatorContainer extends GenericContainer {
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/goccy/bigquery-emulator");
+
+ private static final int HTTP_PORT = 9050;
+
+ private static final int GRPC_PORT = 9060;
+
+ private static final String PROJECT_ID = "test-project";
+
+ public BigQueryEmulatorContainer(String image) {
+ this(DockerImageName.parse(image));
+ }
+
+ public BigQueryEmulatorContainer(DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+ addExposedPorts(HTTP_PORT, GRPC_PORT);
+ withCommand("--project", PROJECT_ID);
+ }
+
+ public String getEmulatorHttpEndpoint() {
+ return String.format("http://%s:%d", getHost(), getMappedPort(HTTP_PORT));
+ }
+
+ public Integer getEmulatorGrpcPort() {
+ return getMappedPort(GRPC_PORT);
+ }
+
+ public String getProjectId() {
+ return PROJECT_ID;
+ }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigtableEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigtableEmulatorContainer.java
new file mode 100644
index 00000000000..b1e62ae0aa1
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/BigtableEmulatorContainer.java
@@ -0,0 +1,53 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Bigtable container that relies in google cloud sdk.
+ *
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ *
+ * Default port is 9000.
+ */
+public class BigtableEmulatorContainer extends GenericContainer {
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+ );
+
+ private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/cloud-sdk"
+ );
+
+ private static final String CMD = "gcloud beta emulators bigtable start --host-port 0.0.0.0:9000";
+
+ private static final int PORT = 9000;
+
+ public BigtableEmulatorContainer(String image) {
+ this(DockerImageName.parse(image));
+ }
+
+ public BigtableEmulatorContainer(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+ withExposedPorts(PORT);
+ setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
+ withCommand("/bin/sh", "-c", CMD);
+ }
+
+ /**
+ * @return a host:port pair corresponding to the address on which the emulator is
+ * reachable from the test host machine. Directly usable as a parameter to the
+ * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+ */
+ public String getEmulatorEndpoint() {
+ return getHost() + ":" + getEmulatorPort();
+ }
+
+ public int getEmulatorPort() {
+ return getMappedPort(PORT);
+ }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/DatastoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/DatastoreEmulatorContainer.java
new file mode 100644
index 00000000000..360aedce686
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/DatastoreEmulatorContainer.java
@@ -0,0 +1,73 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Datastore container that relies in google cloud sdk.
+ *
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ *
+ * Default port is 8081.
+ */
+public class DatastoreEmulatorContainer extends GenericContainer {
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+ );
+
+ private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/cloud-sdk"
+ );
+
+ private static final String PROJECT_ID = "test-project";
+
+ private static final String CMD = String.format(
+ "gcloud beta emulators datastore start --project %s --host-port 0.0.0.0:8081",
+ PROJECT_ID
+ );
+
+ private static final int HTTP_PORT = 8081;
+
+ private String flags;
+
+ public DatastoreEmulatorContainer(final String image) {
+ this(DockerImageName.parse(image));
+ }
+
+ public DatastoreEmulatorContainer(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+ withExposedPorts(HTTP_PORT);
+ setWaitStrategy(Wait.forHttp("/").forStatusCode(200));
+ }
+
+ @Override
+ protected void configure() {
+ String command = CMD;
+ if (this.flags != null && !this.flags.isEmpty()) {
+ command += " " + this.flags;
+ }
+ withCommand("/bin/sh", "-c", command);
+ }
+
+ public DatastoreEmulatorContainer withFlags(String flags) {
+ this.flags = flags;
+ return this;
+ }
+
+ /**
+ * @return a host:port pair corresponding to the address on which the emulator is
+ * reachable from the test host machine. Directly usable as a parameter to the
+ * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+ */
+ public String getEmulatorEndpoint() {
+ return getHost() + ":" + getMappedPort(HTTP_PORT);
+ }
+
+ public String getProjectId() {
+ return PROJECT_ID;
+ }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/FirestoreEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/FirestoreEmulatorContainer.java
new file mode 100644
index 00000000000..140f7166307
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/FirestoreEmulatorContainer.java
@@ -0,0 +1,64 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Firestore container that relies in google cloud sdk.
+ *
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ *
+ * Default port is 8080.
+ */
+public class FirestoreEmulatorContainer extends GenericContainer {
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+ );
+
+ private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/cloud-sdk"
+ );
+
+ private static final String CMD = "gcloud beta emulators firestore start --host-port 0.0.0.0:8080";
+
+ private static final int PORT = 8080;
+
+ private String flags;
+
+ public FirestoreEmulatorContainer(String image) {
+ this(DockerImageName.parse(image));
+ }
+
+ public FirestoreEmulatorContainer(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+ withExposedPorts(PORT);
+ setWaitStrategy(Wait.forLogMessage(".*running.*$", 1));
+ }
+
+ @Override
+ protected void configure() {
+ String command = CMD;
+ if (this.flags != null && !this.flags.isEmpty()) {
+ command += " " + this.flags;
+ }
+ withCommand("/bin/sh", "-c", command);
+ }
+
+ public FirestoreEmulatorContainer withFlags(String flags) {
+ this.flags = flags;
+ return this;
+ }
+
+ /**
+ * @return a host:port pair corresponding to the address on which the emulator is
+ * reachable from the test host machine. Directly usable as a parameter to the
+ * com.google.cloud.ServiceOptions.Builder#setHost(java.lang.String) method.
+ */
+ public String getEmulatorEndpoint() {
+ return getHost() + ":" + getMappedPort(8080);
+ }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/PubSubEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/PubSubEmulatorContainer.java
new file mode 100644
index 00000000000..417ee8dc524
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/PubSubEmulatorContainer.java
@@ -0,0 +1,49 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A PubSub container that relies in google cloud sdk.
+ *
+ * Supported images: {@code gcr.io/google.com/cloudsdktool/google-cloud-cli}, {@code gcr.io/google.com/cloudsdktool/cloud-sdk}
+ *
+ * Default port is 8085.
+ */
+public class PubSubEmulatorContainer extends GenericContainer {
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/google-cloud-cli"
+ );
+
+ private static final DockerImageName CLOUD_SDK_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/google.com/cloudsdktool/cloud-sdk"
+ );
+
+ private static final String CMD = "gcloud beta emulators pubsub start --host-port 0.0.0.0:8085";
+
+ private static final int PORT = 8085;
+
+ public PubSubEmulatorContainer(String image) {
+ this(DockerImageName.parse(image));
+ }
+
+ public PubSubEmulatorContainer(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLOUD_SDK_IMAGE_NAME);
+
+ withExposedPorts(8085);
+ setWaitStrategy(Wait.forLogMessage(".*started.*$", 1));
+ withCommand("/bin/sh", "-c", CMD);
+ }
+
+ /**
+ * @return a host:port pair corresponding to the address on which the emulator is
+ * reachable from the test host machine. Directly usable as a parameter to the
+ * io.grpc.ManagedChannelBuilder#forTarget(java.lang.String) method.
+ */
+ public String getEmulatorEndpoint() {
+ return getHost() + ":" + getMappedPort(PORT);
+ }
+}
diff --git a/modules/gcloud/src/main/java/org/testcontainers/gcloud/SpannerEmulatorContainer.java b/modules/gcloud/src/main/java/org/testcontainers/gcloud/SpannerEmulatorContainer.java
new file mode 100644
index 00000000000..aa99f6be5f4
--- /dev/null
+++ b/modules/gcloud/src/main/java/org/testcontainers/gcloud/SpannerEmulatorContainer.java
@@ -0,0 +1,50 @@
+package org.testcontainers.gcloud;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A Spanner container. Default ports: 9010 for GRPC and 9020 for HTTP.
+ *
+ * Supported image: {@code gcr.io/cloud-spanner-emulator/emulator}
+ */
+public class SpannerEmulatorContainer extends GenericContainer {
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
+ "gcr.io/cloud-spanner-emulator/emulator"
+ );
+
+ private static final int GRPC_PORT = 9010;
+
+ private static final int HTTP_PORT = 9020;
+
+ public SpannerEmulatorContainer(String image) {
+ this(DockerImageName.parse(image));
+ }
+
+ public SpannerEmulatorContainer(final DockerImageName dockerImageName) {
+ super(dockerImageName);
+ dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+
+ withExposedPorts(GRPC_PORT, HTTP_PORT);
+ setWaitStrategy(Wait.forLogMessage(".*Cloud Spanner emulator running\\..*", 1));
+ }
+
+ /**
+ * @return a host:port pair corresponding to the address on which the emulator's
+ * gRPC endpoint is reachable from the test host machine. Directly usable as a parameter to the
+ * com.google.cloud.spanner.SpannerOptions.Builder#setEmulatorHost(java.lang.String) method.
+ */
+ public String getEmulatorGrpcEndpoint() {
+ return getHost() + ":" + getMappedPort(GRPC_PORT);
+ }
+
+ /**
+ * @return a host:port pair corresponding to the address on which the emulator's
+ * HTTP REST endpoint is reachable from the test host machine.
+ */
+ public String getEmulatorHttpEndpoint() {
+ return getHost() + ":" + getMappedPort(HTTP_PORT);
+ }
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
deleted file mode 100644
index 01fcbe137a6..00000000000
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.testcontainers.containers;
-
-import com.google.cloud.NoCredentials;
-import com.google.cloud.bigquery.BigQuery;
-import com.google.cloud.bigquery.BigQueryOptions;
-import com.google.cloud.bigquery.QueryJobConfiguration;
-import com.google.cloud.bigquery.TableResult;
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class BigQueryEmulatorContainerTest {
-
- @Test
- public void test() throws Exception {
- try (
- // emulatorContainer {
- BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.4.3")
- // }
- ) {
- container.start();
-
- // bigQueryClient {
- String url = container.getEmulatorHttpEndpoint();
- BigQueryOptions options = BigQueryOptions
- .newBuilder()
- .setProjectId(container.getProjectId())
- .setHost(url)
- .setLocation(url)
- .setCredentials(NoCredentials.getInstance())
- .build();
- BigQuery bigQuery = options.getService();
- // }
-
- String fn =
- "CREATE FUNCTION testr(arr ARRAY>) AS ((SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))";
-
- bigQuery.query(QueryJobConfiguration.newBuilder(fn).build());
-
- String sql =
- "SELECT testr([STRUCT(\"foo\", 10), STRUCT(\"bar\", 40), STRUCT(\"foo\", 20)])";
- TableResult result = bigQuery.query(QueryJobConfiguration.newBuilder(sql).build());
- List values = result
- .streamValues()
- .map(fieldValues -> fieldValues.get(0).getNumericValue())
- .collect(Collectors.toList());
- assertThat(values).containsOnly(BigDecimal.valueOf(30));
- }
- }
-}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
deleted file mode 100644
index e68ecce405b..00000000000
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/BigtableEmulatorContainerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.testcontainers.containers;
-
-import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.NoCredentialsProvider;
-import com.google.api.gax.grpc.GrpcTransportChannel;
-import com.google.api.gax.rpc.FixedTransportChannelProvider;
-import com.google.api.gax.rpc.TransportChannelProvider;
-import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
-import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
-import com.google.cloud.bigtable.admin.v2.models.Table;
-import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStubSettings;
-import com.google.cloud.bigtable.admin.v2.stub.EnhancedBigtableTableAdminStub;
-import com.google.cloud.bigtable.data.v2.BigtableDataClient;
-import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
-import com.google.cloud.bigtable.data.v2.models.Row;
-import com.google.cloud.bigtable.data.v2.models.RowCell;
-import com.google.cloud.bigtable.data.v2.models.RowMutation;
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class BigtableEmulatorContainerTest {
-
- public static final String PROJECT_ID = "test-project";
-
- public static final String INSTANCE_ID = "test-instance";
-
- @Rule
- // emulatorContainer {
- public BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
- DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
- );
-
- // }
-
- @Test
- // testWithEmulatorContainer {
- public void testSimple() throws IOException, InterruptedException, ExecutionException {
- ManagedChannel channel = ManagedChannelBuilder.forTarget(emulator.getEmulatorEndpoint()).usePlaintext().build();
-
- TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
- GrpcTransportChannel.create(channel)
- );
- NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
-
- try {
- createTable(channelProvider, credentialsProvider, "test-table");
-
- BigtableDataClient client = BigtableDataClient.create(
- BigtableDataSettings
- .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
- .setProjectId(PROJECT_ID)
- .setInstanceId(INSTANCE_ID)
- .build()
- );
-
- client.mutateRow(RowMutation.create("test-table", "1").setCell("name", "firstName", "Ray"));
-
- Row row = client.readRow("test-table", "1");
- List cells = row.getCells("name", "firstName");
-
- assertThat(cells).isNotNull().hasSize(1);
- assertThat(cells.get(0).getValue().toStringUtf8()).isEqualTo("Ray");
- } finally {
- channel.shutdown();
- }
- }
-
- // }
-
- // createTable {
- private void createTable(
- TransportChannelProvider channelProvider,
- CredentialsProvider credentialsProvider,
- String tableName
- ) throws IOException {
- EnhancedBigtableTableAdminStub stub = EnhancedBigtableTableAdminStub.createEnhanced(
- BigtableTableAdminStubSettings
- .newBuilder()
- .setTransportChannelProvider(channelProvider)
- .setCredentialsProvider(credentialsProvider)
- .build()
- );
-
- try (BigtableTableAdminClient client = BigtableTableAdminClient.create(PROJECT_ID, INSTANCE_ID, stub)) {
- Table table = client.createTable(CreateTableRequest.of(tableName).addFamily("name"));
- }
- }
- // }
-}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
deleted file mode 100644
index 0162085ea35..00000000000
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/FirestoreEmulatorContainerTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.testcontainers.containers;
-
-import com.google.api.core.ApiFuture;
-import com.google.cloud.NoCredentials;
-import com.google.cloud.firestore.CollectionReference;
-import com.google.cloud.firestore.DocumentReference;
-import com.google.cloud.firestore.Firestore;
-import com.google.cloud.firestore.FirestoreOptions;
-import com.google.cloud.firestore.QuerySnapshot;
-import com.google.cloud.firestore.WriteResult;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class FirestoreEmulatorContainerTest {
-
- @Rule
- // emulatorContainer {
- public FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
- DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
- );
-
- // }
-
- // testWithEmulatorContainer {
- @Test
- public void testSimple() throws ExecutionException, InterruptedException {
- FirestoreOptions options = FirestoreOptions
- .getDefaultInstance()
- .toBuilder()
- .setHost(emulator.getEmulatorEndpoint())
- .setCredentials(NoCredentials.getInstance())
- .setProjectId("test-project")
- .build();
- Firestore firestore = options.getService();
-
- CollectionReference users = firestore.collection("users");
- DocumentReference docRef = users.document("alovelace");
- Map data = new HashMap<>();
- data.put("first", "Ada");
- data.put("last", "Lovelace");
- ApiFuture result = docRef.set(data);
- result.get();
-
- ApiFuture query = users.get();
- QuerySnapshot querySnapshot = query.get();
-
- assertThat(querySnapshot.getDocuments().get(0).getData()).containsEntry("first", "Ada");
- }
- // }
-
-}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java
new file mode 100644
index 00000000000..7d657830fa4
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigQueryEmulatorContainerTest.java
@@ -0,0 +1,204 @@
+package org.testcontainers.gcloud;
+
+import com.google.api.core.ApiFuture;
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.rpc.FixedTransportChannelProvider;
+import com.google.cloud.NoCredentials;
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.DatasetId;
+import com.google.cloud.bigquery.DatasetInfo;
+import com.google.cloud.bigquery.Field;
+import com.google.cloud.bigquery.QueryJobConfiguration;
+import com.google.cloud.bigquery.Schema;
+import com.google.cloud.bigquery.StandardSQLTypeName;
+import com.google.cloud.bigquery.StandardTableDefinition;
+import com.google.cloud.bigquery.TableDefinition;
+import com.google.cloud.bigquery.TableId;
+import com.google.cloud.bigquery.TableInfo;
+import com.google.cloud.bigquery.TableResult;
+import com.google.cloud.bigquery.storage.v1.AppendRowsResponse;
+import com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest;
+import com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse;
+import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient;
+import com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings;
+import com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest;
+import com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamRequest;
+import com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamResponse;
+import com.google.cloud.bigquery.storage.v1.JsonStreamWriter;
+import com.google.cloud.bigquery.storage.v1.TableName;
+import com.google.cloud.bigquery.storage.v1.WriteStream;
+import io.grpc.ManagedChannelBuilder;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.threeten.bp.Duration;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BigQueryEmulatorContainerTest {
+
+ @Test
+ void testHttpEndpoint() throws Exception {
+ try (
+ // emulatorContainer {
+ BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.4.3")
+ // }
+ ) {
+ container.start();
+
+ // bigQueryClient {
+ String url = container.getEmulatorHttpEndpoint();
+ BigQueryOptions options = BigQueryOptions
+ .newBuilder()
+ .setProjectId(container.getProjectId())
+ .setHost(url)
+ .setLocation(url)
+ .setCredentials(NoCredentials.getInstance())
+ .build();
+ BigQuery bigQuery = options.getService();
+ // }
+
+ String fn =
+ "CREATE FUNCTION testr(arr ARRAY>) AS ((SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))";
+
+ bigQuery.query(QueryJobConfiguration.newBuilder(fn).build());
+
+ String sql =
+ "SELECT testr([STRUCT(\"foo\", 10), STRUCT(\"bar\", 40), STRUCT(\"foo\", 20)])";
+ TableResult result = bigQuery.query(QueryJobConfiguration.newBuilder(sql).build());
+ List values = result
+ .streamValues()
+ .map(fieldValues -> fieldValues.get(0).getNumericValue())
+ .collect(Collectors.toList());
+ assertThat(values).containsOnly(BigDecimal.valueOf(30));
+ }
+ }
+
+ @Test
+ void testGrcpEndpoint() throws Exception {
+ try (
+ BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.6.5")
+ ) {
+ container.start();
+
+ BigQuery bigQuery = getBigQuery(container);
+ String tableName = "test-table";
+ String datasetName = "test-dataset";
+
+ bigQuery.create(DatasetInfo.of(DatasetId.of(container.getProjectId(), datasetName)));
+
+ Schema schema = Schema.of(Field.of("name", StandardSQLTypeName.STRING));
+
+ TableId tableId = TableId.of(datasetName, tableName);
+ TableDefinition tableDefinition = StandardTableDefinition.of(schema);
+ TableInfo tableInfo = TableInfo.newBuilder(tableId, tableDefinition).build();
+
+ bigQuery.create(tableInfo);
+
+ BigQueryWriteSettings.Builder bigQueryWriteSettingsBuilder = BigQueryWriteSettings.newBuilder();
+
+ bigQueryWriteSettingsBuilder
+ .createWriteStreamSettings()
+ .setRetrySettings(
+ bigQueryWriteSettingsBuilder
+ .createWriteStreamSettings()
+ .getRetrySettings()
+ .toBuilder()
+ .setTotalTimeout(Duration.ofSeconds(60))
+ .build()
+ );
+
+ BigQueryWriteClient bigQueryWriteClient = BigQueryWriteClient.create(
+ bigQueryWriteSettingsBuilder
+ .setTransportChannelProvider(
+ FixedTransportChannelProvider.create(
+ GrpcTransportChannel.create(
+ ManagedChannelBuilder
+ .forAddress(container.getHost(), container.getEmulatorGrpcPort())
+ .usePlaintext()
+ .build()
+ )
+ )
+ )
+ .setCredentialsProvider(NoCredentialsProvider.create())
+ .build()
+ );
+
+ TableName parentTable = TableName.of(container.getProjectId(), datasetName, tableName);
+ CreateWriteStreamRequest createWriteStreamRequest = CreateWriteStreamRequest
+ .newBuilder()
+ .setParent(parentTable.toString())
+ .setWriteStream(WriteStream.newBuilder().setType(WriteStream.Type.PENDING))
+ .build();
+
+ WriteStream writeStream = bigQueryWriteClient.createWriteStream(createWriteStreamRequest);
+
+ JsonStreamWriter writer = JsonStreamWriter
+ .newBuilder(writeStream.getName(), writeStream.getTableSchema(), bigQueryWriteClient)
+ .build();
+
+ JSONArray jsonArray = new JSONArray();
+ JSONObject record1 = new JSONObject();
+ record1.put("name", "Alice");
+ jsonArray.put(record1);
+
+ JSONObject record2 = new JSONObject();
+ record2.put("name", "Bob");
+ jsonArray.put(record2);
+
+ ApiFuture future = writer.append(jsonArray);
+ AppendRowsResponse response = future.get();
+
+ FinalizeWriteStreamRequest finalizeRequest = FinalizeWriteStreamRequest
+ .newBuilder()
+ .setName(writeStream.getName())
+ .build();
+ FinalizeWriteStreamResponse finalizeResponse = bigQueryWriteClient.finalizeWriteStream(finalizeRequest);
+
+ BatchCommitWriteStreamsRequest commitRequest = BatchCommitWriteStreamsRequest
+ .newBuilder()
+ .setParent(parentTable.toString())
+ .addWriteStreams(writeStream.getName())
+ .build();
+ BatchCommitWriteStreamsResponse commitResponse = bigQueryWriteClient.batchCommitWriteStreams(commitRequest);
+
+ writer.close();
+
+ String sql = String.format(
+ "SELECT name FROM `%s.%s.%s` ORDER BY name",
+ container.getProjectId(),
+ datasetName,
+ tableName
+ );
+ TableResult result = bigQuery.query(QueryJobConfiguration.newBuilder(sql).build());
+
+ List names = result
+ .streamValues()
+ .map(row -> row.get("name").getStringValue())
+ .collect(Collectors.toList());
+
+ assertThat(names).containsExactly("Alice", "Bob");
+
+ bigQueryWriteClient.shutdown();
+ bigQueryWriteClient.close();
+ }
+ }
+
+ private BigQuery getBigQuery(BigQueryEmulatorContainer container) {
+ String url = container.getEmulatorHttpEndpoint();
+ return BigQueryOptions
+ .newBuilder()
+ .setProjectId(container.getProjectId())
+ .setHost(url)
+ .setLocation(url)
+ .setCredentials(NoCredentials.getInstance())
+ .build()
+ .getService();
+ }
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
new file mode 100644
index 00000000000..64f19a42df5
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/BigtableEmulatorContainerTest.java
@@ -0,0 +1,102 @@
+package org.testcontainers.gcloud;
+
+import com.google.api.gax.core.CredentialsProvider;
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.rpc.FixedTransportChannelProvider;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
+import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
+import com.google.cloud.bigtable.admin.v2.models.Table;
+import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStubSettings;
+import com.google.cloud.bigtable.admin.v2.stub.EnhancedBigtableTableAdminStub;
+import com.google.cloud.bigtable.data.v2.BigtableDataClient;
+import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
+import com.google.cloud.bigtable.data.v2.internal.TableAdminRequestContext;
+import com.google.cloud.bigtable.data.v2.models.Row;
+import com.google.cloud.bigtable.data.v2.models.RowCell;
+import com.google.cloud.bigtable.data.v2.models.RowMutation;
+import com.google.cloud.bigtable.data.v2.models.TableId;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BigtableEmulatorContainerTest {
+
+ private static final String PROJECT_ID = "test-project";
+
+ private static final String INSTANCE_ID = "test-instance";
+
+ @Test
+ // testWithEmulatorContainer {
+ void testSimple() throws IOException {
+ try (
+ // emulatorContainer {
+ BigtableEmulatorContainer emulator = new BigtableEmulatorContainer(
+ DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+ );
+ // }
+ ) {
+ emulator.start();
+ ManagedChannel channel = ManagedChannelBuilder
+ .forTarget(emulator.getEmulatorEndpoint())
+ .usePlaintext()
+ .build();
+
+ TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
+ GrpcTransportChannel.create(channel)
+ );
+ NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
+ createTable(channelProvider, credentialsProvider, "test-table");
+ try (
+ BigtableDataClient client = BigtableDataClient.create(
+ BigtableDataSettings
+ .newBuilderForEmulator(emulator.getHost(), emulator.getEmulatorPort())
+ .setProjectId(PROJECT_ID)
+ .setInstanceId(INSTANCE_ID)
+ .build()
+ )
+ ) {
+ client.mutateRow(RowMutation.create(TableId.of("test-table"), "1").setCell("name", "firstName", "Ray"));
+
+ Row row = client.readRow(TableId.of("test-table"), "1");
+ List cells = row.getCells("name", "firstName");
+
+ assertThat(cells).isNotNull().hasSize(1);
+ assertThat(cells.get(0).getValue().toStringUtf8()).isEqualTo("Ray");
+ } finally {
+ channel.shutdown();
+ }
+ }
+ }
+
+ // }
+
+ // createTable {
+ private void createTable(
+ TransportChannelProvider channelProvider,
+ CredentialsProvider credentialsProvider,
+ String tableName
+ ) throws IOException {
+ TableAdminRequestContext requestContext = TableAdminRequestContext.create(PROJECT_ID, INSTANCE_ID);
+ EnhancedBigtableTableAdminStub stub = EnhancedBigtableTableAdminStub.createEnhanced(
+ BigtableTableAdminStubSettings
+ .newBuilder()
+ .setTransportChannelProvider(channelProvider)
+ .setCredentialsProvider(credentialsProvider)
+ .build(),
+ requestContext
+ );
+
+ try (BigtableTableAdminClient client = BigtableTableAdminClient.create(PROJECT_ID, INSTANCE_ID, stub)) {
+ Table table = client.createTable(CreateTableRequest.of(tableName).addFamily("name"));
+ }
+ }
+ // }
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
similarity index 56%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
index 7ea0ceb9a49..dceec1af215 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/DatastoreEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
import com.google.cloud.NoCredentials;
import com.google.cloud.ServiceOptions;
@@ -6,8 +6,7 @@
import com.google.cloud.datastore.DatastoreOptions;
import com.google.cloud.datastore.Entity;
import com.google.cloud.datastore.Key;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.utility.DockerImageName;
import java.io.IOException;
@@ -16,37 +15,38 @@
public class DatastoreEmulatorContainerTest {
- @Rule
- // creatingDatastoreEmulatorContainer {
- public DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
- DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
- );
-
- // }
-
// startingDatastoreEmulatorContainer {
@Test
public void testSimple() {
- DatastoreOptions options = DatastoreOptions
- .newBuilder()
- .setHost(emulator.getEmulatorEndpoint())
- .setCredentials(NoCredentials.getInstance())
- .setRetrySettings(ServiceOptions.getNoRetrySettings())
- .setProjectId(emulator.getProjectId())
- .build();
- Datastore datastore = options.getService();
+ try (
+ // creatingDatastoreEmulatorContainer {
+ DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
+ DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+ );
+ // }
+ ) {
+ emulator.start();
+ DatastoreOptions options = DatastoreOptions
+ .newBuilder()
+ .setHost(emulator.getEmulatorEndpoint())
+ .setCredentials(NoCredentials.getInstance())
+ .setRetrySettings(ServiceOptions.getNoRetrySettings())
+ .setProjectId(emulator.getProjectId())
+ .build();
+ Datastore datastore = options.getService();
- Key key = datastore.newKeyFactory().setKind("Task").newKey("sample");
- Entity entity = Entity.newBuilder(key).set("description", "my description").build();
- datastore.put(entity);
+ Key key = datastore.newKeyFactory().setKind("Task").newKey("sample");
+ Entity entity = Entity.newBuilder(key).set("description", "my description").build();
+ datastore.put(entity);
- assertThat(datastore.get(key).getString("description")).isEqualTo("my description");
+ assertThat(datastore.get(key).getString("description")).isEqualTo("my description");
+ }
}
// }
@Test
- public void testWithFlags() throws IOException, InterruptedException {
+ void testWithFlags() throws IOException, InterruptedException {
try (
DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
"gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
@@ -61,7 +61,7 @@ public void testWithFlags() throws IOException, InterruptedException {
}
@Test
- public void testWithMultipleFlags() throws IOException, InterruptedException {
+ void testWithMultipleFlags() throws IOException, InterruptedException {
try (
DatastoreEmulatorContainer emulator = new DatastoreEmulatorContainer(
"gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators"
diff --git a/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
new file mode 100644
index 00000000000..2c3233388aa
--- /dev/null
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/FirestoreEmulatorContainerTest.java
@@ -0,0 +1,73 @@
+package org.testcontainers.gcloud;
+
+import com.google.api.core.ApiFuture;
+import com.google.cloud.NoCredentials;
+import com.google.cloud.firestore.CollectionReference;
+import com.google.cloud.firestore.DocumentReference;
+import com.google.cloud.firestore.Firestore;
+import com.google.cloud.firestore.FirestoreOptions;
+import com.google.cloud.firestore.QuerySnapshot;
+import com.google.cloud.firestore.WriteResult;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class FirestoreEmulatorContainerTest {
+
+ // testWithEmulatorContainer {
+ @Test
+ void testSimple() throws ExecutionException, InterruptedException {
+ try (
+ // emulatorContainer {
+ FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
+ DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
+ );
+ // }
+ ) {
+ emulator.start();
+ FirestoreOptions options = FirestoreOptions
+ .getDefaultInstance()
+ .toBuilder()
+ .setHost(emulator.getEmulatorEndpoint())
+ .setCredentials(NoCredentials.getInstance())
+ .setProjectId("test-project")
+ .build();
+ Firestore firestore = options.getService();
+
+ CollectionReference users = firestore.collection("users");
+ DocumentReference docRef = users.document("alovelace");
+ Map data = new HashMap<>();
+ data.put("first", "Ada");
+ data.put("last", "Lovelace");
+ ApiFuture result = docRef.set(data);
+ result.get();
+
+ ApiFuture query = users.get();
+ QuerySnapshot querySnapshot = query.get();
+
+ assertThat(querySnapshot.getDocuments().get(0).getData()).containsEntry("first", "Ada");
+ }
+ }
+
+ // }
+
+ @Test
+ void testWithFlags() {
+ try (
+ FirestoreEmulatorContainer emulator = new FirestoreEmulatorContainer(
+ "gcr.io/google.com/cloudsdktool/google-cloud-cli:465.0.0-emulators"
+ )
+ .withFlags("--database-mode datastore-mode")
+ ) {
+ emulator.start();
+
+ assertThat(emulator.getContainerInfo().getConfig().getCmd())
+ .anyMatch(e -> e.contains("--database-mode datastore-mode"));
+ }
+ }
+}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
similarity index 52%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
index b2f75f0f36a..eb3ed0260ee 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/PubSubEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/PubSubEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
import com.google.api.gax.core.NoCredentialsProvider;
import com.google.api.gax.grpc.GrpcTransportChannel;
@@ -22,70 +22,73 @@
import com.google.pubsub.v1.TopicName;
import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.utility.DockerImageName;
import java.io.IOException;
import static org.assertj.core.api.Assertions.assertThat;
-public class PubSubEmulatorContainerTest {
+class PubSubEmulatorContainerTest {
- public static final String PROJECT_ID = "my-project-id";
-
- @Rule
- // emulatorContainer {
- public PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
- DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
- );
-
- // }
+ private static final String PROJECT_ID = "my-project-id";
@Test
// testWithEmulatorContainer {
- public void testSimple() throws IOException {
- String hostport = emulator.getEmulatorEndpoint();
- ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
- try {
- TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
- GrpcTransportChannel.create(channel)
+ void testSimple() throws IOException {
+ try (
+ // emulatorContainer {
+ PubSubEmulatorContainer emulator = new PubSubEmulatorContainer(
+ DockerImageName.parse("gcr.io/google.com/cloudsdktool/google-cloud-cli:441.0.0-emulators")
);
- NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
-
- String topicId = "my-topic-id";
- createTopic(topicId, channelProvider, credentialsProvider);
-
- String subscriptionId = "my-subscription-id";
- createSubscription(subscriptionId, topicId, channelProvider, credentialsProvider);
-
- Publisher publisher = Publisher
- .newBuilder(TopicName.of(PROJECT_ID, topicId))
- .setChannelProvider(channelProvider)
- .setCredentialsProvider(credentialsProvider)
- .build();
- PubsubMessage message = PubsubMessage.newBuilder().setData(ByteString.copyFromUtf8("test message")).build();
- publisher.publish(message);
-
- SubscriberStubSettings subscriberStubSettings = SubscriberStubSettings
- .newBuilder()
- .setTransportChannelProvider(channelProvider)
- .setCredentialsProvider(credentialsProvider)
- .build();
- try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
- PullRequest pullRequest = PullRequest
+ // }
+ ) {
+ emulator.start();
+ String hostport = emulator.getEmulatorEndpoint();
+ ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext().build();
+ try {
+ TransportChannelProvider channelProvider = FixedTransportChannelProvider.create(
+ GrpcTransportChannel.create(channel)
+ );
+ NoCredentialsProvider credentialsProvider = NoCredentialsProvider.create();
+
+ String topicId = "my-topic-id";
+ createTopic(topicId, channelProvider, credentialsProvider);
+
+ String subscriptionId = "my-subscription-id";
+ createSubscription(subscriptionId, topicId, channelProvider, credentialsProvider);
+
+ Publisher publisher = Publisher
+ .newBuilder(TopicName.of(PROJECT_ID, topicId))
+ .setChannelProvider(channelProvider)
+ .setCredentialsProvider(credentialsProvider)
+ .build();
+ PubsubMessage message = PubsubMessage
.newBuilder()
- .setMaxMessages(1)
- .setSubscription(ProjectSubscriptionName.format(PROJECT_ID, subscriptionId))
+ .setData(ByteString.copyFromUtf8("test message"))
.build();
- PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
+ publisher.publish(message);
- assertThat(pullResponse.getReceivedMessagesList()).hasSize(1);
- assertThat(pullResponse.getReceivedMessages(0).getMessage().getData().toStringUtf8())
- .isEqualTo("test message");
+ SubscriberStubSettings subscriberStubSettings = SubscriberStubSettings
+ .newBuilder()
+ .setTransportChannelProvider(channelProvider)
+ .setCredentialsProvider(credentialsProvider)
+ .build();
+ try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
+ PullRequest pullRequest = PullRequest
+ .newBuilder()
+ .setMaxMessages(1)
+ .setSubscription(ProjectSubscriptionName.format(PROJECT_ID, subscriptionId))
+ .build();
+ PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
+
+ assertThat(pullResponse.getReceivedMessagesList()).hasSize(1);
+ assertThat(pullResponse.getReceivedMessages(0).getMessage().getData().toStringUtf8())
+ .isEqualTo("test message");
+ }
+ } finally {
+ channel.shutdown();
}
- } finally {
- channel.shutdown();
}
}
diff --git a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java b/modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java
similarity index 56%
rename from modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
rename to modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java
index b246e7e1f0d..2d6ac963882 100644
--- a/modules/gcloud/src/test/java/org/testcontainers/containers/SpannerEmulatorContainerTest.java
+++ b/modules/gcloud/src/test/java/org/testcontainers/gcloud/SpannerEmulatorContainerTest.java
@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.gcloud;
import com.google.cloud.NoCredentials;
import com.google.cloud.spanner.Database;
@@ -14,8 +14,7 @@
import com.google.cloud.spanner.Spanner;
import com.google.cloud.spanner.SpannerOptions;
import com.google.cloud.spanner.Statement;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.utility.DockerImageName;
import java.util.Arrays;
@@ -23,15 +22,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-public class SpannerEmulatorContainerTest {
-
- @Rule
- // emulatorContainer {
- public SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(
- DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.4.0")
- );
-
- // }
+class SpannerEmulatorContainerTest {
private static final String PROJECT_NAME = "test-project";
@@ -41,38 +32,47 @@ public class SpannerEmulatorContainerTest {
// testWithEmulatorContainer {
@Test
- public void testSimple() throws ExecutionException, InterruptedException {
- SpannerOptions options = SpannerOptions
- .newBuilder()
- .setEmulatorHost(emulator.getEmulatorGrpcEndpoint())
- .setCredentials(NoCredentials.getInstance())
- .setProjectId(PROJECT_NAME)
- .build();
-
- Spanner spanner = options.getService();
-
- InstanceId instanceId = createInstance(spanner);
-
- createDatabase(spanner);
-
- DatabaseId databaseId = DatabaseId.of(instanceId, DATABASE_NAME);
- DatabaseClient dbClient = spanner.getDatabaseClient(databaseId);
- dbClient
- .readWriteTransaction()
- .run(tx -> {
- String sql1 = "Delete from TestTable where 1=1";
- tx.executeUpdate(Statement.of(sql1));
- String sql = "INSERT INTO TestTable (Key, Value) VALUES (1, 'Java'), (2, 'Go')";
- tx.executeUpdate(Statement.of(sql));
- return null;
- });
-
- ResultSet resultSet = dbClient
- .readOnlyTransaction()
- .executeQuery(Statement.of("select * from TestTable order by Key"));
- resultSet.next();
- assertThat(resultSet.getLong(0)).isEqualTo(1);
- assertThat(resultSet.getString(1)).isEqualTo("Java");
+ void testSimple() throws ExecutionException, InterruptedException {
+ try (
+ // emulatorContainer {
+ SpannerEmulatorContainer emulator = new SpannerEmulatorContainer(
+ DockerImageName.parse("gcr.io/cloud-spanner-emulator/emulator:1.4.0")
+ );
+ // }
+ ) {
+ emulator.start();
+ SpannerOptions options = SpannerOptions
+ .newBuilder()
+ .setEmulatorHost(emulator.getEmulatorGrpcEndpoint())
+ .setCredentials(NoCredentials.getInstance())
+ .setProjectId(PROJECT_NAME)
+ .build();
+
+ Spanner spanner = options.getService();
+
+ InstanceId instanceId = createInstance(spanner);
+
+ createDatabase(spanner);
+
+ DatabaseId databaseId = DatabaseId.of(instanceId, DATABASE_NAME);
+ DatabaseClient dbClient = spanner.getDatabaseClient(databaseId);
+ dbClient
+ .readWriteTransaction()
+ .run(tx -> {
+ String sql1 = "Delete from TestTable where 1=1";
+ tx.executeUpdate(Statement.of(sql1));
+ String sql = "INSERT INTO TestTable (Key, Value) VALUES (1, 'Java'), (2, 'Go')";
+ tx.executeUpdate(Statement.of(sql));
+ return null;
+ });
+
+ ResultSet resultSet = dbClient
+ .readOnlyTransaction()
+ .executeQuery(Statement.of("select * from TestTable order by Key"));
+ resultSet.next();
+ assertThat(resultSet.getLong(0)).isEqualTo(1);
+ assertThat(resultSet.getString(1)).isEqualTo("Java");
+ }
}
// }
diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle
new file mode 100644
index 00000000000..93bae9750b4
--- /dev/null
+++ b/modules/grafana/build.gradle
@@ -0,0 +1,14 @@
+description = "Testcontainers :: Grafana"
+
+dependencies {
+ api project(':testcontainers')
+
+ testImplementation 'io.rest-assured:rest-assured:5.5.7'
+ testImplementation 'io.micrometer:micrometer-registry-otlp:1.17.0'
+ testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8'
+
+ testImplementation platform('io.opentelemetry:opentelemetry-bom:1.65.0')
+ testImplementation 'io.opentelemetry:opentelemetry-api'
+ testImplementation 'io.opentelemetry:opentelemetry-sdk'
+ testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
+}
diff --git a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
new file mode 100644
index 00000000000..52443d7ba8a
--- /dev/null
+++ b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java
@@ -0,0 +1,81 @@
+package org.testcontainers.grafana;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Testcontainers implementation for Grafana OTel LGTM.
+ *
+ * Supported image: {@code grafana/otel-lgtm}
+ *
+ * Exposed ports:
+ *
+ * - Grafana: 3000
+ * - Tempo: 3200
+ * - OTel Http: 4317
+ * - OTel Grpc: 4318
+ * - Prometheus: 9090
+ *
+ */
+@Slf4j
+public class LgtmStackContainer extends GenericContainer {
+
+ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("grafana/otel-lgtm");
+
+ private static final int GRAFANA_PORT = 3000;
+
+ private static final int OTLP_GRPC_PORT = 4317;
+
+ private static final int OTLP_HTTP_PORT = 4318;
+
+ private static final int LOKI_PORT = 3100;
+
+ private static final int TEMPO_PORT = 3200;
+
+ private static final int PROMETHEUS_PORT = 9090;
+
+ public LgtmStackContainer(String image) {
+ this(DockerImageName.parse(image));
+ }
+
+ public LgtmStackContainer(DockerImageName image) {
+ super(image);
+ image.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+ withExposedPorts(GRAFANA_PORT, TEMPO_PORT, LOKI_PORT, OTLP_GRPC_PORT, OTLP_HTTP_PORT, PROMETHEUS_PORT);
+ waitingFor(
+ Wait.forLogMessage(".*The OpenTelemetry collector and the Grafana LGTM stack are up and running.*\\s", 1)
+ );
+ }
+
+ @Override
+ protected void containerIsStarted(InspectContainerResponse containerInfo) {
+ log.info("Access to the Grafana dashboard: {}", getGrafanaHttpUrl());
+ }
+
+ public String getOtlpGrpcUrl() {
+ return "http://" + getHost() + ":" + getMappedPort(OTLP_GRPC_PORT);
+ }
+
+ public String getTempoUrl() {
+ return "http://" + getHost() + ":" + getMappedPort(TEMPO_PORT);
+ }
+
+ public String getLokiUrl() {
+ return "http://" + getHost() + ":" + getMappedPort(LOKI_PORT);
+ }
+
+ public String getOtlpHttpUrl() {
+ return "http://" + getHost() + ":" + getMappedPort(OTLP_HTTP_PORT);
+ }
+
+ public String getPrometheusHttpUrl() {
+ return "http://" + getHost() + ":" + getMappedPort(PROMETHEUS_PORT);
+ }
+
+ public String getGrafanaHttpUrl() {
+ return "http://" + getHost() + ":" + getMappedPort(GRAFANA_PORT);
+ }
+}
diff --git a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
new file mode 100644
index 00000000000..ff8d5cb6609
--- /dev/null
+++ b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java
@@ -0,0 +1,156 @@
+package org.testcontainers.grafana;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.registry.otlp.OtlpConfig;
+import io.micrometer.registry.otlp.OtlpMeterRegistry;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.logs.Logger;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.logs.SdkLoggerProvider;
+import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.Test;
+import uk.org.webcompere.systemstubs.SystemStubs;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class LgtmStackContainerTest {
+
+ @Test
+ void shouldPublishMetricsTracesAndLogs() throws Exception {
+ try ( // container {
+ LgtmStackContainer lgtm = new LgtmStackContainer("grafana/otel-lgtm:0.11.1")
+ // }
+ ) {
+ lgtm.start();
+
+ OtlpGrpcSpanExporter spanExporter = OtlpGrpcSpanExporter
+ .builder()
+ .setTimeout(Duration.ofSeconds(1))
+ .setEndpoint(lgtm.getOtlpGrpcUrl())
+ .build();
+
+ OtlpGrpcLogRecordExporter logExporter = OtlpGrpcLogRecordExporter
+ .builder()
+ .setTimeout(Duration.ofSeconds(1))
+ .setEndpoint(lgtm.getOtlpGrpcUrl())
+ .build();
+
+ BatchSpanProcessor spanProcessor = BatchSpanProcessor
+ .builder(spanExporter)
+ .setScheduleDelay(500, TimeUnit.MILLISECONDS)
+ .build();
+
+ SdkTracerProvider tracerProvider = SdkTracerProvider
+ .builder()
+ .addSpanProcessor(spanProcessor)
+ .setResource(Resource.create(Attributes.of(AttributeKey.stringKey("service.name"), "test-service")))
+ .build();
+
+ SdkLoggerProvider loggerProvider = SdkLoggerProvider
+ .builder()
+ .addLogRecordProcessor(SimpleLogRecordProcessor.create(logExporter))
+ .build();
+
+ OpenTelemetrySdk openTelemetry = OpenTelemetrySdk
+ .builder()
+ .setTracerProvider(tracerProvider)
+ .setLoggerProvider(loggerProvider)
+ .build();
+
+ String version = RestAssured
+ .get(String.format("http://%s:%s/api/health", lgtm.getHost(), lgtm.getMappedPort(3000)))
+ .jsonPath()
+ .get("version");
+ assertThat(version).isEqualTo("12.0.0");
+
+ OtlpConfig otlpConfig = createOtlpConfig(lgtm);
+ MeterRegistry meterRegistry = SystemStubs
+ .withEnvironmentVariable("OTEL_SERVICE_NAME", "testcontainers")
+ .execute(() -> new OtlpMeterRegistry(otlpConfig, Clock.SYSTEM));
+ Counter.builder("test.counter").register(meterRegistry).increment(2);
+
+ Logger logger = openTelemetry.getSdkLoggerProvider().loggerBuilder("test").build();
+ logger
+ .logRecordBuilder()
+ .setBody("Test log!")
+ .setAttribute(AttributeKey.stringKey("job"), "test-job")
+ .emit();
+
+ Tracer tracer = openTelemetry.getTracer("test");
+ Span span = tracer.spanBuilder("test").startSpan();
+ span.end();
+
+ Awaitility
+ .given()
+ .pollInterval(Duration.ofSeconds(2))
+ .atMost(Duration.ofSeconds(5))
+ .ignoreExceptions()
+ .untilAsserted(() -> {
+ Response metricResponse = RestAssured
+ .given()
+ .queryParam("query", "test_counter_total{job=\"testcontainers\"}")
+ .get(String.format("%s/api/v1/query", lgtm.getPrometheusHttpUrl()))
+ .prettyPeek()
+ .thenReturn();
+ assertThat(metricResponse.getStatusCode()).isEqualTo(200);
+ assertThat(metricResponse.body().jsonPath().getList("data.result[0].value")).contains("2");
+
+ Response logResponse = RestAssured
+ .given()
+ .queryParam("query", "{service_name=\"unknown_service:java\"}")
+ .get(String.format("%s/loki/api/v1/query_range", lgtm.getLokiUrl()))
+ .prettyPeek()
+ .thenReturn();
+ assertThat(logResponse.getStatusCode()).isEqualTo(200);
+ assertThat(logResponse.body().jsonPath().getString("data.result[0].values[0][1]"))
+ .isEqualTo("Test log!");
+
+ Response traceResponse = RestAssured
+ .given()
+ .get(String.format("%s/api/search", lgtm.getTempoUrl()))
+ .prettyPeek()
+ .thenReturn();
+ assertThat(traceResponse.getStatusCode()).isEqualTo(200);
+ assertThat(traceResponse.body().jsonPath().getString("traces[0].rootServiceName"))
+ .isEqualTo("test-service");
+ });
+
+ openTelemetry.close();
+ }
+ }
+
+ private static OtlpConfig createOtlpConfig(LgtmStackContainer lgtm) {
+ return new OtlpConfig() {
+ @Override
+ public String url() {
+ return String.format("%s/v1/metrics", lgtm.getOtlpHttpUrl());
+ }
+
+ @Override
+ public Duration step() {
+ return Duration.ofSeconds(1);
+ }
+
+ @Override
+ public String get(String s) {
+ return null;
+ }
+ };
+ }
+}
diff --git a/modules/grafana/src/test/resources/logback-test.xml b/modules/grafana/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..83ef7a1a3ef
--- /dev/null
+++ b/modules/grafana/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+ %d{HH:mm:ss.SSS} %-5level %logger - %msg%n
+
+
+
+
+
+
+
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
index 7aca932667b..13ec90ff167 100644
--- a/modules/hivemq/build.gradle
+++ b/modules/hivemq/build.gradle
@@ -2,30 +2,23 @@ description = "Testcontainers :: HiveMQ"
dependencies {
api(project(":testcontainers"))
- api("org.jetbrains:annotations:24.1.0")
+ api("org.jetbrains:annotations:26.1.0")
- shaded("org.apache.commons:commons-lang3:3.14.0")
- shaded("commons-io:commons-io:2.15.1")
- shaded("org.javassist:javassist:3.30.2-GA")
+ shaded("org.apache.commons:commons-lang3:3.20.0")
+ shaded("commons-io:commons-io:2.21.0")
+ shaded("org.javassist:javassist:3.32.0-GA")
shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
- shaded("net.lingala.zip4j:zip4j:2.11.5")
+ shaded("net.lingala.zip4j:zip4j:2.11.6")
- testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
- testImplementation(project(":junit-jupiter"))
- testImplementation("com.hivemq:hivemq-extension-sdk:4.24.0")
- testImplementation("com.hivemq:hivemq-mqtt-client:1.3.3")
+ testImplementation(project(":testcontainers-junit-jupiter"))
+ testImplementation("com.hivemq:hivemq-extension-sdk:4.50.0")
+ testImplementation("com.hivemq:hivemq-mqtt-client:1.3.15")
testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
- testImplementation("ch.qos.logback:logback-classic:1.4.14")
- testImplementation 'org.assertj:assertj-core:3.25.1'
- testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
+ testImplementation("ch.qos.logback:logback-classic:1.5.37")
}
test {
- useJUnitPlatform()
- testLogging {
- events "passed", "skipped", "failed"
- }
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(11)
}
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
index 4638f758745..241d5b18c9e 100644
--- a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
+++ b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -8,7 +8,7 @@
import org.slf4j.event.Level;
import org.testcontainers.containers.ContainerLaunchException;
import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
@@ -82,7 +82,7 @@ public HiveMQContainer(final @NotNull DockerImageName dockerImageName) {
addExposedPort(MQTT_PORT);
- waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx("(.*)Started HiveMQ in(.*)"));
+ waitStrategy.withStrategy(Wait.forLogMessage("(.*)Started HiveMQ in(.*)", 1));
waitingFor(waitStrategy);
withLogConsumer(outputFrame -> {
@@ -134,9 +134,9 @@ protected void configure() {
setCommand(
"-c",
removeCommand +
- "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ " +
- "; chmod -R 777 /opt/hivemq/extensions " +
- "&& /opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
+ "cp -r '/opt/hivemq/temp-extensions/'* /opt/hivemq/extensions/ ; " +
+ "chmod -R 777 /opt/hivemq/extensions ; " +
+ "/opt/docker-entrypoint.sh /opt/hivemq/bin/run.sh"
);
}
@@ -160,7 +160,7 @@ protected void containerIsStarted(final @NotNull InspectContainerResponse contai
*/
public @NotNull HiveMQContainer waitForExtension(final @NotNull String extensionName) {
final String regEX = "(.*)Extension \"" + extensionName + "\" version (.*) started successfully(.*)";
- waitStrategy.withStrategy(new LogMessageWaitStrategy().withRegEx(regEX));
+ waitStrategy.withStrategy(Wait.forLogMessage(regEX, 1));
return self();
}
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
index 6fef56c0a2d..a5b6170a228 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
@@ -1,7 +1,10 @@
package org.testcontainers.hivemq;
+import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.event.Level;
import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
import org.testcontainers.utility.DockerImageName;
@@ -11,12 +14,18 @@
class ContainerWithExtensionFromDirectoryIT {
- @Test
+ @ParameterizedTest
+ @ValueSource(
+ strings = {
+ "2020.1", // first version that provided a container image
+ "2024.3", // version that runs the image as a non-root user by default
+ }
+ )
@Timeout(value = 3, unit = TimeUnit.MINUTES)
- void test() throws Exception {
+ void test(final @NotNull String hivemqCeTag) throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
)
.withExtension(MountableFile.forClasspathResource("/modifier-extension"))
.waitForExtension("Modifier Extension")
@@ -33,7 +42,7 @@ void test() throws Exception {
void test_wrongDirectoryName() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.withExtension(MountableFile.forClasspathResource("/modifier-extension-wrong-name"))
.waitForExtension("Modifier Extension")
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
index eda3f236e2c..2b255912da9 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
@@ -1,7 +1,9 @@
package org.testcontainers.hivemq;
-import org.junit.jupiter.api.Test;
+import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.testcontainers.hivemq.util.MyExtension;
import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
import org.testcontainers.utility.DockerImageName;
@@ -11,9 +13,15 @@
class ContainerWithExtensionIT {
- @Test
+ @ParameterizedTest
+ @ValueSource(
+ strings = {
+ "2020.1", // first version that provided a container image
+ "2024.3", // version that runs the image as a non-root user by default
+ }
+ )
@Timeout(value = 3, unit = TimeUnit.MINUTES)
- void test() throws Exception {
+ void test(final @NotNull String hivemqCeTag) throws Exception {
final HiveMQExtension hiveMQExtension = HiveMQExtension
.builder()
.id("extension-1")
@@ -24,7 +32,7 @@ void test() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
)
.withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
.waitForExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
index cd1df9ce8e7..a907b8f2d2e 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
@@ -25,7 +25,7 @@ void test() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.waitForExtension(hiveMQExtension)
.withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
index dde5e677a15..c3c74b0dce7 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
@@ -9,8 +9,9 @@
import com.hivemq.extension.sdk.api.services.Services;
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
@@ -22,9 +23,15 @@
class ContainerWithFileInExtensionHomeIT {
- @Test
+ @ParameterizedTest
+ @ValueSource(
+ strings = {
+ "2020.1", // first version that provided a container image
+ "2024.3", // version that runs the image as a non-root user by default
+ }
+ )
@Timeout(value = 3, unit = TimeUnit.MINUTES)
- void test() throws Exception {
+ void test(final @NotNull String hivemqCeTag) throws Exception {
final HiveMQExtension hiveMQExtension = HiveMQExtension
.builder()
.id("extension-1")
@@ -35,7 +42,7 @@ void test() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
)
.withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
.withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
index 78a51398bf3..c8e19316788 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
@@ -35,7 +35,7 @@ void test() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
.withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
index f6aa6ed08f0..3973abddb0b 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
@@ -35,7 +35,7 @@ void test() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
.withExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
index c0e95f61cf6..df0f3ef3b9c 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -47,7 +47,7 @@ void test() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
.withExtension(extension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
index 3e7bec94e6e..6f65ebb1e9f 100755
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
@@ -9,8 +9,9 @@
import com.hivemq.extension.sdk.api.services.Services;
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.testcontainers.hivemq.util.TestPublishModifiedUtil;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
@@ -23,9 +24,15 @@
class CreateFileInExtensionDirectoryIT {
- @Test
+ @ParameterizedTest
+ @ValueSource(
+ strings = {
+ "2020.1", // first version that provided a container image
+ "2024.3", // version that runs the image as a non-root user by default
+ }
+ )
@Timeout(value = 3, unit = TimeUnit.MINUTES)
- void test() throws Exception {
+ void test(final @NotNull String hivemqCeTag) throws Exception {
final HiveMQExtension hiveMQExtension = HiveMQExtension
.builder()
.id("extension-1")
@@ -36,7 +43,7 @@ void test() throws Exception {
try (
final HiveMQContainer hivemq = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag(hivemqCeTag)
)
.withHiveMQConfig(MountableFile.forClasspathResource("/inMemoryConfig.xml"))
.waitForExtension(hiveMQExtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
index 32097e52641..ede972e957d 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/HiveMQTestContainerCore.java
@@ -16,7 +16,7 @@
class HiveMQTestContainerCore {
@NotNull
- final HiveMQContainer container = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"));
+ final HiveMQContainer container = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3"));
@TempDir
File tempDir;
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
index f3289413a36..a1ff664649d 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
@@ -38,7 +38,7 @@ class DemoExtensionTestsIT {
@Container
final HiveMQContainer hivemqWithClasspathExtension = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.waitForExtension(hiveMQEClasspathxtension)
.withExtension(hiveMQEClasspathxtension)
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
index a76fa60576f..8fe08b24750 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
@@ -19,7 +19,7 @@ class DemoFilesIT {
// hivemqHome {
final HiveMQContainer hivemqFileInHome = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.withFileInHomeFolder(
MountableFile.forHostPath("src/test/resources/additionalFile.txt"),
@@ -31,7 +31,7 @@ class DemoFilesIT {
// extensionHome {
@Container
final HiveMQContainer hivemqFileInExtensionHome = new HiveMQContainer(
- DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3")
+ DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3")
)
.withExtension(
HiveMQExtension
@@ -52,7 +52,7 @@ class DemoFilesIT {
// withLicenses {
@Container
- final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+ final HiveMQContainer hivemq = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3"))
.withLicense(MountableFile.forHostPath("src/test/resources/myLicense.lic"))
.withLicense(MountableFile.forHostPath("src/test/resources/myExtensionLicense.elic"));
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
index db6e3e58251..ed063617537 100644
--- a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
+++ b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -18,7 +18,7 @@ class DemoHiveMQContainerIT {
// ceVersion {
@Container
- final HiveMQContainer hivemqCe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2021.3"))
+ final HiveMQContainer hivemqCe = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce").withTag("2024.3"))
.withLogLevel(Level.DEBUG);
// }
@@ -43,7 +43,7 @@ class DemoHiveMQContainerIT {
// specificVersion {
@Container
- final HiveMQContainer hivemqSpecificVersion = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce:2021.3"));
+ final HiveMQContainer hivemqSpecificVersion = new HiveMQContainer(DockerImageName.parse("hivemq/hivemq-ce:2024.3"));
// }
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
index 01f902d92e7..145aa4aac52 100644
--- a/modules/influxdb/build.gradle
+++ b/modules/influxdb/build.gradle
@@ -3,9 +3,8 @@ description = "Testcontainers :: InfluxDB"
dependencies {
api project(':testcontainers')
- compileOnly 'org.influxdb:influxdb-java:2.24'
+ compileOnly 'org.influxdb:influxdb-java:2.25'
- testImplementation 'org.assertj:assertj-core:3.25.1'
- testImplementation 'org.influxdb:influxdb-java:2.24'
- testImplementation "com.influxdb:influxdb-client-java:6.12.0"
+ testImplementation 'org.influxdb:influxdb-java:2.25'
+ testImplementation "com.influxdb:influxdb-client-java:7.5.0"
}
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
index a3862fb7242..53678fa6dce 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java
@@ -11,7 +11,7 @@
import com.influxdb.client.write.Point;
import com.influxdb.query.FluxRecord;
import com.influxdb.query.FluxTable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.utility.DockerImageName;
import java.time.Instant;
@@ -20,7 +20,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-public class InfluxDBContainerTest {
+class InfluxDBContainerTest {
private static final String USERNAME = "new-test-user";
@@ -37,7 +37,7 @@ public class InfluxDBContainerTest {
private static final int SECONDS_IN_WEEK = 604800;
@Test
- public void getInfluxDBClient() {
+ void getInfluxDBClient() {
try (
// constructorWithDefaultVariables {
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
@@ -55,7 +55,7 @@ public void getInfluxDBClient() {
}
@Test
- public void getInfluxDBClientWithAdminToken() {
+ void getInfluxDBClientWithAdminToken() {
try (
// constructorWithAdminToken {
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
@@ -81,7 +81,7 @@ public void getInfluxDBClientWithAdminToken() {
}
@Test
- public void getBucket() {
+ void getBucket() {
try (
// constructorWithCustomVariables {
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
@@ -111,7 +111,7 @@ public void getBucket() {
}
@Test
- public void queryForWriteAndRead() {
+ void queryForWriteAndRead() {
try (
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
InfluxDBTestUtils.INFLUXDB_V2_TEST_IMAGE
diff --git a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
index c9e292c5675..ea074cee68e 100644
--- a/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
+++ b/modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java
@@ -5,14 +5,14 @@
import org.influxdb.dto.Point;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.utility.DockerImageName;
import java.util.concurrent.TimeUnit;
import static org.assertj.core.api.Assertions.assertThat;
-public class InfluxDBContainerV1Test {
+class InfluxDBContainerV1Test {
private static final String TEST_VERSION = InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE.getVersionPart();
@@ -23,7 +23,7 @@ public class InfluxDBContainerV1Test {
private static final String PASSWORD = "new-test-password";
@Test
- public void createInfluxDBOnlyWithUrlAndCorrectVersion() {
+ void createInfluxDBOnlyWithUrlAndCorrectVersion() {
try (
// constructorWithDefaultVariables {
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
@@ -43,7 +43,7 @@ public void createInfluxDBOnlyWithUrlAndCorrectVersion() {
}
@Test
- public void getNewInfluxDBWithCorrectVersion() {
+ void getNewInfluxDBWithCorrectVersion() {
try (
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE
@@ -61,7 +61,7 @@ public void getNewInfluxDBWithCorrectVersion() {
}
@Test
- public void describeDatabases() {
+ void describeDatabases() {
try (
// constructorWithUserPassword {
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
@@ -82,7 +82,7 @@ public void describeDatabases() {
}
@Test
- public void queryForWriteAndRead() {
+ void queryForWriteAndRead() {
try (
final InfluxDBContainer influxDBContainer = new InfluxDBContainer<>(
InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
index 01f1b35632a..44fe705a255 100644
--- a/modules/jdbc-test/build.gradle
+++ b/modules/jdbc-test/build.gradle
@@ -1,16 +1,15 @@
dependencies {
- api project(':jdbc')
+ api project(':testcontainers-jdbc')
- api 'com.google.guava:guava:33.0.0-jre'
- api 'org.apache.commons:commons-lang3:3.14.0'
+ api 'com.google.guava:guava:33.5.0-jre'
+ api 'org.apache.commons:commons-lang3:3.20.0'
api 'com.zaxxer:HikariCP-java6:2.3.13'
api 'commons-dbutils:commons-dbutils:1.8.1'
- api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
+ api 'org.assertj:assertj-core:3.27.7'
- api 'org.assertj:assertj-core:3.25.1'
-
- api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
- api 'org.vibur:vibur-dbcp:25.0'
- api 'mysql:mysql-connector-java:8.0.33'
+ api 'org.apache.tomcat:tomcat-jdbc:11.0.23'
+ api 'org.vibur:vibur-dbcp:26.0'
+ api 'com.mysql:mysql-connector-j:9.6.0'
+ api 'org.junit.jupiter:junit-jupiter:5.14.3'
}
diff --git a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
index a22b4e24ed0..95f9d5d1ad4 100644
--- a/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
+++ b/modules/jdbc-test/src/main/java/org/testcontainers/jdbc/AbstractJDBCDriverTest.java
@@ -4,9 +4,11 @@
import com.zaxxer.hikari.HikariDataSource;
import org.apache.commons.dbutils.QueryRunner;
import org.apache.commons.lang3.SystemUtils;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runners.Parameterized.Parameter;
+import org.junit.jupiter.api.AfterAll;
+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.sql.Connection;
import java.sql.ResultSet;
@@ -15,8 +17,10 @@
import java.util.EnumSet;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeFalse;
+import static org.assertj.core.api.Assumptions.assumeThat;
+@ParameterizedClass
+@MethodSource("data")
public class AbstractJDBCDriverTest {
protected enum Options {
@@ -27,7 +31,7 @@ protected enum Options {
PmdKnownBroken,
}
- @Parameter
+ @Parameter(0)
public String jdbcUrl;
@Parameter(1)
@@ -39,13 +43,13 @@ public static void sampleInitFunction(Connection connection) throws SQLException
connection.createStatement().execute("CREATE TABLE my_counter (\n" + " n INT\n" + ");");
}
- @AfterClass
+ @AfterAll
public static void testCleanup() {
ContainerDatabaseDriver.killContainers();
}
@Test
- public void test() throws SQLException {
+ void test() throws SQLException {
try (HikariDataSource dataSource = getDataSource(jdbcUrl, 1)) {
performSimpleTest(dataSource);
@@ -130,7 +134,8 @@ private void performTestForJDBCParamUsage(HikariDataSource dataSource) throws SQ
if (
databaseType.equalsIgnoreCase("postgresql") ||
databaseType.equalsIgnoreCase("postgis") ||
- databaseType.equalsIgnoreCase("timescaledb")
+ databaseType.equalsIgnoreCase("timescaledb") ||
+ databaseType.equalsIgnoreCase("pgvector")
) {
databaseQuery = "SELECT CURRENT_DATABASE()";
}
@@ -202,7 +207,7 @@ private HikariDataSource verifyCharacterSet(String jdbcUrl) throws SQLException
}
private void performTestForCustomIniFile(HikariDataSource dataSource) throws SQLException {
- assumeFalse(SystemUtils.IS_OS_WINDOWS);
+ assumeThat(SystemUtils.IS_OS_WINDOWS).isFalse();
Statement statement = dataSource.getConnection().createStatement();
statement.execute("SELECT @@GLOBAL.innodb_max_undo_log_size");
ResultSet resultSet = statement.getResultSet();
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index 927d275c312..4d538fe2720 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -1,14 +1,13 @@
description = "Testcontainers :: JDBC"
dependencies {
- api project(':database-commons')
+ api project(':testcontainers-database-commons')
- compileOnly 'org.jetbrains:annotations:24.1.0'
+ compileOnly 'org.jetbrains:annotations:26.1.0'
testImplementation 'commons-dbutils:commons-dbutils:1.8.1'
- testImplementation 'org.vibur:vibur-dbcp:25.0'
- testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.18'
+ testImplementation 'org.vibur:vibur-dbcp:26.0'
+ testImplementation 'org.apache.tomcat:tomcat-jdbc:11.0.21'
testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
- testImplementation 'org.assertj:assertj-core:3.25.1'
testImplementation ('org.mockito:mockito-core:4.11.0') {
exclude(module: 'hamcrest-core')
}
diff --git a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
index 9533a4c7d10..cf6c995528f 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
@@ -17,10 +17,15 @@
import java.sql.Driver;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -34,7 +39,7 @@ public abstract class JdbcDatabaseContainer initScriptPaths = new ArrayList<>();
protected Map parameters = new HashMap<>();
@@ -132,8 +137,37 @@ public SELF withConnectTimeoutSeconds(int connectTimeoutSeconds) {
return self();
}
+ /**
+ * Sets a script for initialization.
+ *
+ * @param initScriptPath path to the script file
+ * @return self
+ */
public SELF withInitScript(String initScriptPath) {
- this.initScriptPath = initScriptPath;
+ this.initScriptPaths = new ArrayList<>();
+ this.initScriptPaths.add(initScriptPath);
+ return self();
+ }
+
+ /**
+ * Sets an ordered array of scripts for initialization.
+ *
+ * @param initScriptPaths paths to the script files
+ * @return self
+ */
+ public SELF withInitScripts(String... initScriptPaths) {
+ return withInitScripts(Arrays.asList(initScriptPaths));
+ }
+
+ /**
+ * Sets an ordered collection of scripts for initialization.
+ *
+ * @param initScriptPaths paths to the script files
+ * @return self
+ */
+ public SELF withInitScripts(Iterable initScriptPaths) {
+ this.initScriptPaths = new ArrayList<>();
+ initScriptPaths.forEach(this.initScriptPaths::add);
return self();
}
@@ -148,10 +182,10 @@ protected void waitUntilContainerStarted() {
);
// Repeatedly try and open a connection to the DB and execute a test query
- long start = System.currentTimeMillis();
+ long start = System.nanoTime();
Exception lastConnectionException = null;
- while (System.currentTimeMillis() < start + (1000 * startupTimeoutSeconds)) {
+ while ((System.nanoTime() - start) < TimeUnit.SECONDS.toNanos(startupTimeoutSeconds)) {
if (!isRunning()) {
Thread.sleep(100L);
} else {
@@ -238,9 +272,9 @@ public Connection createConnection(String queryString, Properties info)
SQLException lastException = null;
try {
- long start = System.currentTimeMillis();
+ long start = System.nanoTime();
// give up if we hit the time limit or the container stops running for some reason
- while (System.currentTimeMillis() < start + (1000 * connectTimeoutSeconds) && isRunning()) {
+ while ((System.nanoTime() - start < TimeUnit.SECONDS.toNanos(connectTimeoutSeconds)) && isRunning()) {
try {
logger()
.debug(
@@ -328,9 +362,10 @@ protected void optionallyMapResourceParameterAsVolume(
* Load init script content and apply it to the database if initScriptPath is set
*/
protected void runInitScriptIfRequired() {
- if (initScriptPath != null) {
- ScriptUtils.runInitScript(getDatabaseDelegate(), initScriptPath);
- }
+ initScriptPaths
+ .stream()
+ .filter(Objects::nonNull)
+ .forEach(path -> ScriptUtils.runInitScript(getDatabaseDelegate(), path));
}
public void setParameters(Map parameters) {
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
index e1309f66197..ec606f3ed32 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -107,7 +107,7 @@ private void parseUrl() {
//In case it matches to the default pattern
Matcher dbInstanceMatcher = Patterns.DB_INSTANCE_MATCHING_PATTERN.matcher(dbHostString);
if (dbInstanceMatcher.matches()) {
- databaseHost = Optional.of(dbInstanceMatcher.group("databaseHost"));
+ databaseHost = Optional.ofNullable(dbInstanceMatcher.group("databaseHost"));
databasePort = Optional.ofNullable(dbInstanceMatcher.group("databasePort")).map(Integer::valueOf);
databaseName = Optional.of(dbInstanceMatcher.group("databaseName"));
}
@@ -227,7 +227,7 @@ public interface Patterns {
//Matches to part of string - hostname:port/databasename
Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile(
- "(?[^:]+)" +
+ "(?[^:]+)?" +
"(:(?[0-9]+))?" +
"(" +
"(?[:/])" +
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
index 3c33eba8d5b..24c18944292 100644
--- a/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
+++ b/modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java
@@ -6,6 +6,7 @@
import org.testcontainers.exception.ConnectionCreationException;
import org.testcontainers.ext.ScriptUtils;
+import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
@@ -17,6 +18,8 @@ public class JdbcDatabaseDelegate extends AbstractDatabaseDelegate {
private JdbcDatabaseContainer container;
+ private Connection connection;
+
private String queryString;
public JdbcDatabaseDelegate(JdbcDatabaseContainer container, String queryString) {
@@ -27,7 +30,8 @@ public JdbcDatabaseDelegate(JdbcDatabaseContainer container, String queryString)
@Override
protected Statement createNewConnection() {
try {
- return container.createConnection(queryString).createStatement();
+ connection = container.createConnection(queryString);
+ return connection.createStatement();
} catch (SQLException e) {
log.error("Could not obtain JDBC connection");
throw new ConnectionCreationException("Could not obtain JDBC connection", e);
@@ -65,6 +69,7 @@ public void execute(
protected void closeConnectionQuietly(Statement statement) {
try {
statement.close();
+ connection.close();
} catch (Exception e) {
log.error("Could not close JDBC connection", e);
}
diff --git a/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
index 1dc6646bd17..ca41c3f5d1c 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/containers/JdbcDatabaseContainerTest.java
@@ -1,7 +1,7 @@
package org.testcontainers.containers;
import lombok.NonNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import java.sql.Connection;
@@ -10,10 +10,10 @@
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.mock;
-public class JdbcDatabaseContainerTest {
+class JdbcDatabaseContainerTest {
@Test
- public void anExceptionIsThrownIfJdbcIsNotAvailable() {
+ void anExceptionIsThrownIfJdbcIsNotAvailable() {
JdbcDatabaseContainer jdbcContainer = new JdbcDatabaseContainerStub("mysql:latest")
.withStartupTimeoutSeconds(1);
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
index 394451bc6a9..5797ee0083c 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlDriversTests.java
@@ -1,127 +1,126 @@
package org.testcontainers.jdbc;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
-import java.util.Arrays;
import java.util.Optional;
+import java.util.stream.Stream;
import static org.assertj.core.api.Assertions.assertThat;
/**
* This Test class validates that all supported JDBC URL's can be parsed by ConnectionUrl class.
*/
-@RunWith(Parameterized.class)
-public class ConnectionUrlDriversTests {
+class ConnectionUrlDriversTests {
- @Parameter
- public String jdbcUrl;
-
- @Parameter(1)
- public String databaseType;
-
- @Parameter(2)
- public Optional tag;
-
- @Parameter(3)
- public String dbHostString;
-
- @Parameter(4)
- public String databaseName;
-
- @Parameterized.Parameters(name = "{index} - {0}")
- public static Iterable data() {
- return Arrays.asList(
- new Object[][] {
- { "jdbc:tc:mysql:8.0.36://hostname/test", "mysql", Optional.of("8.0.36"), "hostname/test", "test" },
- { "jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test" },
- {
- "jdbc:tc:postgresql:1.2.3://hostname/test",
- "postgresql",
- Optional.of("1.2.3"),
- "hostname/test",
- "test",
- },
- { "jdbc:tc:postgresql://hostname/test", "postgresql", Optional.empty(), "hostname/test", "test" },
- {
- "jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test",
- "sqlserver",
- Optional.of("1.2.3"),
- "localhost;instance=SQLEXPRESS:1433;databaseName=test",
- "test",
- },
- {
- "jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test",
- "sqlserver",
- Optional.empty(),
- "localhost;instance=SQLEXPRESS:1433;databaseName=test",
- "test",
- },
- {
- "jdbc:tc:mariadb:1.2.3://localhost:3306/test",
- "mariadb",
- Optional.of("1.2.3"),
- "localhost:3306/test",
- "test",
- },
- { "jdbc:tc:mariadb://localhost:3306/test", "mariadb", Optional.empty(), "localhost:3306/test", "test" },
- {
- "jdbc:tc:oracle:1.2.3:thin://@localhost:1521/test",
- "oracle",
- Optional.of("1.2.3"),
- "localhost:1521/test",
- "test",
- },
- {
- "jdbc:tc:oracle:1.2.3:thin:@localhost:1521/test",
- "oracle",
- Optional.of("1.2.3"),
- "localhost:1521/test",
- "test",
- },
- {
- "jdbc:tc:oracle:thin:@localhost:1521/test",
- "oracle",
- Optional.empty(),
- "localhost:1521/test",
- "test",
- },
- {
- "jdbc:tc:oracle:1.2.3:thin:@localhost:1521:test",
- "oracle",
- Optional.of("1.2.3"),
- "localhost:1521:test",
- "test",
- },
- {
- "jdbc:tc:oracle:1.2.3:thin://@localhost:1521:test",
- "oracle",
- Optional.of("1.2.3"),
- "localhost:1521:test",
- "test",
- },
- {
- "jdbc:tc:oracle:1.2.3-anything:thin://@localhost:1521:test",
- "oracle",
- Optional.of("1.2.3-anything"),
- "localhost:1521:test",
- "test",
- },
- {
- "jdbc:tc:oracle:thin:@localhost:1521:test",
- "oracle",
- Optional.empty(),
- "localhost:1521:test",
- "test",
- },
- }
+ public static Stream data() {
+ return Stream.of(
+ Arguments.arguments(
+ "jdbc:tc:mysql:8.0.36://hostname/test",
+ "mysql",
+ Optional.of("8.0.36"),
+ "hostname/test",
+ "test"
+ ),
+ Arguments.arguments("jdbc:tc:mysql://hostname/test", "mysql", Optional.empty(), "hostname/test", "test"),
+ Arguments.arguments(
+ "jdbc:tc:postgresql:1.2.3://hostname/test",
+ "postgresql",
+ Optional.of("1.2.3"),
+ "hostname/test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:postgresql://hostname/test",
+ "postgresql",
+ Optional.empty(),
+ "hostname/test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:sqlserver:1.2.3://localhost;instance=SQLEXPRESS:1433;databaseName=test",
+ "sqlserver",
+ Optional.of("1.2.3"),
+ "localhost;instance=SQLEXPRESS:1433;databaseName=test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:sqlserver://localhost;instance=SQLEXPRESS:1433;databaseName=test",
+ "sqlserver",
+ Optional.empty(),
+ "localhost;instance=SQLEXPRESS:1433;databaseName=test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:mariadb:1.2.3://localhost:3306/test",
+ "mariadb",
+ Optional.of("1.2.3"),
+ "localhost:3306/test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:mariadb://localhost:3306/test",
+ "mariadb",
+ Optional.empty(),
+ "localhost:3306/test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:oracle:1.2.3:thin://@localhost:1521/test",
+ "oracle",
+ Optional.of("1.2.3"),
+ "localhost:1521/test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:oracle:1.2.3:thin:@localhost:1521/test",
+ "oracle",
+ Optional.of("1.2.3"),
+ "localhost:1521/test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:oracle:thin:@localhost:1521/test",
+ "oracle",
+ Optional.empty(),
+ "localhost:1521/test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:oracle:1.2.3:thin:@localhost:1521:test",
+ "oracle",
+ Optional.of("1.2.3"),
+ "localhost:1521:test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:oracle:1.2.3:thin://@localhost:1521:test",
+ "oracle",
+ Optional.of("1.2.3"),
+ "localhost:1521:test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:oracle:1.2.3-anything:thin://@localhost:1521:test",
+ "oracle",
+ Optional.of("1.2.3-anything"),
+ "localhost:1521:test",
+ "test"
+ ),
+ Arguments.arguments(
+ "jdbc:tc:oracle:thin:@localhost:1521:test",
+ "oracle",
+ Optional.empty(),
+ "localhost:1521:test",
+ "test"
+ )
);
}
- @Test
- public void test() {
+ @ParameterizedTest(name = "{index} - {0}")
+ @MethodSource("data")
+ void test(String jdbcUrl, String databaseType, Optional tag, String dbHostString, String databaseName) {
ConnectionUrl url = ConnectionUrl.newInstance(jdbcUrl);
assertThat(url.getDatabaseType()).as("Database Type is as expected").isEqualTo(databaseType);
assertThat(url.getImageTag()).as("Image tag is as expected").isEqualTo(tag);
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
index 123690d95f6..16abff74ec9 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -1,18 +1,14 @@
package org.testcontainers.jdbc;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
-public class ConnectionUrlTest {
-
- @Rule
- public ExpectedException thrown = ExpectedException.none();
+class ConnectionUrlTest {
@Test
- public void testConnectionUrl1() {
+ void testConnectionUrl1() {
String urlString = "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d";
ConnectionUrl url = ConnectionUrl.newInstance(urlString);
@@ -31,7 +27,7 @@ public void testConnectionUrl1() {
}
@Test
- public void testConnectionUrl2() {
+ void testConnectionUrl2() {
String urlString = "jdbc:tc:mysql://somehostname/databasename";
ConnectionUrl url = ConnectionUrl.newInstance(urlString);
@@ -49,13 +45,13 @@ public void testConnectionUrl2() {
}
@Test
- public void testEmptyQueryParameter() {
+ void testEmptyQueryParameter() {
ConnectionUrl url = ConnectionUrl.newInstance("jdbc:tc:mysql://somehostname/databasename?key=");
assertThat(url.getQueryParameters().get("key")).as("'key' property value").isEqualTo("");
}
@Test
- public void testTmpfsOption() {
+ void testTmpfsOption() {
String urlString = "jdbc:tc:mysql://somehostname/databasename?TC_TMPFS=key:value,key1:value1";
ConnectionUrl url = ConnectionUrl.newInstance(urlString);
@@ -69,7 +65,7 @@ public void testTmpfsOption() {
}
@Test
- public void testInitScriptPathCapture() {
+ void testInitScriptPathCapture() {
String urlString =
"jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_INITSCRIPT=somepath/init_mysql.sql";
ConnectionUrl url = ConnectionUrl.newInstance(urlString);
@@ -83,13 +79,14 @@ public void testInitScriptPathCapture() {
.containsEntry("TC_INITSCRIPT", "somepath/init_mysql.sql");
//Parameter sets are unmodifiable
- thrown.expect(UnsupportedOperationException.class);
- url.getContainerParameters().remove("TC_INITSCRIPT");
- url.getQueryParameters().remove("a");
+ assertThatThrownBy(() -> url.getContainerParameters().remove("TC_INITSCRIPT"))
+ .isInstanceOf(UnsupportedOperationException.class);
+ assertThatThrownBy(() -> url.getQueryParameters().remove("a"))
+ .isInstanceOf(UnsupportedOperationException.class);
}
@Test
- public void testInitFunctionCapture() {
+ void testInitFunctionCapture() {
String urlString =
"jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction";
ConnectionUrl url = ConnectionUrl.newInstance(urlString);
@@ -105,10 +102,26 @@ public void testInitFunctionCapture() {
}
@Test
- public void testDaemonCapture() {
+ void testDaemonCapture() {
String urlString = "jdbc:tc:mysql:8.0.36://somehostname:3306/databasename?a=b&c=d&TC_DAEMON=true";
ConnectionUrl url = ConnectionUrl.newInstance(urlString);
assertThat(url.isInDaemonMode()).as("Daemon flag is set to true.").isTrue();
}
+
+ @Test
+ void testHostLessConnectionUrl() {
+ String urlString = "jdbc:tc:mysql:8.0.36:///databasename?a=b&c=d";
+ ConnectionUrl url = ConnectionUrl.newInstance(urlString);
+
+ assertThat(url.getDatabaseType()).as("Database Type value is as expected").isEqualTo("mysql");
+ assertThat(url.getImageTag()).as("Database Image tag value is as expected").contains("8.0.36");
+ assertThat(url.getQueryString()).as("Query String value is as expected").contains("?a=b&c=d");
+ assertThat(url.getDatabaseHost()).as("Database Host value is as expected").isEmpty();
+ assertThat(url.getDatabasePort()).as("Database Port value is as expected").isEmpty();
+ assertThat(url.getDatabaseName()).as("Database Name value is as expected").contains("databasename");
+
+ assertThat(url.getQueryParameters()).as("Parameter a is captured").containsEntry("a", "b");
+ assertThat(url.getQueryParameters()).as("Parameter c is captured").containsEntry("c", "d");
+ }
}
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
index 4edd5d449ba..767258e19a1 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerDatabaseDriverTest.java
@@ -1,9 +1,6 @@
package org.testcontainers.jdbc;
-import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -11,25 +8,23 @@
import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
-public class ContainerDatabaseDriverTest {
+class ContainerDatabaseDriverTest {
private static final String PLAIN_POSTGRESQL_JDBC_URL = "jdbc:postgresql://localhost:5432/test";
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
@Test
- public void shouldNotTryToConnectToNonMatchingJdbcUrlDirectly() throws SQLException {
+ void shouldNotTryToConnectToNonMatchingJdbcUrlDirectly() throws SQLException {
ContainerDatabaseDriver driver = new ContainerDatabaseDriver();
Connection connection = driver.connect(PLAIN_POSTGRESQL_JDBC_URL, new Properties());
assertThat(connection).isNull();
}
@Test
- public void shouldNotTryToConnectToNonMatchingJdbcUrlViaDriverManager() throws SQLException {
- thrown.expect(SQLException.class);
- thrown.expectMessage(CoreMatchers.startsWith("No suitable driver found for "));
- DriverManager.getConnection(PLAIN_POSTGRESQL_JDBC_URL);
+ void shouldNotTryToConnectToNonMatchingJdbcUrlViaDriverManager() throws SQLException {
+ assertThatThrownBy(() -> DriverManager.getConnection(PLAIN_POSTGRESQL_JDBC_URL))
+ .isInstanceOf(SQLException.class)
+ .hasMessageStartingWith("No suitable driver found for ");
}
}
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java
new file mode 100644
index 00000000000..e6233e14b9f
--- /dev/null
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/JdbcDatabaseDelegateTest.java
@@ -0,0 +1,87 @@
+package org.testcontainers.jdbc;
+
+import lombok.NonNull;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class JdbcDatabaseDelegateTest {
+
+ @Test
+ void testLeakedConnections() {
+ final JdbcDatabaseContainerStub stub = new JdbcDatabaseContainerStub(DockerImageName.parse("something"));
+ try (JdbcDatabaseDelegate delegate = new JdbcDatabaseDelegate(stub, "")) {
+ delegate.execute("foo", null, 0, false, false);
+ }
+ assertThat(stub.openConnectionsList.size()).isZero();
+ }
+
+ static class JdbcDatabaseContainerStub extends JdbcDatabaseContainer {
+
+ List openConnectionsList = new ArrayList<>();
+
+ public JdbcDatabaseContainerStub(@NonNull DockerImageName dockerImageName) {
+ super(dockerImageName);
+ }
+
+ @Override
+ public String getDriverClassName() {
+ return null;
+ }
+
+ @Override
+ public String getJdbcUrl() {
+ return null;
+ }
+
+ @Override
+ public String getUsername() {
+ return null;
+ }
+
+ @Override
+ public String getPassword() {
+ return null;
+ }
+
+ @Override
+ protected String getTestQueryString() {
+ return null;
+ }
+
+ @Override
+ public boolean isRunning() {
+ return true;
+ }
+
+ @Override
+ public Connection createConnection(String queryString) throws NoDriverFoundException, SQLException {
+ final Connection connection = mock(Connection.class);
+ openConnectionsList.add(connection);
+ when(connection.createStatement()).thenReturn(mock(Statement.class));
+ connection.close();
+ Mockito.doAnswer(ignore -> openConnectionsList.remove(connection)).when(connection).close();
+ return connection;
+ }
+
+ @Override
+ protected Logger logger() {
+ return mock(Logger.class);
+ }
+
+ @Override
+ public void setDockerImageName(@NonNull String dockerImageName) {}
+ }
+}
diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
index 9f6b354818d..469234e15a6 100644
--- a/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
+++ b/modules/jdbc/src/test/java/org/testcontainers/jdbc/MissingJdbcDriverTest.java
@@ -1,7 +1,7 @@
package org.testcontainers.jdbc;
import com.google.common.base.Throwables;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.utility.DockerImageName;
@@ -12,10 +12,10 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
-public class MissingJdbcDriverTest {
+class MissingJdbcDriverTest {
@Test
- public void shouldFailFastIfNoDriverFound() {
+ void shouldFailFastIfNoDriverFound() {
final MissingDriverContainer container = new MissingDriverContainer();
try {
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
index 95e0e7b1223..b9ac700cea4 100644
--- a/modules/junit-jupiter/build.gradle
+++ b/modules/junit-jupiter/build.gradle
@@ -2,27 +2,18 @@ description = "Testcontainers :: JUnit Jupiter Extension"
dependencies {
api project(':testcontainers')
- implementation platform('org.junit:junit-bom:5.10.1')
+ implementation platform('org.junit:junit-bom:5.14.3')
implementation 'org.junit.jupiter:junit-jupiter-api'
- testImplementation project(':mysql')
- testImplementation project(':postgresql')
- testImplementation 'com.zaxxer:HikariCP:4.0.3'
- testImplementation 'redis.clients:jedis:5.1.0'
+ testImplementation project(':testcontainers-mysql')
+ testImplementation project(':testcontainers-postgresql')
+ testImplementation 'com.zaxxer:HikariCP:7.0.2'
+ testImplementation 'redis.clients:jedis:7.5.3'
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
testImplementation ('org.mockito:mockito-core:4.11.0') {
exclude(module: 'hamcrest-core')
}
- testImplementation 'org.assertj:assertj-core:3.25.1'
- testImplementation 'org.junit.jupiter:junit-jupiter'
- testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
- testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
-}
-
-test {
- useJUnitPlatform()
- testLogging {
- events "passed", "skipped", "failed"
- }
+ testRuntimeOnly 'org.postgresql:postgresql:42.7.12'
+ testRuntimeOnly 'com.mysql:mysql-connector-j:9.6.0'
}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/DockerAvailableDetector.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/DockerAvailableDetector.java
new file mode 100644
index 00000000000..804568e7dfc
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/DockerAvailableDetector.java
@@ -0,0 +1,15 @@
+package org.testcontainers.junit.jupiter;
+
+import org.testcontainers.DockerClientFactory;
+
+class DockerAvailableDetector {
+
+ public boolean isDockerAvailable() {
+ try {
+ DockerClientFactory.instance().client();
+ return true;
+ } catch (Throwable ex) {
+ return false;
+ }
+ }
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailable.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailable.java
new file mode 100644
index 00000000000..6c78cbb7759
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailable.java
@@ -0,0 +1,19 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * {@code EnabledIfDockerAvailable} is a JUnit Jupiter extension to enable tests only if Docker is available.
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@ExtendWith(EnabledIfDockerAvailableCondition.class)
+public @interface EnabledIfDockerAvailable {
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
new file mode 100644
index 00000000000..6067a9b4f4e
--- /dev/null
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/EnabledIfDockerAvailableCondition.java
@@ -0,0 +1,47 @@
+package org.testcontainers.junit.jupiter;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+import java.util.Optional;
+
+class EnabledIfDockerAvailableCondition implements ExecutionCondition {
+
+ private final DockerAvailableDetector dockerDetector = new DockerAvailableDetector();
+
+ @Override
+ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+ return findAnnotation(context)
+ .map(this::evaluate)
+ .orElseThrow(() -> new ExtensionConfigurationException("@EnabledIfDockerAvailable not found"));
+ }
+
+ boolean isDockerAvailable() {
+ return this.dockerDetector.isDockerAvailable();
+ }
+
+ private ConditionEvaluationResult evaluate(EnabledIfDockerAvailable testcontainers) {
+ if (isDockerAvailable()) {
+ return ConditionEvaluationResult.enabled("Docker is available");
+ }
+ return ConditionEvaluationResult.disabled("Docker is not available");
+ }
+
+ private Optional findAnnotation(ExtensionContext context) {
+ Optional current = Optional.of(context);
+ while (current.isPresent()) {
+ Optional enabledIfDockerAvailable = AnnotationSupport.findAnnotation(
+ current.get().getRequiredTestClass(),
+ EnabledIfDockerAvailable.class
+ );
+ if (enabledIfDockerAvailable.isPresent()) {
+ return enabledIfDockerAvailable;
+ }
+ current = current.get().getParent();
+ }
+ return Optional.empty();
+ }
+}
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index ca99a2d2382..89adba6033f 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -16,7 +16,6 @@
import org.junit.platform.commons.support.HierarchyTraversalMode;
import org.junit.platform.commons.support.ModifierSupport;
import org.junit.platform.commons.support.ReflectionSupport;
-import org.testcontainers.DockerClientFactory;
import org.testcontainers.lifecycle.Startable;
import org.testcontainers.lifecycle.Startables;
import org.testcontainers.lifecycle.TestDescription;
@@ -42,6 +41,8 @@ public class TestcontainersExtension
private static final String LOCAL_LIFECYCLE_AWARE_CONTAINERS = "localLifecycleAwareContainers";
+ private final DockerAvailableDetector dockerDetector = new DockerAvailableDetector();
+
@Override
public void beforeAll(ExtensionContext context) {
Class testClass = context
@@ -192,12 +193,7 @@ private ConditionEvaluationResult evaluate(Testcontainers testcontainers) {
}
boolean isDockerAvailable() {
- try {
- DockerClientFactory.instance().client();
- return true;
- } catch (Throwable ex) {
- return false;
- }
+ return this.dockerDetector.isDockerAvailable();
}
private Set