Modify test to perform a query execution

Author: DHKIM-0511

modules/mariadb/src/test/java/org/testcontainers/containers/MariaDBR2DBCDatabaseContainerTest.java

@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.junit.Test;
 import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
@@ -26,20 +28,23 @@ protected MariaDBContainer<?> createContainer() {
 
     @Test
     public void testGetR2DBCUrl() {
-        MariaDBContainer<?> container = createContainer();
-        container.start();
-
-        String expectedUrl =
-            "r2dbc:mariadb://" +
-            container.getHost() +
-            ":" +
-            container.getMappedPort(MariaDBContainer.MARIADB_PORT) +
-            "/" +
-            container.getDatabaseName() +
-            container.constructUrlParameters("?", "&");
-
-        String r2dbcUrl = MariaDBR2DBCDatabaseContainer.getR2dbcUrl(container);
-        assertThat(expectedUrl).isEqualTo(r2dbcUrl);
-        container.stop();
+        try (MariaDBContainer<?> container = createContainer()) {
+            container.start();
+
+            String expectedUrl =
+                "r2dbc:mariadb://" +
+                container.getHost() +
+                ":" +
+                container.getMappedPort(MariaDBContainer.MARIADB_PORT) +
+                "/" +
+                container.getDatabaseName() +
+                container.constructUrlParameters("?", "&");
+
+            ConnectionFactory connectionFactory = ConnectionFactories.get(getOptions(container));
+            runTestQuery(connectionFactory);
+
+            String r2dbcUrl = MariaDBR2DBCDatabaseContainer.getR2dbcUrl(container);
+            assertThat(expectedUrl).isEqualTo(r2dbcUrl);
+        }
     }
 }

modules/mssqlserver/src/test/java/org/testcontainers/containers/MSSQLR2DBCDatabaseContainerTest.java

@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.junit.Test;
 import org.testcontainers.MSSQLServerTestImages;
@@ -26,18 +28,21 @@ protected MSSQLServerContainer<?> createContainer() {
 
     @Test
     public void testGetR2DBCUrl() {
-        MSSQLServerContainer<?> container = createContainer();
-        container.start();
-
-        String expectedUrl =
-            "r2dbc:sqlserver://" +
-            container.getHost() +
-            ":" +
-            container.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT) +
-            container.constructUrlParameters(";", ";");
-
-        String r2dbcUrl = MSSQLR2DBCDatabaseContainer.getR2dbcUrl(container);
-        assertThat(expectedUrl).isEqualTo(r2dbcUrl);
-        container.stop();
+        try (MSSQLServerContainer<?> container = createContainer()) {
+            container.start();
+
+            String expectedUrl =
+                "r2dbc:sqlserver://" +
+                container.getHost() +
+                ":" +
+                container.getMappedPort(MSSQLServerContainer.MS_SQL_SERVER_PORT) +
+                container.constructUrlParameters(";", ";");
+
+            ConnectionFactory connectionFactory = ConnectionFactories.get(getOptions(container));
+            runTestQuery(connectionFactory);
+
+            String r2dbcUrl = MSSQLR2DBCDatabaseContainer.getR2dbcUrl(container);
+            assertThat(expectedUrl).isEqualTo(r2dbcUrl);
+        }
     }
 }

modules/mysql/src/test/java/org/testcontainers/containers/MySQLR2DBCDatabaseContainerTest.java

@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.junit.Test;
 import org.testcontainers.MySQLTestImages;
@@ -26,20 +28,23 @@ protected MySQLContainer<?> createContainer() {
 
     @Test
     public void testGetR2DBCUrl() {
-        MySQLContainer<?> container = createContainer();
-        container.start();
-
-        String expectedUrl =
-            "r2dbc:mysql://" +
-            container.getHost() +
-            ":" +
-            container.getMappedPort(MySQLContainer.MYSQL_PORT) +
-            "/" +
-            container.getDatabaseName() +
-            container.constructUrlParameters("?", "&");
-
-        String r2dbcUrl = MySQLR2DBCDatabaseContainer.getR2dbcUrl(container);
-        assertThat(expectedUrl).isEqualTo(r2dbcUrl);
-        container.stop();
+        try (MySQLContainer<?> container = createContainer()) {
+            container.start();
+
+            String expectedUrl =
+                "r2dbc:mysql://" +
+                container.getHost() +
+                ":" +
+                container.getMappedPort(MySQLContainer.MYSQL_PORT) +
+                "/" +
+                container.getDatabaseName() +
+                container.constructUrlParameters("?", "&");
+
+            ConnectionFactory connectionFactory = ConnectionFactories.get(getOptions(container));
+            runTestQuery(connectionFactory);
+
+            String r2dbcUrl = MySQLR2DBCDatabaseContainer.getR2dbcUrl(container);
+            assertThat(expectedUrl).isEqualTo(r2dbcUrl);
+        }
     }
 }

modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLR2DBCDatabaseContainerTest.java

@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.junit.Test;
 import org.testcontainers.PostgreSQLTestImages;
@@ -33,20 +35,23 @@ protected String createR2DBCUrl() {
 
     @Test
     public void testGetR2DBCUrl() {
-        PostgreSQLContainer<?> container = createContainer();
-        container.start();
-
-        String expectedUrl =
-            "r2dbc:postgresql://" +
-            container.getHost() +
-            ":" +
-            container.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT) +
-            "/" +
-            container.getDatabaseName() +
-            container.constructUrlParameters("?", "&");
-
-        String r2dbcUrl = PostgreSQLR2DBCDatabaseContainer.getR2dbcUrl(container);
-        assertThat(expectedUrl).isEqualTo(r2dbcUrl);
-        container.stop();
+        try (PostgreSQLContainer<?> container = createContainer()) {
+            container.start();
+
+            String expectedUrl =
+                "r2dbc:postgresql://" +
+                container.getHost() +
+                ":" +
+                container.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT) +
+                "/" +
+                container.getDatabaseName() +
+                container.constructUrlParameters("?", "&");
+
+            ConnectionFactory connectionFactory = ConnectionFactories.get(getOptions(container));
+            runTestQuery(connectionFactory);
+
+            String r2dbcUrl = PostgreSQLR2DBCDatabaseContainer.getR2dbcUrl(container);
+            assertThat(expectedUrl).isEqualTo(r2dbcUrl);
+        }
     }
 }