Refactor performSelectMaxConnectionsQuery and performSelectVersionQuery to accept expected values for assertions

Author: raju.gupta

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

@@ -65,7 +65,10 @@ protected void performSelectFooBarQuery(final JdbcDatabaseContainer<?> container
         );
     }
 
-    protected void performSelectMaxConnectionsQuery(final JdbcDatabaseContainer<?> container) throws SQLException {
+    protected void performSelectMaxConnectionsQuery(
+        final JdbcDatabaseContainer<?> container,
+        final String expectedMaxConnections
+    ) throws SQLException {
         performQuery(
             container,
             "SELECT current_setting('max_connections')",
@@ -74,13 +77,17 @@ protected void performSelectMaxConnectionsQuery(final JdbcDatabaseContainer<?> c
                     .assertThatNoException()
                     .isThrownBy(() -> {
                         String result = resultSet.getString(1);
-                        Assertions.assertThat(result).as("max_connections should be overridden").isEqualTo("42");
+                        Assertions
+                            .assertThat(result)
+                            .as("max_connections should be overridden")
+                            .isEqualTo(expectedMaxConnections);
                     });
             }
         );
     }
 
-    protected void performSelectVersionQuery(final JdbcDatabaseContainer<?> container) throws SQLException {
+    protected void performSelectVersionQuery(final JdbcDatabaseContainer<?> container, final String expectedVersion)
+        throws SQLException {
         performQuery(
             container,
             "SELECT VERSION()",
@@ -92,7 +99,7 @@ protected void performSelectVersionQuery(final JdbcDatabaseContainer<?> containe
                         Assertions
                             .assertThat(resultSetString)
                             .as("The database version can be set using a container rule parameter")
-                            .startsWith("10.3.39");
+                            .startsWith(expectedVersion);
                     });
             }
         );

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);
+            performSelectVersionQuery(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);
+            performSelectVersionQuery(mysqlOldVersion, "8.0.36");
         }
     }
 

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

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

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

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