test: add clickhouse test

Author: livk-cloud

modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java

@@ -4,4 +4,6 @@
 
 public interface ClickhouseTestImages {
     DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
+
+    DockerImageName CLICKHOUSE_24_12_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:24.12-alpine");
 }

modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java

@@ -2,56 +2,60 @@
 
 import com.zaxxer.hikari.pool.PoolInitializationException;
 import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
+import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.utility.DockerImageName;
 
-import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")) {
-            clickhouse.start();
+        for (DockerImageName image : Arrays.asList(ClickhouseTestImages.CLICKHOUSE_IMAGE, ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
+            try (ClickHouseContainer clickhouse = new ClickHouseContainer(image)) {
+                clickhouse.start();
 
-            ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
+                ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
 
-            int resultSetInt = resultSet.getInt(1);
-            assertThat(resultSetInt).isEqualTo(1);
+                int resultSetInt = resultSet.getInt(1);
+                assertThat(resultSetInt).isEqualTo(1);
+            }
         }
     }
 
     @Test
     public void customCredentialsWithUrlParams() throws SQLException {
-        try (
-            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
-                .withUsername("test")
-                .withPassword("test")
-                .withDatabaseName("test")
-                .withUrlParam("max_result_rows", "5")
-        ) {
-            clickhouse.start();
+        for (DockerImageName image : Arrays.asList(ClickhouseTestImages.CLICKHOUSE_IMAGE, ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
+            try (
+                ClickHouseContainer clickhouse = new ClickHouseContainer(image)
+                    .withUsername("test")
+                    .withPassword("test")
+                    .withDatabaseName("test")
+                    .withUrlParam("max_result_rows", "5")
+            ) {
+                clickhouse.start();
 
-            ResultSet resultSet = performQuery(
-                clickhouse,
-                "SELECT value FROM system.settings where name='max_result_rows'"
-            );
+                ResultSet resultSet = performQuery(
+                    clickhouse,
+                    "SELECT value FROM system.settings where name='max_result_rows'"
+                );
 
-            int resultSetInt = resultSet.getInt(1);
-            assertThat(resultSetInt).isEqualTo(5);
+                int resultSetInt = resultSet.getInt(1);
+                assertThat(resultSetInt).isEqualTo(5);
+            }
         }
     }
 
     @Test
-    public void testNewAuth() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:24.12-alpine")
+    public void testNewAuth() {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)
             .withUsername("default").withPassword("")) {
             clickhouse.start();
 

modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java

@@ -1,22 +1,38 @@
 package org.testcontainers.clickhouse;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.r2dbc.AbstractR2DBCDatabaseContainerTest;
+import org.testcontainers.utility.DockerImageName;
 
+@RunWith(Parameterized.class)
 public class ClickHouseR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseContainerTest<ClickHouseContainer> {
 
+    @Parameterized.Parameters(name = "{0}")
+    public static DockerImageName[] params() {
+        return new DockerImageName[]{
+            ClickhouseTestImages.CLICKHOUSE_IMAGE,
+            ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE
+        };
+    }
+
+    @Parameterized.Parameter
+    public DockerImageName image;
+
     @Override
     protected ConnectionFactoryOptions getOptions(ClickHouseContainer container) {
         return ClickHouseR2DBCDatabaseContainer.getOptions(container);
     }
 
     @Override
     protected String createR2DBCUrl() {
-        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=21.9.2-alpine";
+        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=" + image.getVersionPart();
     }
 
     @Override
     protected ClickHouseContainer createContainer() {
-        return new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine");
+        return new ClickHouseContainer(image);
     }
 }