fixed some tests

Author: chernser

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

@@ -89,6 +89,7 @@ protected Client.Builder newClient() {
                 .compressClientRequest(useClientCompression)
                 .useHttpCompression(useHttpCompression)
                 .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
+                .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1")
                 .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"));
     }
 

client-v2/src/test/java/com/clickhouse/client/metadata/MetadataTests.java

@@ -8,7 +8,10 @@
 import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.ClickHouseRequest;
 import com.clickhouse.client.ClickHouseResponse;
+import com.clickhouse.client.ClickHouseServerForTest;
 import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.enums.Protocol;
+import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.metadata.DefaultColumnToMethodMatchingStrategy;
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.data.ClickHouseColumn;
@@ -27,22 +30,17 @@ public class MetadataTests extends BaseIntegrationTest {
 
     @BeforeMethod(groups = { "integration" })
     public void setUp() {
-        ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
-        client = new Client.Builder()
-                .addEndpoint(node.getBaseUri() + "default")
-                .setUsername("default")
-                .setPassword("")
-                .build();
+        client = newClient().build();
     }
 
     @Test(groups = { "integration" })
     public void testGetTableSchema() {
         prepareDataSet("describe_table");
 
-        TableSchema schema = client.getTableSchema("describe_table", "default");
+        TableSchema schema = client.getTableSchema("describe_table", ClickHouseServerForTest.getDatabase());
 
         Assert.assertEquals(schema.getTableName(), "describe_table");
-        Assert.assertEquals(schema.getDatabaseName(), "default");
+        Assert.assertEquals(schema.getDatabaseName(), ClickHouseServerForTest.getDatabase());
 
         Assert.assertEquals(schema.getColumns().size(), 2);
 
@@ -54,10 +52,10 @@ public void testGetTableSchema() {
     private void prepareDataSet(String tableName) {
 
         try {
-            String sql = "CREATE TABLE IF NOT EXISTS default." + tableName + " (param1 UInt32, param2 UInt16) ENGINE = Memory";
+            String sql = "CREATE TABLE IF NOT EXISTS " + tableName + " (param1 UInt32, param2 UInt16) ENGINE = Memory";
             client.execute(sql).get();
 
-            sql = "INSERT INTO default." + tableName + " VALUES (1, 2), (3, 4), (5, 6)";
+            sql = "INSERT INTO " + tableName + " VALUES (1, 2), (3, 4), (5, 6)";
             client.execute(sql).get();
         } catch (Exception e) {
             Assert.fail("Failed to prepare data set", e);
@@ -87,4 +85,16 @@ public Object[][] testMatchingNormalizationData() {
 
         };
     }
+
+    protected Client.Builder newClient() {
+        ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
+        boolean isSecure = isCloud();
+        return new Client.Builder()
+                .addEndpoint(Protocol.HTTP, node.getHost(), node.getPort(), isSecure)
+                .setUsername("default")
+                .setPassword(ClickHouseServerForTest.getPassword())
+                .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
+                .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1")
+                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"));
+    }
 }

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -114,7 +114,6 @@ public QueryTests(boolean useServerCompression, boolean useHttpCompression, bool
     @BeforeMethod(groups = {"integration"})
     public void setUp() {
         ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
-        boolean isSecure = isCloud();
         client = newClient().build();
 
         delayForProfiler(0);
@@ -1932,6 +1931,7 @@ protected Client.Builder newClient() {
                 .useHttpCompression(useHttpCompression)
                 .allowBinaryReaderToReuseBuffers(usePreallocatedBuffers)
                 .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
+                .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1")
                 .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"));
     }
 

jdbc-v2/src/test/java/com/clickhouse/jdbc/JdbcIntegrationTest.java

@@ -46,7 +46,7 @@ public Connection getJdbcConnection(Properties properties) throws SQLException {
     }
 
     protected static String getDatabase() {
-        return ClickHouseServerForTest.isCloud() ? ClickHouseServerForTest.getDatabase() : "default";
+        return ClickHouseServerForTest.getDatabase();
     }
 
     protected boolean runQuery(String query) {