Polish

Author: eddumelendez

modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java

@@ -21,8 +21,6 @@
  */
 public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
 
-    private static final String NAME = "clickhouse";
-
     static final String CLICKHOUSE_CLICKHOUSE_SERVER = "clickhouse/clickhouse-server";
 
     private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse(CLICKHOUSE_CLICKHOUSE_SERVER);
@@ -33,7 +31,7 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
 
-    private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+    private static final String JDBC_URL_PREFIX = "jdbc:clickhouse://";
 
     private static final String TEST_QUERY = "SELECT 1";
 

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

@@ -1,68 +1,58 @@
 package org.testcontainers.clickhouse;
 
-import com.zaxxer.hikari.pool.PoolInitializationException;
 import org.junit.Test;
 import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
-import org.testcontainers.utility.DockerImageName;
 
 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.assertThrows;
-import static org.junit.Assert.assertTrue;
 
 public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        for (DockerImageName image : Arrays.asList(ClickhouseTestImages.CLICKHOUSE_IMAGE, ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
-            try (ClickHouseContainer clickhouse = new ClickHouseContainer(image)) {
-                clickhouse.start();
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")) {
+            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 {
-        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();
+        try (
+            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
+                .withUsername("default")
+                .withPassword("")
+                .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() {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)
-            .withUsername("default").withPassword("")) {
+    public void testNewAuth() throws SQLException {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
             clickhouse.start();
 
-            PoolInitializationException exception = assertThrows(PoolInitializationException.class, () -> performQuery(clickhouse, "SELECT 1"));
-            Throwable cause = exception.getCause();
-            assertTrue(cause instanceof SQLException);
-            assertTrue(cause.getMessage().contains("Authentication failed: password is incorrect, or there is no user with such name."));
+            ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(1);
         }
     }
 }

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

@@ -1,38 +1,22 @@
 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=" + image.getVersionPart();
+        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=21.9.2-alpine";
     }
 
     @Override
     protected ClickHouseContainer createContainer() {
-        return new ClickHouseContainer(image);
+        return new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine");
     }
 }