fixed tests after changing exceptions

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -1807,6 +1807,8 @@ private TableSchema getTableSchemaImpl(String describeQuery, String name, String
             throw new ClientException("Operation has likely timed out after " + getOperationTimeout() + " seconds.", e);
         } catch (ExecutionException e) {
             throw new ClientException("Failed to get table schema", e.getCause());
+        } catch (ServerException e) {
+            throw e;
         } catch (Exception e) {
             throw new ClientException("Failed to get table schema", e);
         }

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

@@ -321,12 +321,11 @@ public void testServerErrorHandling(ClickHouseFormat format) {
             try (QueryResponse response =
                          client.query("SELECT invalid;statement", querySettings).get(1, TimeUnit.SECONDS)) {
                 Assert.fail("Expected exception");
-            } catch (ClientException e) {
+            } catch (ServerException e) {
                 e.printStackTrace();
-                ServerException serverException = (ServerException) e.getCause();
-                Assert.assertEquals(serverException.getCode(), 62);
-                Assert.assertTrue(serverException.getMessage().startsWith("Code: 62. DB::Exception: Syntax error (Multi-statements are not allowed): failed at position 15 (end of query)"),
-                        "Unexpected error message: " + serverException.getMessage());
+                Assert.assertEquals(e.getCode(), 62);
+                Assert.assertTrue(e.getMessage().startsWith("Code: 62. DB::Exception: Syntax error (Multi-statements are not allowed): failed at position 15 (end of query)"),
+                        "Unexpected error message: " + e.getMessage());
             }
         } catch (Exception e) {
             e.printStackTrace();

client-v2/src/test/java/com/clickhouse/client/command/CommandTests.java

@@ -5,6 +5,7 @@
 import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientException;
+import com.clickhouse.client.api.ServerException;
 import com.clickhouse.client.api.command.CommandResponse;
 import com.clickhouse.client.api.enums.Protocol;
 import org.testng.Assert;
@@ -45,8 +46,10 @@ public void testCreateTable() throws Exception {
     public void testInvalidCommandExecution() throws Exception {
         try {
             client.execute("ALTER TABLE non_existing_table ADD COLUMN id2 UInt32").get(10, TimeUnit.SECONDS);
+        } catch (ServerException e) {
+            Assert.assertEquals(e.getCode(), 60);
         } catch (ExecutionException e) {
-            Assert.assertTrue(e.getCause() instanceof ClientException);
+            Assert.assertTrue(e.getCause() instanceof ServerException);
         } catch (ClientException e) {
             // expected
         }

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

@@ -550,8 +550,10 @@ public void testQueryExceptionHandling() throws Exception {
         try {
             client.queryRecords("SELECT * FROM unknown_table").get(3, TimeUnit.SECONDS);
             Assert.fail("expected exception");
+        } catch (ServerException e) {
+            Assert.assertTrue(e.getMessage().contains("Unknown table"));
         } catch (ExecutionException e) {
-            Assert.assertTrue(e.getCause() instanceof ClientException);
+            Assert.assertTrue(e.getCause() instanceof ServerException);
         } catch (ClientException e) {
             // expected
         }