From 1a5fb3e2d232be1216c223fe0bec783acc99bc2f Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 16 Aug 2022 21:33:31 +0930 Subject: [PATCH 01/21] getLivenessCheckPortNumbers() should return mapped port --- .../containers/MSSQLServerContainer.java | 2 +- .../junit/mssqlserver/SimpleMSSQLServerTest.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java index 532316fb967..17caa0b9f4c 100644 --- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java +++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java @@ -64,7 +64,7 @@ public MSSQLServerContainer(final DockerImageName dockerImageName) { @Override public Set getLivenessCheckPortNumbers() { - return Sets.newHashSet(MS_SQL_SERVER_PORT); + return Sets.newHashSet(getMappedPort(MS_SQL_SERVER_PORT)); } @Override diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java index 15edbaa2ca1..22aadabb2af 100644 --- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java +++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java @@ -3,6 +3,7 @@ import org.junit.Test; import org.testcontainers.MSSQLServerTestImages; import org.testcontainers.containers.MSSQLServerContainer; +import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.db.AbstractContainerDatabaseTest; import java.sql.ResultSet; @@ -64,4 +65,14 @@ public void testSetupDatabase() throws SQLException { assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(3); } } + + @Test + public void testListeningPortWaitStrategy() throws Exception { + try ( + MSSQLServerContainer mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE) + ) { + mssqlServer.start(); + Wait.forListeningPort().waitUntilReady(mssqlServer); + } + } } From 4b68ef327938168e8a402a63790f4bf9b6e29641 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Thu, 18 Aug 2022 21:36:54 +0930 Subject: [PATCH 02/21] refactor to exclude unnecessary getLivenessCheckPortNumbers override --- .../org/testcontainers/containers/MSSQLServerContainer.java | 5 ----- .../junit/mssqlserver/SimpleMSSQLServerTest.java | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java index 17caa0b9f4c..2ca8cedabb7 100644 --- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java +++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java @@ -62,11 +62,6 @@ public MSSQLServerContainer(final DockerImageName dockerImageName) { addExposedPort(MS_SQL_SERVER_PORT); } - @Override - public Set getLivenessCheckPortNumbers() { - return Sets.newHashSet(getMappedPort(MS_SQL_SERVER_PORT)); - } - @Override protected void configure() { // If license was not accepted programatically, check if it was accepted via resource file diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java index 22aadabb2af..c3d95d2d3c4 100644 --- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java +++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java @@ -13,6 +13,7 @@ import javax.sql.DataSource; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest { @@ -67,12 +68,13 @@ public void testSetupDatabase() throws SQLException { } @Test - public void testListeningPortWaitStrategy() throws Exception { + public void testExposedAndLivenessCheckPorts() throws Exception { try ( MSSQLServerContainer mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE) ) { mssqlServer.start(); - Wait.forListeningPort().waitUntilReady(mssqlServer); + assertThat(mssqlServer.getExposedPorts()).containsExactly(MSSQLServerContainer.MS_SQL_SERVER_PORT); + assertThat(mssqlServer.getLivenessCheckPortNumbers()).containsExactly(mssqlServer.getMappedPort(1433)); } } } From 4612773afd9aa8cf7aaf9e25b6d5a6f81bc20a26 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Thu, 18 Aug 2022 21:37:51 +0930 Subject: [PATCH 03/21] MySQL liveness check port numbers were missing --- .../testcontainers/containers/MySQLContainer.java | 7 +------ .../testcontainers/junit/mysql/SimpleMySQLTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java index 14206018954..dedec0798fc 100644 --- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java +++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java @@ -4,6 +4,7 @@ import org.testcontainers.utility.DockerImageName; import java.util.HashSet; +import java.util.List; import java.util.Set; /** @@ -56,12 +57,6 @@ public MySQLContainer(final DockerImageName dockerImageName) { addExposedPort(MYSQL_PORT); } - @NotNull - @Override - protected Set getLivenessCheckPorts() { - return new HashSet<>(getMappedPort(MYSQL_PORT)); - } - @Override protected void configure() { optionallyMapResourceParameterAsVolume( diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java index 146010058ac..c9d1d3174aa 100644 --- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java @@ -237,4 +237,16 @@ public void testWithAdditionalUrlParamInJdbcUrl() { mysql.stop(); } } + + @Test + public void testExposedAndLivenessCheckPorts() { + try ( + MySQLContainer mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE) + .withLogConsumer(new Slf4jLogConsumer(logger)); + ) { + mysql.start(); + assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT); + assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); + } + } } From 707fce017e67ce193689a6d67fd8c31b86c9e842 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Thu, 18 Aug 2022 22:13:09 +0930 Subject: [PATCH 04/21] Apply formatting --- .../org/testcontainers/containers/MSSQLServerContainer.java | 2 -- .../junit/mssqlserver/SimpleMSSQLServerTest.java | 2 -- .../java/org/testcontainers/containers/MySQLContainer.java | 5 ----- .../java/org/testcontainers/junit/mysql/SimpleMySQLTest.java | 3 ++- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java index 2ca8cedabb7..9f13c7f47fb 100644 --- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java +++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java @@ -1,10 +1,8 @@ package org.testcontainers.containers; -import com.google.common.collect.Sets; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.LicenseAcceptance; -import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Stream; diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java index c3d95d2d3c4..b893a8b7737 100644 --- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java +++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java @@ -3,7 +3,6 @@ import org.junit.Test; import org.testcontainers.MSSQLServerTestImages; import org.testcontainers.containers.MSSQLServerContainer; -import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.db.AbstractContainerDatabaseTest; import java.sql.ResultSet; @@ -13,7 +12,6 @@ import javax.sql.DataSource; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; public class SimpleMSSQLServerTest extends AbstractContainerDatabaseTest { diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java index dedec0798fc..f5e575ff311 100644 --- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java +++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java @@ -1,12 +1,7 @@ package org.testcontainers.containers; -import org.jetbrains.annotations.NotNull; import org.testcontainers.utility.DockerImageName; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author richardnorth */ diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java index c9d1d3174aa..c5981c5afff 100644 --- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java @@ -246,7 +246,8 @@ public void testExposedAndLivenessCheckPorts() { ) { mysql.start(); assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT); - assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); + assertThat(mysql.getLivenessCheckPortNumbers()) + .containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); } } } From ccfbf7913c39ec3e6cf0a169819f95a08ea891a3 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 20 Aug 2022 10:44:24 +0930 Subject: [PATCH 05/21] Make fixes binary compatible --- .../containers/MSSQLServerContainer.java | 6 ++++++ .../testcontainers/containers/MySQLContainer.java | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java index 9f13c7f47fb..8ab3c1113a2 100644 --- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java +++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java @@ -3,6 +3,7 @@ import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.LicenseAcceptance; +import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Stream; @@ -60,6 +61,11 @@ public MSSQLServerContainer(final DockerImageName dockerImageName) { addExposedPort(MS_SQL_SERVER_PORT); } + @Override + public Set getLivenessCheckPortNumbers() { + return super.getLivenessCheckPortNumbers(); + } + @Override protected void configure() { // If license was not accepted programatically, check if it was accepted via resource file diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java index f5e575ff311..528dfcf0e6e 100644 --- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java +++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java @@ -1,7 +1,10 @@ package org.testcontainers.containers; +import org.jetbrains.annotations.NotNull; import org.testcontainers.utility.DockerImageName; +import java.util.Set; + /** * @author richardnorth */ @@ -52,6 +55,16 @@ public MySQLContainer(final DockerImageName dockerImageName) { addExposedPort(MYSQL_PORT); } + /** + * @deprecated use {@link #getLivenessCheckPortNumbers()} instead + */ + @NotNull + @Override + @Deprecated + protected Set getLivenessCheckPorts() { + return super.getLivenessCheckPorts(); + } + @Override protected void configure() { optionallyMapResourceParameterAsVolume( From f6db6e4b0d7399907a46354cba33bc99dd8c6302 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 20:05:45 +0930 Subject: [PATCH 06/21] Nginx module to use super liveness check ports --- .../java/org/testcontainers/containers/NginxContainer.java | 7 +++++-- .../java/org/testcontainers/junit/SimpleNginxTest.java | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java index 3e7a2062fd0..2163185f5a7 100644 --- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java +++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java @@ -6,7 +6,6 @@ import java.net.MalformedURLException; import java.net.URL; -import java.util.Collections; import java.util.Set; /** @@ -42,10 +41,14 @@ public NginxContainer(final DockerImageName dockerImageName) { setCommand("nginx", "-g", "daemon off;"); } + /** + * @deprecated use {@link #getLivenessCheckPortNumbers()} instead + */ @NotNull @Override + @Deprecated protected Set getLivenessCheckPorts() { - return Collections.singleton(getMappedPort(80)); + return super.getLivenessCheckPorts(); } public URL getBaseUrl(String scheme, int port) throws MalformedURLException { diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java index 24e913cf281..40b75e14632 100644 --- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java +++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java @@ -60,6 +60,12 @@ public void testSimple() throws Exception { // } } + @Test + public void testExposedAndLivenessCheckPorts() throws Exception { + assertThat(nginx.getExposedPorts()).containsExactly(80); + assertThat(nginx.getLivenessCheckPortNumbers()).containsExactly(nginx.getMappedPort(80)); + } + private static String responseFromNginx(URL baseUrl) throws IOException { URLConnection urlConnection = baseUrl.openConnection(); @Cleanup From d909ee3e0d8e0919cf24f1216a1bb9b2b6578335 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 20:10:50 +0930 Subject: [PATCH 07/21] add deprecated warnings to inherited deprecated methods --- .../java/org/testcontainers/containers/MySQLContainer.java | 1 + .../java/org/testcontainers/containers/NginxContainer.java | 1 + .../org/testcontainers/containers/PostgreSQLContainer.java | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java index 528dfcf0e6e..316e709995c 100644 --- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java +++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java @@ -56,6 +56,7 @@ public MySQLContainer(final DockerImageName dockerImageName) { } /** + * @return the ports on which to check if the container is ready * @deprecated use {@link #getLivenessCheckPortNumbers()} instead */ @NotNull diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java index 2163185f5a7..b97992a5684 100644 --- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java +++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java @@ -42,6 +42,7 @@ public NginxContainer(final DockerImageName dockerImageName) { } /** + * @return the ports on which to check if the container is ready * @deprecated use {@link #getLivenessCheckPortNumbers()} instead */ @NotNull diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java index 3b36b61ea77..63de76b4f3e 100644 --- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java +++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java @@ -62,8 +62,14 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) { addExposedPort(POSTGRESQL_PORT); } + + /** + * @return the ports on which to check if the container is ready + * @deprecated use {@link #getLivenessCheckPortNumbers()} instead + */ @NotNull @Override + @Deprecated protected Set getLivenessCheckPorts() { return Collections.singleton(getMappedPort(POSTGRESQL_PORT)); } From 94e8ad308e43ac1edaaebfd7f6928b319455a6d8 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 20:11:10 +0930 Subject: [PATCH 08/21] PostgresSQL to use super class getLivenessCheckPorts --- .../containers/PostgreSQLContainer.java | 2 +- .../junit/postgresql/SimplePostgreSQLTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java index 63de76b4f3e..1f68adc6707 100644 --- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java +++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java @@ -71,7 +71,7 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) { @Override @Deprecated protected Set getLivenessCheckPorts() { - return Collections.singleton(getMappedPort(POSTGRESQL_PORT)); + return super.getLivenessCheckPorts(); } @Override diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java index 2a7db242421..1b73bab7a7a 100644 --- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java +++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java @@ -86,4 +86,16 @@ public void testWithAdditionalUrlParamInJdbcUrl() { assertThat(jdbcUrl).contains("charSet=UNICODE"); } } + + @Test + public void testExposedAndLivenessCheckPorts() { + try ( + PostgreSQLContainer postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE); + ) { + postgres.start(); + assertThat(postgres.getExposedPorts()).containsExactly(PostgreSQLContainer.POSTGRESQL_PORT); + assertThat(postgres.getLivenessCheckPortNumbers()) + .containsExactly(postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT)); + } + } } From 1342ae11dbc3a470c21953f44fe9b0aa27d0c8fa Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 20:17:30 +0930 Subject: [PATCH 09/21] presto container to use correct liveness check ports and also use super class version --- .../testcontainers/containers/PrestoContainer.java | 7 ++++++- .../containers/PrestoContainerTest.java | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java index e73f6cc0f6b..5b629c4d897 100644 --- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java +++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java @@ -56,10 +56,15 @@ public PrestoContainer(final DockerImageName dockerImageName) { addExposedPort(PRESTO_PORT); } + /** + * @return the ports on which to check if the container is ready + * @deprecated use {@link #getLivenessCheckPortNumbers()} instead + */ @NotNull @Override + @Deprecated protected Set getLivenessCheckPorts() { - return new HashSet<>(getMappedPort(PRESTO_PORT)); + return super.getLivenessCheckPorts(); } @Override diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java index 721186807aa..2c4cea4b05a 100644 --- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java +++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java @@ -149,4 +149,15 @@ public void testTcJdbcUri() throws Exception { .isEqualTo(Connection.TRANSACTION_READ_UNCOMMITTED); } } + + @Test + public void testExposedAndLivenessCheckPorts() { + try (PrestoContainer prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) { + prestoSql.start(); + assertThat(prestoSql.getExposedPorts()) + .containsExactly(PrestoContainer.PRESTO_PORT); + assertThat(prestoSql.getLivenessCheckPortNumbers()) + .containsExactly(prestoSql.getMappedPort(PrestoContainer.PRESTO_PORT)); + } + } } From 5ad92e9326a8226c1777ee4363483775b1d8d99a Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 20:27:38 +0930 Subject: [PATCH 10/21] tidb container to use super class liveness check ports --- .../testcontainers/tidb/TiDBContainer.java | 7 ++- .../junit/tidb/SimpleTiDBTest.java | 54 ------------------- 2 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java index f8030fd2422..cecff8b7a17 100644 --- a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java +++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java @@ -51,10 +51,15 @@ public TiDBContainer(final DockerImageName dockerImageName) { ); } + /** + * @return the ports on which to check if the container is ready + * @deprecated use {@link #getLivenessCheckPortNumbers()} instead + */ @NotNull @Override + @Deprecated protected Set getLivenessCheckPorts() { - return new HashSet<>(getMappedPort(TIDB_PORT)); + return super.getLivenessCheckPorts(); } @Override diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java deleted file mode 100644 index 714c9854f39..00000000000 --- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.testcontainers.junit.tidb; - -import org.junit.Test; -import org.testcontainers.TiDBTestImages; -import org.testcontainers.db.AbstractContainerDatabaseTest; -import org.testcontainers.tidb.TiDBContainer; - -import java.sql.ResultSet; -import java.sql.SQLException; - -import static org.assertj.core.api.Assertions.assertThat; - -public class SimpleTiDBTest extends AbstractContainerDatabaseTest { - - @Test - public void testSimple() throws SQLException { - try (TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE)) { - tidb.start(); - - ResultSet resultSet = performQuery(tidb, "SELECT 1"); - - int resultSetInt = resultSet.getInt(1); - assertThat(resultSetInt).isEqualTo(1); - } - } - - @Test - public void testExplicitInitScript() throws SQLException { - try ( - TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withInitScript("somepath/init_tidb.sql") - ) { // TiDB is expected to be compatible with MySQL - tidb.start(); - - ResultSet resultSet = performQuery(tidb, "SELECT foo FROM bar"); - - String firstColumnValue = resultSet.getString(1); - assertThat(firstColumnValue).isEqualTo("hello world"); - } - } - - @Test - public void testWithAdditionalUrlParamInJdbcUrl() { - TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withUrlParam("sslmode", "disable"); - - try { - tidb.start(); - String jdbcUrl = tidb.getJdbcUrl(); - assertThat(jdbcUrl).contains("?"); - assertThat(jdbcUrl).contains("sslmode=disable"); - } finally { - tidb.stop(); - } - } -} From 210e3044e9e35c40ae015b5ff082eada3c9b776f Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 20:40:20 +0930 Subject: [PATCH 11/21] trino container to get liveness check ports from super class --- .../org/testcontainers/containers/TrinoContainer.java | 7 ++++++- .../testcontainers/containers/TrinoContainerTest.java | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java index 9ed18e96d28..6d9fb47ab2c 100644 --- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java +++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java @@ -37,10 +37,15 @@ public TrinoContainer(final DockerImageName dockerImageName) { addExposedPort(TRINO_PORT); } + /** + * @return the ports on which to check if the container is ready + * @deprecated use {@link #getLivenessCheckPortNumbers()} instead + */ @NotNull @Override + @Deprecated protected Set getLivenessCheckPorts() { - return new HashSet<>(getMappedPort(TRINO_PORT)); + return super.getLivenessCheckPorts(); } @Override diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java index a58944946f0..4d97b52ccd2 100644 --- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java +++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java @@ -61,4 +61,14 @@ public void testInitScript() throws Exception { } } } + + @Test + public void testExposedAndLivenessCheckPorts() { + try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) { + trino.start(); + assertThat(trino.getExposedPorts()).containsExactly(8080); + assertThat(trino.getLivenessCheckPortNumbers()) + .containsExactly(trino.getMappedPort(8080)); + } + } } From 84595d7481869306d6cdbf72489d138d0502b8b8 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 20:55:10 +0930 Subject: [PATCH 12/21] Db2 container to use super class liveness check ports --- .../containers/Db2Container.java | 7 +++- .../junit/db2/SimpleDb2Test.java | 40 ------------------- 2 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java 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 29e2ce8aa07..e481a39fb36 100644 --- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java +++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java @@ -54,9 +54,14 @@ public Db2Container(final DockerImageName dockerImageName) { 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 new HashSet<>(getMappedPort(DB2_PORT)); + return super.getLivenessCheckPorts(); } @Override diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java deleted file mode 100644 index 2c2c4cb2f09..00000000000 --- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.testcontainers.junit.db2; - -import org.junit.Test; -import org.testcontainers.Db2TestImages; -import org.testcontainers.containers.Db2Container; -import org.testcontainers.db.AbstractContainerDatabaseTest; - -import java.sql.ResultSet; -import java.sql.SQLException; - -import static org.assertj.core.api.Assertions.assertThat; - -public class SimpleDb2Test extends AbstractContainerDatabaseTest { - - @Test - public void testSimple() throws SQLException { - try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { - db2.start(); - - ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1"); - - int resultSetInt = resultSet.getInt(1); - assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); - } - } - - @Test - public void testWithAdditionalUrlParamInJdbcUrl() { - try ( - Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE) - .withUrlParam("sslConnection", "false") - .acceptLicense() - ) { - db2.start(); - - String jdbcUrl = db2.getJdbcUrl(); - assertThat(jdbcUrl).contains(":sslConnection=false;"); - } - } -} From ccf58b4597ffb906ae097f25da7a7eab2d560339 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Tue, 23 Aug 2022 21:00:22 +0930 Subject: [PATCH 13/21] apply code formatter --- .../main/java/org/testcontainers/containers/Db2Container.java | 1 - .../org/testcontainers/containers/PostgreSQLContainer.java | 2 -- .../testcontainers/junit/postgresql/SimplePostgreSQLTest.java | 4 +--- .../java/org/testcontainers/containers/PrestoContainer.java | 1 - .../org/testcontainers/containers/PrestoContainerTest.java | 3 +-- .../src/main/java/org/testcontainers/tidb/TiDBContainer.java | 1 - .../java/org/testcontainers/containers/TrinoContainer.java | 1 - .../org/testcontainers/containers/TrinoContainerTest.java | 3 +-- 8 files changed, 3 insertions(+), 13 deletions(-) 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 e481a39fb36..333a2e709c3 100644 --- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java +++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java @@ -6,7 +6,6 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; -import java.util.HashSet; import java.util.Set; public class Db2Container extends JdbcDatabaseContainer { diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java index 1f68adc6707..d3ff65ee351 100644 --- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java +++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java @@ -6,7 +6,6 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; -import java.util.Collections; import java.util.Set; /** @@ -62,7 +61,6 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) { addExposedPort(POSTGRESQL_PORT); } - /** * @return the ports on which to check if the container is ready * @deprecated use {@link #getLivenessCheckPortNumbers()} instead diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java index 1b73bab7a7a..14a85ac7099 100644 --- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java +++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java @@ -89,9 +89,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() { @Test public void testExposedAndLivenessCheckPorts() { - try ( - PostgreSQLContainer postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE); - ) { + try (PostgreSQLContainer postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);) { postgres.start(); assertThat(postgres.getExposedPorts()).containsExactly(PostgreSQLContainer.POSTGRESQL_PORT); assertThat(postgres.getLivenessCheckPortNumbers()) diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java index 5b629c4d897..5c89682643a 100644 --- a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java +++ b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java @@ -9,7 +9,6 @@ import java.sql.SQLException; import java.time.Duration; import java.time.temporal.ChronoUnit; -import java.util.HashSet; import java.util.Set; /** diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java index 2c4cea4b05a..72e4f1aeb0c 100644 --- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java +++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java @@ -154,8 +154,7 @@ public void testTcJdbcUri() throws Exception { public void testExposedAndLivenessCheckPorts() { try (PrestoContainer prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) { prestoSql.start(); - assertThat(prestoSql.getExposedPorts()) - .containsExactly(PrestoContainer.PRESTO_PORT); + assertThat(prestoSql.getExposedPorts()).containsExactly(PrestoContainer.PRESTO_PORT); assertThat(prestoSql.getLivenessCheckPortNumbers()) .containsExactly(prestoSql.getMappedPort(PrestoContainer.PRESTO_PORT)); } diff --git a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java index cecff8b7a17..c78590d8393 100644 --- a/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java +++ b/modules/tidb/src/main/java/org/testcontainers/tidb/TiDBContainer.java @@ -6,7 +6,6 @@ import org.testcontainers.utility.DockerImageName; import java.time.Duration; -import java.util.HashSet; import java.util.Set; /** diff --git a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java index 6d9fb47ab2c..21171fd2c15 100644 --- a/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java +++ b/modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java @@ -7,7 +7,6 @@ import java.sql.Connection; import java.sql.SQLException; -import java.util.HashSet; import java.util.Set; public class TrinoContainer extends JdbcDatabaseContainer { diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java index 4d97b52ccd2..57f631497c4 100644 --- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java +++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java @@ -67,8 +67,7 @@ public void testExposedAndLivenessCheckPorts() { try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) { trino.start(); assertThat(trino.getExposedPorts()).containsExactly(8080); - assertThat(trino.getLivenessCheckPortNumbers()) - .containsExactly(trino.getMappedPort(8080)); + assertThat(trino.getLivenessCheckPortNumbers()).containsExactly(trino.getMappedPort(8080)); } } } From 83ef2597483b266c21945d05423366aa3267ec62 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Thu, 25 Aug 2022 19:50:31 +0930 Subject: [PATCH 14/21] Add forgotten renamed files --- .../junit/db2/SimpleDb2ContainerTest.java | 49 ++++++++++++++ .../junit/tidb/SimpleTiDBContainerTest.java | 67 +++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java create mode 100644 modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBContainerTest.java diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java new file mode 100644 index 00000000000..a74e2ace81a --- /dev/null +++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java @@ -0,0 +1,49 @@ +package org.testcontainers.junit.db2; + +import org.junit.Test; +import org.testcontainers.Db2TestImages; +import org.testcontainers.containers.Db2Container; +import org.testcontainers.db.AbstractContainerDatabaseTest; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SimpleDb2ContainerTest extends AbstractContainerDatabaseTest { + + @Test + public void testSimple() throws SQLException { + try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { + db2.start(); + + ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1"); + + int resultSetInt = resultSet.getInt(1); + assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); + } + } + + @Test + public void testWithAdditionalUrlParamInJdbcUrl() { + try ( + Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE) + .withUrlParam("sslConnection", "false") + .acceptLicense() + ) { + db2.start(); + + String jdbcUrl = db2.getJdbcUrl(); + assertThat(jdbcUrl).contains(":sslConnection=false;"); + } + } + + @Test + public void testExposedAndLivenessCheckPorts() { + try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { + db2.start(); + assertThat(db2.getExposedPorts()).containsExactly(50_000); + assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(50_000)); + } + } +} diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBContainerTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBContainerTest.java new file mode 100644 index 00000000000..098dc3ad752 --- /dev/null +++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBContainerTest.java @@ -0,0 +1,67 @@ +package org.testcontainers.junit.tidb; + +import org.junit.Test; +import org.testcontainers.TiDBTestImages; +import org.testcontainers.db.AbstractContainerDatabaseTest; +import org.testcontainers.tidb.TiDBContainer; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SimpleTiDBContainerTest extends AbstractContainerDatabaseTest { + + @Test + public void testSimple() throws SQLException { + try (TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE)) { + tidb.start(); + + ResultSet resultSet = performQuery(tidb, "SELECT 1"); + + int resultSetInt = resultSet.getInt(1); + assertThat(resultSetInt).isEqualTo(1); + } + } + + @Test + public void testExplicitInitScript() throws SQLException { + try ( + TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withInitScript("somepath/init_tidb.sql") + ) { // TiDB is expected to be compatible with MySQL + tidb.start(); + + ResultSet resultSet = performQuery(tidb, "SELECT foo FROM bar"); + + String firstColumnValue = resultSet.getString(1); + assertThat(firstColumnValue).isEqualTo("hello world"); + } + } + + @Test + public void testWithAdditionalUrlParamInJdbcUrl() { + TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE).withUrlParam("sslmode", "disable"); + + try { + tidb.start(); + String jdbcUrl = tidb.getJdbcUrl(); + assertThat(jdbcUrl).contains("?"); + assertThat(jdbcUrl).contains("sslmode=disable"); + } finally { + tidb.stop(); + } + } + + @Test + public void testExposedAndLivenessCheckPorts() { + Integer tidbPort = 4000; + Integer restApiPort = 10080; + + try (TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE);) { + tidb.start(); + assertThat(tidb.getExposedPorts()).containsExactlyInAnyOrder(tidbPort, restApiPort); + assertThat(tidb.getLivenessCheckPortNumbers()) + .containsExactlyInAnyOrder(tidb.getMappedPort(tidbPort), tidb.getMappedPort(restApiPort)); + } + } +} From e38c47ed53aab269eff5d27cc2e8552b4523121b Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 3 Sep 2022 12:11:39 +0930 Subject: [PATCH 15/21] undo rename on test --- .../junit/db2/SimpleDb2ContainerTest.java | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java deleted file mode 100644 index a74e2ace81a..00000000000 --- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2ContainerTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.testcontainers.junit.db2; - -import org.junit.Test; -import org.testcontainers.Db2TestImages; -import org.testcontainers.containers.Db2Container; -import org.testcontainers.db.AbstractContainerDatabaseTest; - -import java.sql.ResultSet; -import java.sql.SQLException; - -import static org.assertj.core.api.Assertions.assertThat; - -public class SimpleDb2ContainerTest extends AbstractContainerDatabaseTest { - - @Test - public void testSimple() throws SQLException { - try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { - db2.start(); - - ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1"); - - int resultSetInt = resultSet.getInt(1); - assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); - } - } - - @Test - public void testWithAdditionalUrlParamInJdbcUrl() { - try ( - Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE) - .withUrlParam("sslConnection", "false") - .acceptLicense() - ) { - db2.start(); - - String jdbcUrl = db2.getJdbcUrl(); - assertThat(jdbcUrl).contains(":sslConnection=false;"); - } - } - - @Test - public void testExposedAndLivenessCheckPorts() { - try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { - db2.start(); - assertThat(db2.getExposedPorts()).containsExactly(50_000); - assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(50_000)); - } - } -} From f9a27452d96c43246fe3617f025d3986a58f680a Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 3 Sep 2022 12:14:04 +0930 Subject: [PATCH 16/21] undo rename on tests --- .../junit/db2/SimpleDb2Test.java | 49 +++++++++++++++++++ ...ContainerTest.java => SimpleTiDBTest.java} | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java rename modules/tidb/src/test/java/org/testcontainers/junit/tidb/{SimpleTiDBContainerTest.java => SimpleTiDBTest.java} (96%) diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java new file mode 100644 index 00000000000..daa1e4664ae --- /dev/null +++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java @@ -0,0 +1,49 @@ +package org.testcontainers.junit.db2; + +import org.junit.Test; +import org.testcontainers.Db2TestImages; +import org.testcontainers.containers.Db2Container; +import org.testcontainers.db.AbstractContainerDatabaseTest; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SimpleDb2Test extends AbstractContainerDatabaseTest { + + @Test + public void testSimple() throws SQLException { + try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { + db2.start(); + + ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1"); + + int resultSetInt = resultSet.getInt(1); + assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); + } + } + + @Test + public void testWithAdditionalUrlParamInJdbcUrl() { + try ( + Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE) + .withUrlParam("sslConnection", "false") + .acceptLicense() + ) { + db2.start(); + + String jdbcUrl = db2.getJdbcUrl(); + assertThat(jdbcUrl).contains(":sslConnection=false;"); + } + } + + @Test + public void testExposedAndLivenessCheckPorts() { + try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { + db2.start(); + assertThat(db2.getExposedPorts()).containsExactly(50_000); + assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(50_000)); + } + } +} diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBContainerTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java similarity index 96% rename from modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBContainerTest.java rename to modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java index 098dc3ad752..4cc28df9e9f 100644 --- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBContainerTest.java +++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java @@ -10,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; -public class SimpleTiDBContainerTest extends AbstractContainerDatabaseTest { +public class SimpleTiDBTest extends AbstractContainerDatabaseTest { @Test public void testSimple() throws SQLException { From 8069018f5bcbdbcc7ccab7ce901f2986270fa969 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 3 Sep 2022 12:25:07 +0930 Subject: [PATCH 17/21] Use an assertion instead of an extra test --- .../org/testcontainers/junit/SimpleNginxTest.java | 7 ++++--- .../junit/postgresql/SimplePostgreSQLTest.java | 12 +++++------- .../containers/PrestoContainerTest.java | 12 +++++------- .../testcontainers/junit/tidb/SimpleTiDBTest.java | 13 +++++-------- .../containers/TrinoContainerTest.java | 11 ++++------- 5 files changed, 23 insertions(+), 32 deletions(-) diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java index 40b75e14632..97efb717bb1 100644 --- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java +++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java @@ -58,12 +58,13 @@ public void testSimple() throws Exception { .as("An HTTP GET from the Nginx server returns the index.html from the custom content directory") .contains("Hello World!"); // } + assertHasCorrectExposedAndLivenessCheckPorts(nginx); } @Test - public void testExposedAndLivenessCheckPorts() throws Exception { - assertThat(nginx.getExposedPorts()).containsExactly(80); - assertThat(nginx.getLivenessCheckPortNumbers()).containsExactly(nginx.getMappedPort(80)); + public void assertHasCorrectExposedAndLivenessCheckPorts(NginxContainer nginxContainer) throws Exception { + assertThat(nginxContainer.getExposedPorts()).containsExactly(80); + assertThat(nginxContainer.getLivenessCheckPortNumbers()).containsExactly(nginxContainer.getMappedPort(80)); } private static String responseFromNginx(URL baseUrl) throws IOException { diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java index 14a85ac7099..0da75b0378d 100644 --- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java +++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java @@ -26,6 +26,7 @@ public void testSimple() throws SQLException { ResultSet resultSet = performQuery(postgres, "SELECT 1"); int resultSetInt = resultSet.getInt(1); assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); + assertHasCorrectExposedAndLivenessCheckPorts(postgres); } } @@ -88,12 +89,9 @@ public void testWithAdditionalUrlParamInJdbcUrl() { } @Test - public void testExposedAndLivenessCheckPorts() { - try (PostgreSQLContainer postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE);) { - postgres.start(); - assertThat(postgres.getExposedPorts()).containsExactly(PostgreSQLContainer.POSTGRESQL_PORT); - assertThat(postgres.getLivenessCheckPortNumbers()) - .containsExactly(postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT)); - } + public void assertHasCorrectExposedAndLivenessCheckPorts(PostgreSQLContainer postgres) { + assertThat(postgres.getExposedPorts()).containsExactly(PostgreSQLContainer.POSTGRESQL_PORT); + assertThat(postgres.getLivenessCheckPortNumbers()) + .containsExactly(postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT)); } } diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java index 72e4f1aeb0c..796af727bc8 100644 --- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java +++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java @@ -32,6 +32,7 @@ public void testSimple() throws Exception { assertThat(resultSet.getString("node_version")) .as("Presto version") .isEqualTo(PrestoContainer.DEFAULT_TAG); + assertHasCorrectExposedAndLivenessCheckPorts(prestoSql); } } } @@ -151,12 +152,9 @@ public void testTcJdbcUri() throws Exception { } @Test - public void testExposedAndLivenessCheckPorts() { - try (PrestoContainer prestoSql = new PrestoContainer<>(PrestoTestImages.PRESTO_TEST_IMAGE)) { - prestoSql.start(); - assertThat(prestoSql.getExposedPorts()).containsExactly(PrestoContainer.PRESTO_PORT); - assertThat(prestoSql.getLivenessCheckPortNumbers()) - .containsExactly(prestoSql.getMappedPort(PrestoContainer.PRESTO_PORT)); - } + public void assertHasCorrectExposedAndLivenessCheckPorts(PrestoContainer prestoSql) { + assertThat(prestoSql.getExposedPorts()).containsExactly(PrestoContainer.PRESTO_PORT); + assertThat(prestoSql.getLivenessCheckPortNumbers()) + .containsExactly(prestoSql.getMappedPort(PrestoContainer.PRESTO_PORT)); } } diff --git a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java index 4cc28df9e9f..6b4429afe75 100644 --- a/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java +++ b/modules/tidb/src/test/java/org/testcontainers/junit/tidb/SimpleTiDBTest.java @@ -21,6 +21,7 @@ public void testSimple() throws SQLException { int resultSetInt = resultSet.getInt(1); assertThat(resultSetInt).isEqualTo(1); + assertHasCorrectExposedAndLivenessCheckPorts(tidb); } } @@ -52,16 +53,12 @@ public void testWithAdditionalUrlParamInJdbcUrl() { } } - @Test - public void testExposedAndLivenessCheckPorts() { + private void assertHasCorrectExposedAndLivenessCheckPorts(TiDBContainer tidb) { Integer tidbPort = 4000; Integer restApiPort = 10080; - try (TiDBContainer tidb = new TiDBContainer(TiDBTestImages.TIDB_IMAGE);) { - tidb.start(); - assertThat(tidb.getExposedPorts()).containsExactlyInAnyOrder(tidbPort, restApiPort); - assertThat(tidb.getLivenessCheckPortNumbers()) - .containsExactlyInAnyOrder(tidb.getMappedPort(tidbPort), tidb.getMappedPort(restApiPort)); - } + assertThat(tidb.getExposedPorts()).containsExactlyInAnyOrder(tidbPort, restApiPort); + assertThat(tidb.getLivenessCheckPortNumbers()) + .containsExactlyInAnyOrder(tidb.getMappedPort(tidbPort), tidb.getMappedPort(restApiPort)); } } diff --git a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java index 57f631497c4..6ef733ca972 100644 --- a/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java +++ b/modules/trino/src/test/java/org/testcontainers/containers/TrinoContainerTest.java @@ -24,6 +24,7 @@ public void testSimple() throws Exception { assertThat(resultSet.getString("node_version")) .as("Trino version") .isEqualTo(TrinoContainer.DEFAULT_TAG); + assertContainerHasCorrectExposedAndLivenessCheckPorts(trino); } } } @@ -62,12 +63,8 @@ public void testInitScript() throws Exception { } } - @Test - public void testExposedAndLivenessCheckPorts() { - try (TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)) { - trino.start(); - assertThat(trino.getExposedPorts()).containsExactly(8080); - assertThat(trino.getLivenessCheckPortNumbers()).containsExactly(trino.getMappedPort(8080)); - } + private void assertContainerHasCorrectExposedAndLivenessCheckPorts(TrinoContainer trino) { + assertThat(trino.getExposedPorts()).containsExactly(8080); + assertThat(trino.getLivenessCheckPortNumbers()).containsExactly(trino.getMappedPort(8080)); } } From d80f509fc51a2772c7fce2ef1d48ab17661fcd86 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 3 Sep 2022 12:28:31 +0930 Subject: [PATCH 18/21] Use an assertion instead of an extra test --- .../testcontainers/junit/db2/SimpleDb2Test.java | 10 ++++------ .../junit/mssqlserver/SimpleMSSQLServerTest.java | 13 +++++-------- .../junit/mysql/SimpleMySQLTest.java | 15 +++++---------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java index daa1e4664ae..214308f64d1 100644 --- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java +++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java @@ -21,6 +21,7 @@ public void testSimple() throws SQLException { int resultSetInt = resultSet.getInt(1); assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); + assertHasCorrectExposedAndLivenessCheckPorts(db2); } } @@ -39,11 +40,8 @@ public void testWithAdditionalUrlParamInJdbcUrl() { } @Test - public void testExposedAndLivenessCheckPorts() { - try (Db2Container db2 = new Db2Container(Db2TestImages.DB2_IMAGE).acceptLicense()) { - db2.start(); - assertThat(db2.getExposedPorts()).containsExactly(50_000); - assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(50_000)); - } + public void assertHasCorrectExposedAndLivenessCheckPorts(Db2Container db2) { + assertThat(db2.getExposedPorts()).containsExactly(50_000); + assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(50_000)); } } diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java index b893a8b7737..81bbfde5ceb 100644 --- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java +++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java @@ -25,6 +25,7 @@ public void testSimple() throws SQLException { int resultSetInt = resultSet.getInt(1); assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); + assertHasCorrectExposedAndLivenessCheckPorts(mssqlServer); } } @@ -66,13 +67,9 @@ public void testSetupDatabase() throws SQLException { } @Test - public void testExposedAndLivenessCheckPorts() throws Exception { - try ( - MSSQLServerContainer mssqlServer = new MSSQLServerContainer<>(MSSQLServerTestImages.MSSQL_SERVER_IMAGE) - ) { - mssqlServer.start(); - assertThat(mssqlServer.getExposedPorts()).containsExactly(MSSQLServerContainer.MS_SQL_SERVER_PORT); - assertThat(mssqlServer.getLivenessCheckPortNumbers()).containsExactly(mssqlServer.getMappedPort(1433)); - } + public void assertHasCorrectExposedAndLivenessCheckPorts(MSSQLServerContainer mssqlServer) { + mssqlServer.start(); + assertThat(mssqlServer.getExposedPorts()).containsExactly(MSSQLServerContainer.MS_SQL_SERVER_PORT); + assertThat(mssqlServer.getLivenessCheckPortNumbers()).containsExactly(mssqlServer.getMappedPort(1433)); } } diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java index c5981c5afff..6ff91061008 100644 --- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java @@ -57,6 +57,7 @@ public void testSimple() throws SQLException { int resultSetInt = resultSet.getInt(1); assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1); + assertHasCorrectExposedAndLivenessCheckPorts(mysql); } } @@ -239,15 +240,9 @@ public void testWithAdditionalUrlParamInJdbcUrl() { } @Test - public void testExposedAndLivenessCheckPorts() { - try ( - MySQLContainer mysql = new MySQLContainer<>(MySQLTestImages.MYSQL_57_IMAGE) - .withLogConsumer(new Slf4jLogConsumer(logger)); - ) { - mysql.start(); - assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT); - assertThat(mysql.getLivenessCheckPortNumbers()) - .containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); - } + public void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer mysql) { + assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT); + assertThat(mysql.getLivenessCheckPortNumbers()) + .containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); } } From 3ea042ca26eba17a57efa02b8f9fb85e5822e307 Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 3 Sep 2022 12:31:46 +0930 Subject: [PATCH 19/21] spotless apply --- .../java/org/testcontainers/junit/mysql/SimpleMySQLTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java index 6ff91061008..8003331f000 100644 --- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java @@ -242,7 +242,6 @@ public void testWithAdditionalUrlParamInJdbcUrl() { @Test public void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer mysql) { assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT); - assertThat(mysql.getLivenessCheckPortNumbers()) - .containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); + assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); } } From 286e9d3f403382f7bd3042617846b5c040c3aeeb Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 3 Sep 2022 12:36:22 +0930 Subject: [PATCH 20/21] use static variable for mssql and db2 ports --- .../test/java/org/testcontainers/junit/db2/SimpleDb2Test.java | 4 ++-- .../junit/mssqlserver/SimpleMSSQLServerTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java index 214308f64d1..bd934ec639e 100644 --- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java +++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java @@ -41,7 +41,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() { @Test public void assertHasCorrectExposedAndLivenessCheckPorts(Db2Container db2) { - assertThat(db2.getExposedPorts()).containsExactly(50_000); - assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(50_000)); + assertThat(db2.getExposedPorts()).containsExactly(Db2Container.DB2_PORT); + assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(Db2Container.DB2_PORT)); } } diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java index 81bbfde5ceb..804e4978311 100644 --- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java +++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java @@ -70,6 +70,7 @@ public void testSetupDatabase() throws SQLException { public void assertHasCorrectExposedAndLivenessCheckPorts(MSSQLServerContainer mssqlServer) { mssqlServer.start(); assertThat(mssqlServer.getExposedPorts()).containsExactly(MSSQLServerContainer.MS_SQL_SERVER_PORT); - assertThat(mssqlServer.getLivenessCheckPortNumbers()).containsExactly(mssqlServer.getMappedPort(1433)); + assertThat(mssqlServer.getLivenessCheckPortNumbers()) + .containsExactly(mssqlServer.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT)); } } From 5e1bef90117f64aa5cf3b95bf55a2b99e929ba4b Mon Sep 17 00:00:00 2001 From: Aidan Do Date: Sat, 3 Sep 2022 16:08:05 +0930 Subject: [PATCH 21/21] removed @Test anotation on assertion --- .../test/java/org/testcontainers/junit/db2/SimpleDb2Test.java | 3 +-- .../junit/mssqlserver/SimpleMSSQLServerTest.java | 4 +--- .../java/org/testcontainers/junit/mysql/SimpleMySQLTest.java | 3 +-- .../test/java/org/testcontainers/junit/SimpleNginxTest.java | 3 +-- .../testcontainers/junit/postgresql/SimplePostgreSQLTest.java | 3 +-- .../org/testcontainers/containers/PrestoContainerTest.java | 3 +-- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java index bd934ec639e..ae35a8ee77c 100644 --- a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java +++ b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java @@ -39,8 +39,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() { } } - @Test - public void assertHasCorrectExposedAndLivenessCheckPorts(Db2Container db2) { + private void assertHasCorrectExposedAndLivenessCheckPorts(Db2Container db2) { assertThat(db2.getExposedPorts()).containsExactly(Db2Container.DB2_PORT); assertThat(db2.getLivenessCheckPortNumbers()).containsExactly(db2.getMappedPort(Db2Container.DB2_PORT)); } diff --git a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java index 804e4978311..2827544cade 100644 --- a/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java +++ b/modules/mssqlserver/src/test/java/org/testcontainers/junit/mssqlserver/SimpleMSSQLServerTest.java @@ -66,9 +66,7 @@ public void testSetupDatabase() throws SQLException { } } - @Test - public void assertHasCorrectExposedAndLivenessCheckPorts(MSSQLServerContainer mssqlServer) { - mssqlServer.start(); + private void assertHasCorrectExposedAndLivenessCheckPorts(MSSQLServerContainer mssqlServer) { assertThat(mssqlServer.getExposedPorts()).containsExactly(MSSQLServerContainer.MS_SQL_SERVER_PORT); assertThat(mssqlServer.getLivenessCheckPortNumbers()) .containsExactly(mssqlServer.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT)); diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java index 8003331f000..f60712e7123 100644 --- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java @@ -239,8 +239,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() { } } - @Test - public void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer mysql) { + private void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer mysql) { assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT); assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT)); } diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java index 97efb717bb1..abfbb663207 100644 --- a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java +++ b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java @@ -61,8 +61,7 @@ public void testSimple() throws Exception { assertHasCorrectExposedAndLivenessCheckPorts(nginx); } - @Test - public void assertHasCorrectExposedAndLivenessCheckPorts(NginxContainer nginxContainer) throws Exception { + private void assertHasCorrectExposedAndLivenessCheckPorts(NginxContainer nginxContainer) throws Exception { assertThat(nginxContainer.getExposedPorts()).containsExactly(80); assertThat(nginxContainer.getLivenessCheckPortNumbers()).containsExactly(nginxContainer.getMappedPort(80)); } diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java index 0da75b0378d..84beb779fa4 100644 --- a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java +++ b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java @@ -88,8 +88,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() { } } - @Test - public void assertHasCorrectExposedAndLivenessCheckPorts(PostgreSQLContainer postgres) { + private void assertHasCorrectExposedAndLivenessCheckPorts(PostgreSQLContainer postgres) { assertThat(postgres.getExposedPorts()).containsExactly(PostgreSQLContainer.POSTGRESQL_PORT); assertThat(postgres.getLivenessCheckPortNumbers()) .containsExactly(postgres.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT)); diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java index 796af727bc8..0e86b587c50 100644 --- a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java +++ b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java @@ -151,8 +151,7 @@ public void testTcJdbcUri() throws Exception { } } - @Test - public void assertHasCorrectExposedAndLivenessCheckPorts(PrestoContainer prestoSql) { + private void assertHasCorrectExposedAndLivenessCheckPorts(PrestoContainer prestoSql) { assertThat(prestoSql.getExposedPorts()).containsExactly(PrestoContainer.PRESTO_PORT); assertThat(prestoSql.getLivenessCheckPortNumbers()) .containsExactly(prestoSql.getMappedPort(PrestoContainer.PRESTO_PORT));