Merge pull request #2681 from ClickHouse/upgrade-testcontainers-version

Upgrade testcontainers version + aline tests to work TestNG

Author: chernser

clickhouse-data/src/test/java/com/clickhouse/data/value/ClickHouseLongValueTest.java

@@ -11,7 +11,7 @@
 import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.UUID;
-import org.junit.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 import com.clickhouse.data.BaseClickHouseValueTest;
 import com.clickhouse.data.ClickHouseDataType;

clickhouse-data/src/test/java/com/clickhouse/data/value/array/ClickHouseByteArrayValueTest.java

@@ -1,26 +1,26 @@
 package com.clickhouse.data.value.array;
 
-import org.junit.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 public class ClickHouseByteArrayValueTest {
     @Test(groups = { "unit" })
     public void testConvertToBoolean() {
         ClickHouseByteArrayValue v = ClickHouseByteArrayValue
                 .of(new byte[] { 0, 1, -1 });
-        Assert.assertArrayEquals(v.getValue(), new byte[] { 0, 1, -1 });
-        Assert.assertArrayEquals(v.asArray(Boolean.class), new Boolean[] { false, true, false });
+        Assert.assertEquals(v.getValue(), new byte[] { 0, 1, -1 });
+        Assert.assertEquals(v.asArray(Boolean.class), new Boolean[] { false, true, false });
     }
 
     @Test(groups = { "unit" })
     public void testConvertFromBoolean() {
         ClickHouseByteArrayValue v = ClickHouseByteArrayValue.ofEmpty();
-        Assert.assertArrayEquals(v.getValue(), new byte[0]);
+        Assert.assertEquals(v.getValue(), new byte[0]);
         v.update(new boolean[] { false, true, false });
-        Assert.assertArrayEquals(v.getValue(), new byte[] { 0, 1, 0 });
+        Assert.assertEquals(v.getValue(), new byte[] { 0, 1, 0 });
         v.resetToNullOrEmpty();
-        Assert.assertArrayEquals(v.getValue(), new byte[0]);
+        Assert.assertEquals(v.getValue(), new byte[0]);
         v.update(new Boolean[] { Boolean.FALSE, Boolean.FALSE, Boolean.TRUE });
-        Assert.assertArrayEquals(v.getValue(), new byte[] { 0, 0, 1 });
+        Assert.assertEquals(v.getValue(), new byte[] { 0, 0, 1 });
     }
 }

clickhouse-data/src/test/java/com/clickhouse/data/value/array/ClickHouseLongArrayValueTest.java

@@ -2,24 +2,24 @@
 
 import java.math.BigInteger;
 
-import org.junit.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 public class ClickHouseLongArrayValueTest {
     @Test(groups = { "unit" })
     public void testConvertToBigInteger() {
         ClickHouseLongArrayValue v = ClickHouseLongArrayValue
                 .of(new long[] { 1L, new BigInteger("9223372036854775808").longValue() });
-        Assert.assertArrayEquals(v.getValue(), new long[] { 1L, -9223372036854775808L });
-        Assert.assertArrayEquals(v.asArray(BigInteger.class),
+        Assert.assertEquals(v.getValue(), new long[] { 1L, -9223372036854775808L });
+        Assert.assertEquals(v.asArray(BigInteger.class),
                 new BigInteger[] { BigInteger.ONE, new BigInteger("9223372036854775808") });
     }
 
     @Test(groups = { "unit" })
     public void testConvertFromBigInteger() {
         ClickHouseLongArrayValue v = ClickHouseLongArrayValue.ofEmpty();
-        Assert.assertArrayEquals(v.getValue(), new long[0]);
+        Assert.assertEquals(v.getValue(), new long[0]);
         v.update(new BigInteger[] { BigInteger.ONE, new BigInteger("9223372036854775808") });
-        Assert.assertArrayEquals(v.getValue(), new long[] { 1L, -9223372036854775808L });
+        Assert.assertEquals(v.getValue(), new long[] { 1L, -9223372036854775808L });
     }
 }

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java

@@ -48,7 +48,7 @@
 import eu.rekawek.toxiproxy.ToxiproxyClient;
 
 import org.testcontainers.containers.ToxiproxyContainer;
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDataSourceTest.java

@@ -7,9 +7,7 @@
 import java.util.Properties;
 
 import com.clickhouse.client.ClickHouseServerForTest;
-import junit.runner.Version;
 import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java

@@ -1,8 +1,7 @@
 package com.clickhouse.jdbc;
 
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

clickhouse-r2dbc/src/test/java/com/clickhouse/r2dbc/BaseR2dbcTest.java

@@ -1,7 +1,5 @@
 package com.clickhouse.r2dbc;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 
@@ -20,13 +18,11 @@ public abstract class BaseR2dbcTest extends BaseIntegrationTest {
             && !"HTTP".equals(CUSTOM_PROTOCOL_NAME) ? "http_connection_provider=" + CUSTOM_PROTOCOL_NAME : "";
 
     @BeforeAll
-    @BeforeClass
     public static void beforeSuite() throws Exception {
         ClickHouseServerForTest.beforeSuite();
     }
 
     @AfterAll
-    @AfterClass
     public static void afterSuite() throws Exception {
         ClickHouseServerForTest.afterSuite();
     }

clickhouse-r2dbc/src/test/java/com/clickhouse/r2dbc/connection/ClickHouseConnectionTest.java

@@ -2,9 +2,7 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Assertions;
 import com.clickhouse.r2dbc.BaseR2dbcTest;
 
 import io.r2dbc.spi.ConnectionFactory;
@@ -24,8 +22,8 @@ protected void executeQuery(String sql, String expectedStringResults, String cus
                 .then()
                 .block();
 
-        Assert.assertNull("Should not run into error", error.get());
-        Assert.assertEquals(expectedStringResults, builder.toString());
+        Assertions.assertNull(error.get(), "Should not run into error");
+        Assertions.assertEquals(expectedStringResults, builder.toString());
     }
 
     // @Test

client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java

@@ -53,7 +53,7 @@
 import java.util.regex.Pattern;
 
 import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
-import static org.junit.Assert.fail;
+import static org.testng.Assert.fail;
 
 @Test(groups = {"integration"})
 public class HttpTransportTests extends BaseIntegrationTest {

client-v2/src/test/java/com/clickhouse/client/datatypes/RowBinaryFormatWriterTest.java

@@ -16,7 +16,7 @@
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.data.ClickHouseFormat;
 import com.clickhouse.data.ClickHouseVersion;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;