Merge remote-tracking branch 'origin/jdbc_testing_dbeaver' into jdbc_testing_dbeaver

Author: chernser

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

@@ -11,7 +11,7 @@
 
 import com.clickhouse.client.ClickHouseServerForTest;
 import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 

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

@@ -33,7 +33,12 @@ public static void setUp() throws SQLException {
     }
 
     private Connection getConnection() throws SQLException {
-        return DriverManager.getConnection(getEndpointString(isCloud()));
+        try {
+            return DriverManager.getConnection(getEndpointString(isCloud()));
+        } catch (SQLException e) {
+            Driver.load();
+            return DriverManager.getConnection(getEndpointString(isCloud()));
+        }
     }
 
     private int insertData(String sql) throws SQLException {

jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java

@@ -183,17 +183,17 @@ public void testGetServerVersions() throws Exception {
         }
     }
 
-    @Test(groups = { "integration" })
+    @Test(groups = { "integration" }, enabled = false)
     public void testGetTypeInfo() throws Exception {
         Assert.fail("Not implemented");
     }
 
-    @Test(groups = { "integration" })
+    @Test(groups = { "integration" }, enabled = false)
     public void testGetProcedures() throws Exception {
         Assert.fail("Not implemented");
     }
 
-    @Test(groups = { "integration" })
+    @Test(groups = { "integration" }, enabled = false)
     public void testGetClientInfoProperties() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             DatabaseMetaData dbmd = conn.getMetaData();