Fix connection integration tests to use default catalog (#389)

jayantsing-db · web-flow · commit 03cf782ed0d4 · 2024-08-07T11:13:44.000+05:30
- Default catalog was changed as part of 6453659. Tests will now use default catalog configured in test properties. - Some cosmetic changes as well.
diff --git a/src/main/java/com/databricks/jdbc/core/DatabricksSession.java b/src/main/java/com/databricks/jdbc/core/DatabricksSession.java
@@ -50,7 +50,6 @@ public class DatabricksSession implements IDatabricksSession {
    */
   public DatabricksSession(IDatabricksConnectionContext connectionContext)
       throws DatabricksSQLException {
-    System.out.println(connectionContext.getClientType());
     if (connectionContext.getClientType() == DatabricksClientType.THRIFT) {
       this.databricksClient = new DatabricksThriftServiceClient(connectionContext);
       this.databricksMetadataClient = null;
diff --git a/src/test/java/com/databricks/jdbc/integration/fakeservice/tests/ConnectionIntegrationTests.java b/src/test/java/com/databricks/jdbc/integration/fakeservice/tests/ConnectionIntegrationTests.java
@@ -1,6 +1,6 @@
 package com.databricks.jdbc.integration.fakeservice.tests;
 
-import static com.databricks.jdbc.driver.DatabricksJdbcConstants.HTTP_PATH;
+import static com.databricks.jdbc.driver.DatabricksJdbcConstants.*;
 import static com.databricks.jdbc.integration.IntegrationTestUtil.*;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -10,6 +10,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Properties;
 import org.junit.jupiter.api.Test;
 
 /** Integration tests for connection to Databricks service. */
@@ -29,7 +30,7 @@ void testIncorrectCredentialsForPAT() {
     DatabricksSQLException e =
         assertThrows(
             DatabricksSQLException.class,
-            () -> DriverManager.getConnection(url, getDatabricksUser(), "bad_token"));
+            () -> DriverManager.getConnection(url, createConnectionProperties("bad_token_1")));
 
     assert e.getMessage().contains("Communication link failure. Failed to connect to server.");
   }
@@ -46,8 +47,18 @@ void testIncorrectCredentialsForOAuth() {
     DatabricksSQLException e =
         assertThrows(
             DatabricksSQLException.class,
-            () -> DriverManager.getConnection(url, getDatabricksUser(), "bad_token"));
+            () -> DriverManager.getConnection(url, createConnectionProperties("bad_token_2")));
 
     assert e.getMessage().contains("Communication link failure. Failed to connect to server.");
   }
+
+  private Properties createConnectionProperties(String password) {
+    Properties connProps = new Properties();
+    connProps.put(USER, getDatabricksUser());
+    connProps.put(PASSWORD, password);
+    connProps.put(CATALOG, FakeServiceConfigLoader.getProperty(CATALOG));
+    connProps.put(CONN_SCHEMA, FakeServiceConfigLoader.getProperty(CONN_SCHEMA));
+
+    return connProps;
+  }
 }
diff --git a/src/test/java/com/databricks/jdbc/integration/fakeservice/tests/UCVolumeDataExchangeIntegrationTests.java b/src/test/java/com/databricks/jdbc/integration/fakeservice/tests/UCVolumeDataExchangeIntegrationTests.java
@@ -41,10 +41,8 @@ public class UCVolumeDataExchangeIntegrationTests extends AbstractFakeServiceInt
 
   private DatabricksUCVolumeClient client;
   private Connection con;
-
   private static final String jdbcUrlTemplate =
       "jdbc:databricks://%s/default;transportMode=http;ssl=0;AuthMech=3;httpPath=%s;catalog=SPARK";
-
   private static final String HTTP_PATH = "/sql/1.0/warehouses/791ba2a31c7fd70a";
   private static final String LOCAL_TEST_DIRECTORY = "/tmp";
 
diff --git a/src/test/java/com/databricks/jdbc/integration/fakeservice/tests/UCVolumeIntegrationTests.java b/src/test/java/com/databricks/jdbc/integration/fakeservice/tests/UCVolumeIntegrationTests.java
@@ -25,10 +25,8 @@ public class UCVolumeIntegrationTests extends AbstractFakeServiceIntegrationTest
 
   private DatabricksUCVolumeClient client;
   private Connection con;
-
   private static final String jdbcUrlTemplate =
       "jdbc:databricks://%s/default;transportMode=http;ssl=0;AuthMech=3;httpPath=%s;catalog=SPARK";
-
   private static final String HTTP_PATH = "/sql/1.0/warehouses/791ba2a31c7fd70a";
   private static final String LOCAL_TEST_DIRECTORY = "/tmp";
 
diff --git a/src/test/java/com/databricks/jdbc/local/DriverTester.java b/src/test/java/com/databricks/jdbc/local/DriverTester.java
@@ -104,7 +104,7 @@ void testAllPurposeClusters() throws Exception {
     Connection con = DriverManager.getConnection(jdbcUrl, "token", "xx");
     System.out.println("Connection established......");
     Statement s = con.createStatement();
-    s.executeQuery("SELECT *5 from RANGE(100000000)");
+    s.executeQuery("SELECT * from RANGE(5)");
     con.close();
     System.out.println("Connection closed successfully......");
   }
diff --git a/src/test/resources/sqlgatewayapi/connectionintegrationtests/testincorrectcredentialsforoauth/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-cfbfa049-f80b-4135-a53c-9e1266d54175.json b/src/test/resources/sqlgatewayapi/connectionintegrationtests/testincorrectcredentialsforoauth/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-cfbfa049-f80b-4135-a53c-9e1266d54175.json
@@ -1,20 +1,20 @@
 {
-  "id" : "3acd4f91-ce9f-4319-ac20-ed6522e17587",
+  "id" : "cfbfa049-f80b-4135-a53c-9e1266d54175",
   "name" : "sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv",
   "request" : {
     "url" : "/sql/protocolv1/o/6051921418418893/1115-130834-ms4m0yv",
     "method" : "POST",
     "bodyPatterns" : [ {
-      "binaryEqualTo" : "gAEAAQAAAAtPcGVuU2Vzc2lvbgAAAAEMAAEIAAH////5DQAECwsAAAAACgUCAAAAAAAApQkMBQQLAAEAAAAOaGl2ZV9tZXRhc3RvcmULAAIAAAAHZGVmYXVsdAACBQUBAAA="
+      "binaryEqualTo" : "gAEAAQAAAAtPcGVuU2Vzc2lvbgAAAAEMAAEIAAH////5DQAECwsAAAAACgUCAAAAAAAApQkMBQQLAAEAAAAFU1BBUksLAAIAAAAHZGVmYXVsdAACBQUBAAA="
     } ]
   },
   "response" : {
     "status" : 401,
     "body" : "{\"error_code\":401,\"message\":\"Credential was not sent or was of an unsupported type for this API.\"}",
     "headers" : {
-      "date" : "Fri, 19 Jul 2024 08:52:41 GMT",
+      "date" : "Tue, 06 Aug 2024 06:57:23 GMT",
       "server" : "databricks",
-      "x-databricks-popp-request-id" : "af91657c-841d-4baf-a55d-c443d1aeb63d",
+      "x-databricks-popp-request-id" : "0ef0cc1d-b2fa-4613-98b2-74199fd56618",
       "x-databricks-shard-debug" : "oregon-staging",
       "vary" : "Accept-Encoding",
       "x-databricks-popp-shadow-routing-reason" : "deployment-name",
@@ -24,6 +24,6 @@
       "x-databricks-reason-phrase" : "Credential was not sent or was of an unsupported type for this API."
     }
   },
-  "uuid" : "3acd4f91-ce9f-4319-ac20-ed6522e17587",
+  "uuid" : "cfbfa049-f80b-4135-a53c-9e1266d54175",
   "insertionIndex" : 1
 }
diff --git a/src/test/resources/sqlgatewayapi/connectionintegrationtests/testincorrectcredentialsforpat/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-90906a78-e731-4402-908b-26ede27a09f0.json b/src/test/resources/sqlgatewayapi/connectionintegrationtests/testincorrectcredentialsforpat/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-90906a78-e731-4402-908b-26ede27a09f0.json
@@ -1,20 +1,20 @@
 {
-  "id" : "50186299-876a-4875-aaef-ae047c6040e6",
+  "id" : "90906a78-e731-4402-908b-26ede27a09f0",
   "name" : "sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv",
   "request" : {
     "url" : "/sql/protocolv1/o/6051921418418893/1115-130834-ms4m0yv",
     "method" : "POST",
     "bodyPatterns" : [ {
-      "binaryEqualTo" : "gAEAAQAAAAtPcGVuU2Vzc2lvbgAAAAEMAAEIAAH////5DQAECwsAAAAACgUCAAAAAAAApQkMBQQLAAEAAAAOaGl2ZV9tZXRhc3RvcmULAAIAAAAHZGVmYXVsdAACBQUBAAA="
+      "binaryEqualTo" : "gAEAAQAAAAtPcGVuU2Vzc2lvbgAAAAEMAAEIAAH////5DQAECwsAAAAACgUCAAAAAAAApQkMBQQLAAEAAAAFU1BBUksLAAIAAAAHZGVmYXVsdAACBQUBAAA="
     } ]
   },
   "response" : {
     "status" : 401,
     "body" : "{\"error_code\":401,\"message\":\"Credential was not sent or was of an unsupported type for this API.\"}",
     "headers" : {
-      "date" : "Fri, 19 Jul 2024 08:52:43 GMT",
+      "date" : "Tue, 06 Aug 2024 06:57:24 GMT",
       "server" : "databricks",
-      "x-databricks-popp-request-id" : "643daff2-59aa-4509-860c-69a6d4b5673e",
+      "x-databricks-popp-request-id" : "bed16a93-71dc-4d5f-98f4-7823d09d177e",
       "x-databricks-shard-debug" : "oregon-staging",
       "vary" : "Accept-Encoding",
       "x-databricks-popp-shadow-routing-reason" : "deployment-name",
@@ -24,6 +24,6 @@
       "x-databricks-reason-phrase" : "Credential was not sent or was of an unsupported type for this API."
     }
   },
-  "uuid" : "50186299-876a-4875-aaef-ae047c6040e6",
+  "uuid" : "90906a78-e731-4402-908b-26ede27a09f0",
   "insertionIndex" : 3
 }
diff --git a/src/test/resources/sqlgatewayapi/connectionintegrationtests/testsuccessfulconnection/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-3294b555-ce09-4a9a-839c-183319e0646e.json b/src/test/resources/sqlgatewayapi/connectionintegrationtests/testsuccessfulconnection/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-3294b555-ce09-4a9a-839c-183319e0646e.json
@@ -1,5 +1,5 @@
 {
-  "id" : "2ec61ac1-3cee-46dc-9e9d-99a5fd8ce63a",
+  "id" : "3294b555-ce09-4a9a-839c-183319e0646e",
   "name" : "sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv",
   "request" : {
     "url" : "/sql/protocolv1/o/6051921418418893/1115-130834-ms4m0yv",
@@ -10,11 +10,11 @@
   },
   "response" : {
     "status" : 200,
-    "base64Body" : "gAEAAgAAAAtPcGVuU2Vzc2lvbgAAAAEMAAAMAAEIAAEAAAAAAAgAAgAApQgMAAMMAAELAAEAAAAQmpuMVRYeQ92PzFSCNN6J7AsAAgAAABCjCVHEJlhPeL7YL93dHUTwBg0BAAAACA0BAAClCAANAAQLCwAAAAAMBQQLAAEAAAAFc3BhcmsLAAIAAAAHZGVmYXVsdAACBQUBAAA=",
+    "base64Body" : "gAEAAgAAAAtPcGVuU2Vzc2lvbgAAAAEMAAAMAAEIAAEAAAAAAAgAAgAApQgMAAMMAAELAAEAAAAQSTgtyolIQUODLV4AcBYfUwsAAgAAABDlbutU71FOUbeUj6605PfuBg0BAAAACA0BAAClCAANAAQLCwAAAAAMBQQLAAEAAAAFc3BhcmsLAAIAAAAHZGVmYXVsdAACBQUBAAA=",
     "headers" : {
-      "date" : "Fri, 19 Jul 2024 08:55:06 GMT,Fri, 19 Jul 2024 08:55:06 GMT",
+      "date" : "Tue, 06 Aug 2024 06:57:26 GMT,Tue, 06 Aug 2024 06:57:26 GMT",
       "server" : "databricks",
-      "x-databricks-popp-request-id" : "fbdfa37d-cffb-4e82-bddb-f0b1ec951d7f",
+      "x-databricks-popp-request-id" : "8b25c3a8-319e-4653-8e43-9e5043204701",
       "x-content-type-options" : [ "nosniff", "nosniff" ],
       "x-xss-protection" : "1; mode=block",
       "x-databricks-shard-debug" : "oregon-staging",
@@ -26,6 +26,6 @@
       "strict-transport-security" : [ "max-age=31536000; includeSubDomains; preload", "max-age=31536000; includeSubDomains; preload" ]
     }
   },
-  "uuid" : "2ec61ac1-3cee-46dc-9e9d-99a5fd8ce63a",
-  "insertionIndex" : 2
+  "uuid" : "3294b555-ce09-4a9a-839c-183319e0646e",
+  "insertionIndex" : 6
 }
diff --git a/src/test/resources/sqlgatewayapi/connectionintegrationtests/testsuccessfulconnection/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-b019a29b-6324-4531-bae3-0877b7108885.json b/src/test/resources/sqlgatewayapi/connectionintegrationtests/testsuccessfulconnection/mappings/sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv-b019a29b-6324-4531-bae3-0877b7108885.json
@@ -1,20 +1,20 @@
 {
-  "id" : "0c92cc13-9392-47cc-b50f-4b7ef689f4d4",
+  "id" : "b019a29b-6324-4531-bae3-0877b7108885",
   "name" : "sql_protocolv1_o_6051921418418893_1115-130834-ms4m0yv",
   "request" : {
     "url" : "/sql/protocolv1/o/6051921418418893/1115-130834-ms4m0yv",
     "method" : "POST",
     "bodyPatterns" : [ {
-      "binaryEqualTo" : "gAEAAQAAAAxDbG9zZVNlc3Npb24AAAACDAABDAABDAABCwABAAAAEJqbjFUWHkPdj8xUgjTeiewLAAIAAAAQowlRxCZYT3i+2C/d3R1E8AAAAAA="
+      "binaryEqualTo" : "gAEAAQAAAAxDbG9zZVNlc3Npb24AAAACDAABDAABDAABCwABAAAAEEk4LcqJSEFDgy1eAHAWH1MLAAIAAAAQ5W7rVO9RTlG3lI+utOT37gAAAAA="
     } ]
   },
   "response" : {
     "status" : 200,
     "base64Body" : "gAEAAgAAAAxDbG9zZVNlc3Npb24AAAACDAAADAABCAABAAAAAAAAAA==",
     "headers" : {
-      "date" : "Fri, 19 Jul 2024 08:55:08 GMT,Fri, 19 Jul 2024 08:55:08 GMT",
+      "date" : "Tue, 06 Aug 2024 06:57:27 GMT,Tue, 06 Aug 2024 06:57:27 GMT",
       "server" : "databricks",
-      "x-databricks-popp-request-id" : "26e06b67-04bc-4f98-8cb5-144de70b9955",
+      "x-databricks-popp-request-id" : "c19d9094-c267-46ec-bef7-bfa9b360df22",
       "x-content-type-options" : [ "nosniff", "nosniff" ],
       "x-xss-protection" : "1; mode=block",
       "x-databricks-shard-debug" : "oregon-staging",
@@ -26,6 +26,6 @@
       "strict-transport-security" : [ "max-age=31536000; includeSubDomains; preload", "max-age=31536000; includeSubDomains; preload" ]
     }
   },
-  "uuid" : "0c92cc13-9392-47cc-b50f-4b7ef689f4d4",
-  "insertionIndex" : 1
+  "uuid" : "b019a29b-6324-4531-bae3-0877b7108885",
+  "insertionIndex" : 5
 }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ void testAllPurposeClusters() throws Exception {`
`104`	`104`	`Connection con = DriverManager.getConnection(jdbcUrl, "token", "xx");`
`105`	`105`	`System.out.println("Connection established......");`
`106`	`106`	`Statement s = con.createStatement();`
`107`		`- s.executeQuery("SELECT *5 from RANGE(100000000)");`
	`107`	`+ s.executeQuery("SELECT * from RANGE(5)");`
`108`	`108`	`con.close();`
`109`	`109`	`System.out.println("Connection closed successfully......");`
`110`	`110`	`}`