added more tests for settings

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/insert/InsertSettings.java

@@ -156,8 +156,24 @@ public InsertSettings appCompressedData(boolean enabled, String compressionMetho
         return this;
     }
 
+    /**
+     *
+     * @return true if client compression is enabled
+     * @deprecated because of typo
+     */
     public boolean isClientRequestEnabled() {
-        return (Boolean) settings.getOption(ClientConfigProperties.COMPRESS_CLIENT_REQUEST.getKey());
+        Boolean flag = (Boolean) settings.getOption(ClientConfigProperties.COMPRESS_CLIENT_REQUEST.getKey());
+        return flag != null && flag;
+    }
+
+    /**
+     * Returns indication if client request should be compressed (client side compression).
+     *
+     * @return true if client compression is enabled
+     */
+    public boolean isClientCompressionEnabled() {
+        Boolean flag = (Boolean) settings.getOption(ClientConfigProperties.COMPRESS_CLIENT_REQUEST.getKey());
+        return flag != null && flag;
     }
 
     /**

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

@@ -1,13 +1,16 @@
 package com.clickhouse.client;
 
-import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
+import com.clickhouse.client.api.insert.InsertSettings;
+import com.clickhouse.client.api.query.QuerySettings;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+@Test(groups = {"unit"})
 public class SettingsTests {
 
     @Test
@@ -17,4 +20,125 @@ void testClientSettings() {
         List<String> listB = ClientConfigProperties.valuesFromCommaSeparated(listA);
         Assert.assertEquals(listB, source);
     }
+
+    @Test
+    void testMergeQuerySettings() {
+        QuerySettings settings1 = new QuerySettings().setQueryId("test1").httpHeader("key1",  "value1");
+        QuerySettings settings2 = new QuerySettings().httpHeader("key1",  "value2");
+
+        QuerySettings merged = QuerySettings.merge(settings1, settings2);
+        Assert.assertNotSame(merged, settings1);
+        Assert.assertNotSame(merged, settings2);
+
+        Assert.assertEquals(merged.getAllSettings().get(ClientConfigProperties.httpHeader("key1")), "value2");
+    }
+
+    @Test
+    void testQuerySettingsSpecific() throws Exception {
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.setUseTimeZone("America/Los_Angeles");
+            Assert.assertThrows(IllegalArgumentException.class, () -> settings.setUseServerTimeZone(true));
+            settings.resetOption(ClientConfigProperties.USE_TIMEZONE.getKey());
+            settings.setUseServerTimeZone(true);
+        }
+
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.setUseServerTimeZone(true);
+            Assert.assertTrue(settings.getUseServerTimeZone());
+            Assert.assertThrows(IllegalArgumentException.class, () -> settings.setUseTimeZone("America/Los_Angeles"));
+        }
+
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.setDatabase("test_db1");
+            Assert.assertEquals(settings.getDatabase(), "test_db1");
+        }
+
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.setReadBufferSize(10000);
+            Assert.assertEquals(settings.getReadBufferSize(), 10000);
+
+            Assert.assertThrows(IllegalArgumentException.class, () -> settings.setReadBufferSize(1000));
+        }
+
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.setMaxExecutionTime(10000);
+            Assert.assertEquals(settings.getMaxExecutionTime(), 10000);
+        }
+
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.setDBRoles(Arrays.asList("role1", "role2"));
+            Assert.assertEquals(settings.getDBRoles(), Arrays.asList("role1", "role2"));
+            settings.setDBRoles(Collections.emptyList());
+            Assert.assertEquals(settings.getDBRoles(), Collections.emptyList());
+        }
+
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.logComment("comment1");
+            Assert.assertEquals(settings.getLogComment(), "comment1");
+            settings.logComment("comment2");
+            Assert.assertEquals(settings.getLogComment(), "comment2");
+            settings.logComment(null);
+            Assert.assertNull(settings.getLogComment());
+        }
+    }
+
+    @Test
+    public void testInsertSettingsSpecific() throws Exception {
+        {
+            final InsertSettings settings = new InsertSettings();
+            settings.setDatabase("test_db1");
+            Assert.assertEquals(settings.getDatabase(), "test_db1");
+        }
+
+        {
+            final InsertSettings settings = new InsertSettings();
+            Assert.assertFalse(settings.isClientCompressionEnabled());
+            settings.compressClientRequest(true);
+            Assert.assertTrue(settings.isClientCompressionEnabled());
+            Assert.assertTrue(settings.isClientRequestEnabled());
+        }
+
+
+        {
+            final InsertSettings settings = new InsertSettings();
+            settings.httpHeader("key1", "value1");
+            Assert.assertEquals(settings.getAllSettings().get(ClientConfigProperties.httpHeader("key1")), "value1");
+            settings.httpHeader("key1", "value2");
+            Assert.assertEquals(settings.getAllSettings().get(ClientConfigProperties.httpHeader("key1")), "value2");
+        }
+
+
+        {
+            final InsertSettings settings = new InsertSettings();
+            settings.serverSetting("key1", "value1");
+            Assert.assertEquals(settings.getAllSettings().get(ClientConfigProperties.serverSetting("key1")), "value1");
+            settings.serverSetting("key1", "value2");
+            Assert.assertEquals(settings.getAllSettings().get(ClientConfigProperties.serverSetting("key1")), "value2");
+        }
+
+        {
+            final InsertSettings settings = new InsertSettings();
+            settings.setDBRoles(Arrays.asList("role1", "role2"));
+            Assert.assertEquals(settings.getDBRoles(), Arrays.asList("role1", "role2"));
+            settings.setDBRoles(Collections.emptyList());
+            Assert.assertEquals(settings.getDBRoles(), Collections.emptyList());
+        }
+
+        {
+            final InsertSettings settings = new InsertSettings();
+            settings.logComment("comment1");
+            Assert.assertEquals(settings.getLogComment(), "comment1");
+            settings.logComment("comment2");
+            Assert.assertEquals(settings.getLogComment(), "comment2");
+            settings.logComment(null);
+            Assert.assertNull(settings.getLogComment());
+        }
+    }
 }