Refactor query execution to use performSelectVersionQuery method for consistency

Author: raju.gupta

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

@@ -80,6 +80,24 @@ protected void performSelectMaxConnectionsQuery(final JdbcDatabaseContainer<?> c
         );
     }
 
+    protected void performSelectVersionQuery(final JdbcDatabaseContainer<?> container) throws SQLException {
+        performQuery(
+            container,
+            "SELECT VERSION()",
+            resultSet -> {
+                Assertions
+                    .assertThatNoException()
+                    .isThrownBy(() -> {
+                        String resultSetString = resultSet.getString(1);
+                        Assertions
+                            .assertThat(resultSetString)
+                            .as("The database version can be set using a container rule parameter")
+                            .startsWith("10.3.39");
+                    });
+            }
+        );
+    }
+
     protected DataSource getDataSource(final JdbcDatabaseContainer<?> container) {
         HikariConfig hikariConfig = new HikariConfig();
         hikariConfig.setJdbcUrl(container.getJdbcUrl());

modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBContainerTest.java

@@ -42,20 +42,7 @@ void testSpecificVersion() throws SQLException {
         ) {
             mariadbOldVersion.start();
 
-            performQuery(
-                mariadbOldVersion,
-                "SELECT VERSION()",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String resultSetString = resultSet.getString(1);
-                            assertThat(resultSetString)
-                                .as("The database version can be set using a container rule parameter")
-                                .startsWith("10.3.39");
-                        });
-                }
-            );
+            performSelectOneQuery(mariadbOldVersion);
         }
     }
 

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

@@ -1,6 +1,5 @@
 package org.testcontainers.mysql;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.MySQLTestImages;
@@ -9,8 +8,6 @@
 
 import java.sql.SQLException;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 class MultiVersionMySQLTest extends AbstractContainerDatabaseTest {
 
     public static DockerImageName[] params() {
@@ -27,20 +24,7 @@ public static DockerImageName[] params() {
     void versionCheckTest(DockerImageName dockerImageName) throws SQLException {
         try (MySQLContainer mysql = new MySQLContainer(dockerImageName)) {
             mysql.start();
-            performQuery(
-                mysql,
-                "SELECT VERSION()",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            final String resultSetString = resultSet.getString(1);
-                            assertThat(resultSetString)
-                                .as("The database version can be set using a container rule parameter")
-                                .isEqualTo(dockerImageName.getVersionPart());
-                        });
-                }
-            );
+            performSelectVersionQuery(mysql);
         }
     }
 }

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

@@ -57,20 +57,7 @@ void testSpecificVersion() throws SQLException {
         ) {
             mysqlOldVersion.start();
 
-            performQuery(
-                mysqlOldVersion,
-                "SELECT VERSION()",
-                resultSet -> {
-                    Assertions
-                        .assertThatNoException()
-                        .isThrownBy(() -> {
-                            String resultSetString = resultSet.getString(1);
-                            assertThat(resultSetString)
-                                .as("The database version can be set using a container rule parameter")
-                                .startsWith("8.0");
-                        });
-                }
-            );
+            performSelectVersionQuery(mysqlOldVersion);
         }
     }