Change constructor argument of TestingClickHouseServer

trinodb · Jan 19, 2022 · 6565276 · 6565276
1 parent 02d7e37
commit 6565276
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...ouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseLatestConnectorSmokeTest.java b/...ouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseLatestConnectorSmokeTest.java
@@ -17,7 +17,7 @@
 import io.trino.testing.QueryRunner;
 
 import static io.trino.plugin.clickhouse.ClickHouseQueryRunner.createClickHouseQueryRunner;
-import static io.trino.plugin.clickhouse.TestingClickHouseServer.LATEST_VERSION;
+import static io.trino.plugin.clickhouse.TestingClickHouseServer.CLICKHOUSE_LATEST_IMAGE;
 
 public class TestClickHouseLatestConnectorSmokeTest
         extends BaseClickHouseConnectorSmokeTest
@@ -27,7 +27,7 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         return createClickHouseQueryRunner(
-                closeAfterClass(new TestingClickHouseServer(LATEST_VERSION)),
+                closeAfterClass(new TestingClickHouseServer(CLICKHOUSE_LATEST_IMAGE)),
                 ImmutableMap.of(),
                 ImmutableMap.<String, String>builder()
                         .put("clickhouse.map-string-as-varchar", "true")

diff --git a/...in/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestingClickHouseServer.java b/...in/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestingClickHouseServer.java
@@ -29,18 +29,18 @@ public class TestingClickHouseServer
         implements Closeable
 {
     private static final DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server");
-    public static final String LATEST_VERSION = "21.11.10.1";
-    public static final String DEFAULT_VERSION = "20.8";
+    public static final DockerImageName CLICKHOUSE_LATEST_IMAGE = CLICKHOUSE_IMAGE.withTag("21.11.10.1");
+    public static final DockerImageName CLICKHOUSE_DEFAULT_IMAGE = CLICKHOUSE_IMAGE.withTag("20.8");
     private final ClickHouseContainer dockerContainer;
 
     public TestingClickHouseServer()
     {
-        this(DEFAULT_VERSION);
+        this(CLICKHOUSE_DEFAULT_IMAGE);
     }
 
-    public TestingClickHouseServer(String version)
+    public TestingClickHouseServer(DockerImageName image)
     {
-        dockerContainer = (ClickHouseContainer) new ClickHouseContainer(CLICKHOUSE_IMAGE.withTag(version))
+        dockerContainer = (ClickHouseContainer) new ClickHouseContainer(image)
                 .withCopyFileToContainer(forClasspathResource("custom.xml"), "/etc/clickhouse-server/config.d/custom.xml")
                 .withStartupAttempts(10);