Refactor query execution to use performSelectFooBarQuery method for consistency

Author: raju.gupta

modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java

@@ -1,6 +1,5 @@
 package org.testcontainers.cockroachdb;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.CockroachDBTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -38,20 +37,7 @@ void testExplicitInitScript() throws SQLException {
         ) { // CockroachDB is expected to be compatible with Postgres
             cockroach.start();
 
-            performQuery(
-                cockroach,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue)
-                                .as("Value from init script should equal real value")
-                                .isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(cockroach);
         }
     }
 
@@ -126,20 +112,7 @@ void testInitializationScript() throws SQLException {
         ) { // CockroachDB is expected to be compatible with Postgres
             cockroach.start();
 
-            performQuery(
-                cockroach,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue)
-                                .as("Value from init script should equal real value")
-                                .isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(cockroach);
         }
     }
 }

modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java

@@ -62,20 +62,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             cratedb.start();
 
-            performQuery(
-                cratedb,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue)
-                                .as("Value from init script should equal real value")
-                                .isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(cratedb);
         }
     }
 

modules/jdbc-test/src/main/java/org/testcontainers/db/AbstractContainerDatabaseTest.java

@@ -47,6 +47,24 @@ protected void performSelectOneQuery(final JdbcDatabaseContainer<?> container) t
         );
     }
 
+    protected void performSelectFooBarQuery(final JdbcDatabaseContainer<?> container) throws SQLException {
+        performQuery(
+            container,
+            "SELECT foo FROM bar",
+            resultSet -> {
+                Assertions
+                    .assertThatNoException()
+                    .isThrownBy(() -> {
+                        String firstColumnValue = resultSet.getString(1);
+                        Assertions
+                            .assertThat(firstColumnValue)
+                            .as("Value from init script should equal real value")
+                            .isEqualTo("hello world");
+                    });
+            }
+        );
+    }
+
     protected DataSource getDataSource(final JdbcDatabaseContainer<?> container) {
         HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setJdbcUrl(container.getJdbcUrl());

modules/mysql/src/test/java/org/testcontainers/mysql/MySQLContainerTest.java

@@ -120,20 +120,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             container.start();
 
-            performQuery(
-                container,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue)
-                                .as("Value from init script should equal real value")
-                                .isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(container);
         }
     }
 

modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java

@@ -1,6 +1,5 @@
 package org.testcontainers.oceanbase;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -33,20 +32,7 @@ void testExplicitInitScript() throws SQLException {
         try (OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(IMAGE).withInitScript("init.sql")) {
             oceanbase.start();
 
-            performQuery(
-                oceanbase,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue)
-                                .as("Value from init script should equal real value")
-                                .isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(oceanbase);
         }
     }
 

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

@@ -16,19 +16,6 @@ void testSimple() throws SQLException {
             postgres.start();
 
             performSelectOneQuery(postgres);
-
-            performQuery(
-                postgres,
-                "SELECT 1",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            int resultSetInt = resultSet.getInt(1);
-                            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
-                        });
-                }
-            );
         }
     }
 
@@ -90,20 +77,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             postgres.start();
 
-            performQuery(
-                postgres,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue)
-                                .as("Value from init script should equal real value")
-                                .isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(postgres);
         }
     }
 }

modules/postgresql/src/test/java/org/testcontainers/postgresql/PostgreSQLContainerTest.java

@@ -97,20 +97,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             postgres.start();
 
-            performQuery(
-                postgres,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue)
-                                .as("Value from init script should equal real value")
-                                .isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(postgres);
         }
     }
 

modules/tidb/src/test/java/org/testcontainers/tidb/TiDBContainerTest.java

@@ -1,6 +1,5 @@
 package org.testcontainers.tidb;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.TiDBTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -32,18 +31,7 @@ void testExplicitInitScript() throws SQLException {
         ) { // TiDB is expected to be compatible with MySQL
             tidb.start();
 
-            performQuery(
-                tidb,
-                "SELECT foo FROM bar",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String firstColumnValue = resultSet.getString(1);
-                            assertThat(firstColumnValue).isEqualTo("hello world");
-                        });
-                }
-            );
+            performSelectFooBarQuery(tidb);
         }
     }
 

modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java

@@ -95,19 +95,8 @@ void testWithCustomRole() throws SQLException {
                 .withUsername("yugabyte")
         ) {
             ysqlContainer.start();
-            performQuery(
-                ysqlContainer,
-                "SELECT 1",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            assertThat(resultSet.getInt(1))
-                                .as("A sample test query with a custom role succeeds")
-                                .isEqualTo(1);
-                        });
-                }
-            );
+
+            performSelectOneQuery(ysqlContainer);
         }
     }