merge

Author: madhav-db

src/test/java/com/databricks/client/jdbc/SSLTest.java

@@ -289,6 +289,67 @@ public void testWithSystemTrustStore() {
     }
   }
 
+  @Test
+  public void testDirectConnectionSystemTrustStoreFallback() {
+    System.out.println(
+        "Scenario: UseSystemTrustStore=1 with no system property -> fallback to cacerts (direct)");
+
+    // ensure the property is *unset* for this test run
+    String savedProp = System.getProperty("javax.net.ssl.trustStore");
+    try {
+      System.clearProperty("javax.net.ssl.trustStore");
+
+      for (boolean thrift : new boolean[] {true, false}) {
+        String url = buildJdbcUrl(thrift, false, false, false, true, false);
+        try {
+          verifyConnect(url);
+        } catch (Exception e) {
+          fail(
+              "Fallback‑to‑cacerts direct connect failed (thrift="
+                  + thrift
+                  + "): "
+                  + e.getMessage());
+        }
+      }
+    } finally {
+      // restore original system state
+      if (savedProp != null) {
+        System.setProperty("javax.net.ssl.trustStore", savedProp);
+      }
+    }
+  }
+
+  @Test
+  public void testIgnoreSystemPropertyWhenUseSystemTrustStoreDisabled() {
+    System.out.println(
+        "Scenario: bogus javax.net.ssl.trustStore present but UseSystemTrustStore=0 (driver must ignore)");
+
+    String savedProp = System.getProperty("javax.net.ssl.trustStore");
+    try {
+      System.setProperty("javax.net.ssl.trustStore", "/path/that/does/not/exist.jks");
+
+      for (boolean thrift : new boolean[] {true, false}) {
+        String url = buildJdbcUrl(thrift, false, false, false, false, false);
+        try {
+          verifyConnect(url);
+        } catch (Exception e) {
+          fail(
+              "Driver failed to ignore bogus system trust store (thrift="
+                  + thrift
+                  + "): "
+                  + e.getMessage());
+        }
+      }
+    } finally {
+      // restore original value
+      if (savedProp != null) {
+        System.setProperty("javax.net.ssl.trustStore", savedProp);
+      } else {
+        System.clearProperty("javax.net.ssl.trustStore");
+      }
+    }
+  }
+
   @Test
   public void testWithCustomTrustStore() {
     System.out.println("Scenario: Testing with custom trust store");