Refactor query execution methods to use executeSelectOneQuery and executeQuery for consistency

Author: raju.gupta

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

@@ -37,7 +37,7 @@ void testExplicitInitScript() throws SQLException {
         ) { // CockroachDB is expected to be compatible with Postgres
             cockroach.start();
 
-            performSelectFooBarQuery(cockroach);
+            executeSelectFooBarQuery(cockroach);
         }
     }
 
@@ -112,7 +112,7 @@ void testInitializationScript() throws SQLException {
         ) { // CockroachDB is expected to be compatible with Postgres
             cockroach.start();
 
-            performSelectFooBarQuery(cockroach);
+            executeSelectFooBarQuery(cockroach);
         }
     }
 }

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

@@ -62,7 +62,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             cratedb.start();
 
-            performSelectFooBarQuery(cratedb);
+            executeSelectFooBarQuery(cratedb);
         }
     }
 

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

@@ -52,7 +52,7 @@ protected void executeSelectOneQuery(final JdbcDatabaseContainer<?> container, f
         );
     }
 
-    protected void performSelectFooBarQuery(final JdbcDatabaseContainer<?> container) throws SQLException {
+    protected void executeSelectFooBarQuery(final JdbcDatabaseContainer<?> container) throws SQLException {
         executeQuery(
             container,
             "SELECT foo FROM bar",
@@ -70,7 +70,7 @@ protected void performSelectFooBarQuery(final JdbcDatabaseContainer<?> container
         );
     }
 
-    protected void performSelectMaxConnectionsQuery(
+    protected void executeSelectMaxConnectionsQuery(
         final JdbcDatabaseContainer<?> container,
         final String expectedMaxConnections
     ) throws SQLException {
@@ -91,7 +91,7 @@ protected void performSelectMaxConnectionsQuery(
         );
     }
 
-    protected void performSelectVersionQuery(final JdbcDatabaseContainer<?> container, final String expectedVersion)
+    protected void executeSelectVersionQuery(final JdbcDatabaseContainer<?> container, final String expectedVersion)
         throws SQLException {
         executeQuery(
             container,

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

@@ -24,7 +24,7 @@ public static DockerImageName[] params() {
     void versionCheckTest(DockerImageName dockerImageName) throws SQLException {
         try (MySQLContainer mysql = new MySQLContainer(dockerImageName)) {
             mysql.start();
-            performSelectVersionQuery(mysql, dockerImageName.getVersionPart());
+            executeSelectVersionQuery(mysql, dockerImageName.getVersionPart());
         }
     }
 }

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

@@ -57,7 +57,7 @@ void testSpecificVersion() throws SQLException {
         ) {
             mysqlOldVersion.start();
 
-            performSelectVersionQuery(mysqlOldVersion, "8.0.36");
+            executeSelectVersionQuery(mysqlOldVersion, "8.0.36");
         }
     }
 
@@ -107,7 +107,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             container.start();
 
-            performSelectFooBarQuery(container);
+            executeSelectFooBarQuery(container);
         }
     }
 

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

@@ -32,7 +32,7 @@ void testExplicitInitScript() throws SQLException {
         try (OceanBaseCEContainer oceanbase = new OceanBaseCEContainer(IMAGE).withInitScript("init.sql")) {
             oceanbase.start();
 
-            performSelectFooBarQuery(oceanbase);
+            executeSelectFooBarQuery(oceanbase);
         }
     }
 

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

@@ -25,7 +25,7 @@ void testCommandOverride() throws SQLException {
         ) {
             postgres.start();
 
-            performSelectMaxConnectionsQuery((JdbcDatabaseContainer<?>) postgres, "42");
+            executeSelectMaxConnectionsQuery((JdbcDatabaseContainer<?>) postgres, "42");
         }
     }
 
@@ -39,7 +39,7 @@ void testUnsetCommand() throws SQLException {
         ) {
             postgres.start();
 
-            performSelectMaxConnectionsQuery((JdbcDatabaseContainer<?>) postgres, "100");
+            executeSelectMaxConnectionsQuery((JdbcDatabaseContainer<?>) postgres, "100");
         }
     }
 
@@ -52,7 +52,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             postgres.start();
 
-            performSelectFooBarQuery(postgres);
+            executeSelectFooBarQuery(postgres);
         }
     }
 }

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

@@ -40,7 +40,7 @@ void testCommandOverride() throws SQLException {
         ) {
             postgres.start();
 
-            performSelectMaxConnectionsQuery(postgres, "42");
+            executeSelectMaxConnectionsQuery(postgres, "42");
         }
     }
 
@@ -55,7 +55,7 @@ void testUnsetCommand() throws SQLException {
 
             // After unsetting the command, max_connections should be the default value (100), not 42
 
-            performSelectMaxConnectionsQuery(postgres, "100");
+            executeSelectMaxConnectionsQuery(postgres, "100");
         }
     }
 
@@ -77,7 +77,7 @@ void testExplicitInitScript() throws SQLException {
         ) {
             postgres.start();
 
-            performSelectFooBarQuery(postgres);
+            executeSelectFooBarQuery(postgres);
         }
     }
 

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

@@ -31,7 +31,7 @@ void testExplicitInitScript() throws SQLException {
         ) { // TiDB is expected to be compatible with MySQL
             tidb.start();
 
-            performSelectFooBarQuery(tidb);
+            executeSelectFooBarQuery(tidb);
         }
     }