databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java

@@ -0,0 +1,13 @@
+diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java
+--- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java
++++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java
+         .thenAnswer(
+             invocation -> {
+               Request request = invocation.getArgument(0);
++              // Handle host metadata discovery call
++              if (request.getUri().toString().equals(HOST + "/.well-known/databricks-config")) {
++                return new Response("{}", 200, "OK", new URL(HOST));
++              }
+               String expectedUrl = HOST + testCase.path;
+               if (!request.getUri().toString().equals(expectedUrl)) {
+                 throw new AssertionError(
\ No newline at end of file

databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/IdempotencyTestingAPITest.java

@@ -0,0 +1,31 @@
+diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/IdempotencyTestingAPITest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/IdempotencyTestingAPITest.java
+--- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/IdempotencyTestingAPITest.java
++++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/IdempotencyTestingAPITest.java
+   void testIdempotencyAutoRequestID(AutoRequestIDTestCase testCase) throws Exception {
+     // Setup: Create DummyHttpClient with sequential responses for retries
+     DummyHttpClient realClient = new DummyHttpClient();
++    // Add a response for the host metadata discovery call
++    Request metadataRequest =
++        new Request("GET", "https://test.databricks.com/.well-known/databricks-config");
++    realClient.with(
++        metadataRequest,
++        new Response(metadataRequest, 200, "OK", Collections.emptyMap(), "{}"));
+     for (Response response : testCase.httpResponses) {
+       realClient.with(testCase.httpRequest, response);
+     }
+       assertEquals(testCase.wantResult, result, "Test case: " + testCase.name);
+ 
+       // Capture and verify request IDs
++      // 3 calls: host metadata discovery + 2 API calls (initial + retry)
+       ArgumentCaptor<Request> requestCaptor = ArgumentCaptor.forClass(Request.class);
+-      verify(spyClient, times(2)).execute(requestCaptor.capture());
++      verify(spyClient, times(3)).execute(requestCaptor.capture());
+ 
+       List<Request> capturedRequests = requestCaptor.getAllValues();
+-      String firstRequestId = capturedRequests.get(0).getQuery().get("request_id").get(0);
+-      String secondRequestId = capturedRequests.get(1).getQuery().get("request_id").get(0);
++      String firstRequestId = capturedRequests.get(1).getQuery().get("request_id").get(0);
++      String secondRequestId = capturedRequests.get(2).getQuery().get("request_id").get(0);
+ 
+       assertNotNull(firstRequestId, "Auto-generated request_id should not be null");
+       assertFalse(firstRequestId.isEmpty(), "Auto-generated request_id should not be empty");
\ No newline at end of file

_{Reproduce locally: git range-diff f28430b..884e9dd f28430b..27eafd3 | Disable: git config gitstack.push-range-diff false}

databricks-sdk-java/src/test/java/com/databricks/sdk/core/UnifiedHostTest.java

@@ -96,8 +96,9 @@
    }
  
 -  // --- OIDC Endpoint Tests ---
--
--  @Test
++  // --- isAccountClient() Tests ---
+ 
+   @Test
 -  public void testOidcEndpointsForUnifiedHost() throws IOException {
 -    DatabricksConfig config =
 -        new DatabricksConfig()
@@ -114,9 +115,8 @@
 -        "https://unified.databricks.com/oidc/accounts/test-account-123/v1/token",
 -        endpoints.getTokenEndpoint());
 -  }
-+  // --- isAccountClient() Tests ---
- 
-   @Test
+-
+-  @Test
 -  public void testOidcEndpointsForUnifiedHostMissingAccountId() {
 -    DatabricksConfig config =
 -        new DatabricksConfig()
@@ -159,9 +159,7 @@
 +    // Non-accounts hosts are not account clients
      assertFalse(
 -        new DatabricksConfig().setHost("https://adb-123.azuredatabricks.net").isAccountClient());
-+        new DatabricksConfig()
-+            .setHost("https://mycompany.databricks.com")
-+            .isAccountClient());
++        new DatabricksConfig().setHost("https://mycompany.databricks.com").isAccountClient());
    }
  
    // --- Environment Variable Tests ---

databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProviderTest.java

@@ -0,0 +1,31 @@
+diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProviderTest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProviderTest.java
+--- a/databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProviderTest.java
++++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProviderTest.java
+ 
+   @Test
+   void openIDConnectEndPointsTestAccounts() throws IOException {
++    HttpClient mockHttpClient = Mockito.mock(HttpClient.class);
++    // Mock the host metadata call (resolve) to return 404, matching FixtureServer auto-stub
++    // behavior. The actual OIDC endpoints for account clients are computed locally without HTTP.
++    Mockito.doAnswer(
++            invocation -> {
++              Request req = invocation.getArgument(0);
++              if (req.getUrl().contains("/.well-known/databricks-config")) {
++                return new Response(
++                    "{\"error_code\":\"NOT_FOUND\",\"message\":\"not found\"}",
++                    new URL(req.getUrl()));
++              }
++              throw new IOException("Unexpected request: " + req.getUrl());
++            })
++        .when(mockHttpClient)
++        .execute(any(Request.class));
++
+     DatabricksConfig config =
+         new DatabricksConfig()
+             .setAuthType("external-browser")
+             .setHost("https://accounts.cloud.databricks.com")
+-            .setHttpClient(new CommonsHttpClient.Builder().withTimeoutSeconds(30).build())
++            .setHttpClient(mockHttpClient)
+             .setAccountId("testAccountId");
+     config.resolve();
+ 
\ No newline at end of file

databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/IdempotencyTestingAPITest.java

@@ -8,8 +8,7 @@
 +    Request metadataRequest =
 +        new Request("GET", "https://test.databricks.com/.well-known/databricks-config");
 +    realClient.with(
-+        metadataRequest,
-+        new Response(metadataRequest, 200, "OK", Collections.emptyMap(), "{}"));
++        metadataRequest, new Response(metadataRequest, 200, "OK", Collections.emptyMap(), "{}"));
      for (Response response : testCase.httpResponses) {
        realClient.with(testCase.httpRequest, response);
      }

_{Reproduce locally: git range-diff f28430b..27eafd3 f28430b..7810145 | Disable: git config gitstack.push-range-diff false}

databricks-sdk-java/src/test/java/com/databricks/sdk/core/DatabricksConfigTest.java

@@ -132,9 +132,11 @@
        DatabricksConfig config = new DatabricksConfig().setHost(server.getUrl());
        config.resolve(emptyEnv());
        DatabricksException ex =
+     }
+   }
  
-   @Test
-   public void testResolveHostMetadataSetsTokenAudienceForAccountHost() throws IOException {
+-  @Test
+-  public void testResolveHostMetadataSetsTokenAudienceForAccountHost() throws IOException {
 -    // For a unified host with no workspaceId (ACCOUNT client type), resolveHostMetadata should
 -    // set tokenAudience to accountId when not already configured.
 -    String response =
@@ -157,19 +159,11 @@
 -      config.resolveHostMetadata();
 -      assertEquals(DUMMY_ACCOUNT_ID, config.getTokenAudience());
 -    }
-+    // For an account host, resolveHostMetadata should set tokenAudience to accountId
-+    // when not already configured. We verify the preconditions here.
-+    DatabricksConfig accountConfig =
-+        new DatabricksConfig()
-+            .setHost("https://accounts.cloud.databricks.com")
-+            .setAccountId(DUMMY_ACCOUNT_ID);
-+    assertEquals(ClientType.ACCOUNT, accountConfig.getClientType());
-+    assertNull(accountConfig.getTokenAudience());
-+    // When resolve runs with a reachable host, tryResolveHostMetadata will call
-+    // resolveHostMetadata which sets tokenAudience = accountId for ACCOUNT clients.
-   }
- 
+-  }
+-
    @Test
+   public void testResolveHostMetadataDoesNotOverwriteTokenAudience() throws IOException {
+     String response =
                .setAccountId(DUMMY_ACCOUNT_ID)
                .setTokenAudience("custom-audience");
        config.resolve(emptyEnv());

_{Reproduce locally: git range-diff f28430b..7810145 f28430b..19aa378 | Disable: git config gitstack.push-range-diff false}