Standardize and expand unit tests

msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AccountTest.java

@@ -4,48 +4,35 @@
 package com.microsoft.aad.msal4j;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
 import static com.microsoft.aad.msal4j.Constants.POINT_DELIMITER;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class AccountTest {
 
-    String getEmptyBase64EncodedJson() {
-        return new String(Base64.getEncoder().encode("{}".getBytes()));
-    }
-
-    String getJWTHeaderBase64EncodedJson() {
-        return new String(Base64.getEncoder().encode("{\"alg\": \"HS256\", \"typ\": \"JWT\"}".getBytes()));
-    }
-
-    private String getTestIdToken(String environment, String tenant) throws IOException, URISyntaxException {
+    private static String getTestIdToken(String environment, String tenant) {
         String claims = "{\n" +
                 "  \"iss\": \"" + environment + "\",\n" +
                 "  \"tid\": \"" + tenant + "\"\n" +
                 "}";
 
         String encodedIdToken = new String(Base64.getEncoder().encode(claims.getBytes()), StandardCharsets.UTF_8);
 
-        encodedIdToken = getJWTHeaderBase64EncodedJson() + POINT_DELIMITER +
+        encodedIdToken = TestHelper.getJWTHeaderBase64EncodedJson() + POINT_DELIMITER +
                 encodedIdToken + POINT_DELIMITER +
-                getEmptyBase64EncodedJson();
+                TestHelper.getEmptyBase64EncodedJson();
 
         return encodedIdToken;
     }
 
     @Test
-    void multiCloudAccount_aggregatedInGetAccountsRemoveAccountApis() throws IOException, URISyntaxException {
+    void multiCloudAccount_aggregatedInGetAccountsRemoveAccountApis() throws Exception {
         String BLACK_FORESRT_TENANT = "de_tid";
         String WW_TENTANT = "tid";
         String BLACK_FOREST_ENV = "login.microsoftonline.de";

msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AcquireTokenSilentlyTest.java

@@ -4,7 +4,6 @@
 package com.microsoft.aad.msal4j;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -20,7 +19,6 @@
 import java.util.concurrent.TimeUnit;
 
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class AcquireTokenSilentlyTest {
 
     Account basicAccount = new Account("home_account_id", "login.windows.net", "username", null);
@@ -119,13 +117,7 @@ void confidentialAppAcquireTokenSilently_claimsSkipCache() throws Throwable {
     void testTokenRefreshReasons() throws Exception {
         DefaultHttpClient httpClientMock = mock(DefaultHttpClient.class);
 
-        ConfidentialClientApplication cca =
-                ConfidentialClientApplication.builder("clientId", ClientCredentialFactory.createFromSecret("password"))
-                        .authority("https://login.microsoftonline.com/tenant/")
-                        .instanceDiscovery(false)
-                        .validateAuthority(false)
-                        .httpClient(httpClientMock)
-                        .build();
+        ConfidentialClientApplication cca = TestHelper.buildCca(httpClientMock);
 
         HashMap<String, String> responseParameters = new HashMap<>();
 

msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/AppTokenProviderTest.java

@@ -0,0 +1,245 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.aad.msal4j;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+/**
+ * Tests for token acquisition via the app token provider path
+ * (AcquireTokenByAppProviderSupplier and the appTokenProvider branch
+ * of AcquireTokenByClientCredentialSupplier).
+ */
+class AppTokenProviderTest {
+
+    private static final String VALID_ACCESS_TOKEN = "app-provider-access-token";
+    private static final String TENANT_ID = "test-tenant";
+    private static final long ONE_HOUR_SECONDS = 3600;
+    private static final long TWO_HOURS_SECONDS = 7200;
+
+    // ========================================================================
+    // Helpers
+    // ========================================================================
+
+    private static TokenProviderResult validTokenProviderResult() {
+        TokenProviderResult result = new TokenProviderResult();
+        result.setAccessToken(VALID_ACCESS_TOKEN);
+        result.setExpiresInSeconds(ONE_HOUR_SECONDS);
+        result.setTenantId(TENANT_ID);
+        return result;
+    }
+
+    private static Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> providerReturning(
+            TokenProviderResult result) {
+        return params -> CompletableFuture.completedFuture(result);
+    }
+
+    private static TokenProviderResult invalidResult(Consumer<TokenProviderResult> mutator) {
+        TokenProviderResult result = validTokenProviderResult();
+        mutator.accept(result);
+        return result;
+    }
+
+    // ========================================================================
+    // Valid provider result
+    // ========================================================================
+
+    @Test
+    void appTokenProvider_ValidResult_ReturnsToken() throws Exception {
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(
+                providerReturning(validTokenProviderResult()));
+
+        IAuthenticationResult result = cca.acquireToken(
+                ClientCredentialParameters.builder(TestHelper.TEST_SCOPE_SET).build()).get();
+
+        assertEquals(VALID_ACCESS_TOKEN, result.accessToken());
+    }
+
+    @Test
+    void appTokenProvider_ReceivesCorrectParameters() throws Exception {
+        @SuppressWarnings("unchecked")
+        Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> provider =
+                mock(Function.class);
+
+        when(provider.apply(any())).thenReturn(
+                CompletableFuture.completedFuture(validTokenProviderResult()));
+
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(provider);
+
+        ClientCredentialParameters parameters = ClientCredentialParameters
+                .builder(TestHelper.TEST_SCOPE_SET)
+                .tenant("override-tenant")
+                .build();
+
+        cca.acquireToken(parameters).get();
+
+        verify(provider).apply(argThat(params -> {
+            assertTrue(params.getScopes().contains(TestHelper.TEST_SCOPE));
+            assertEquals("override-tenant", params.getTenantId());
+            assertNotNull(params.getCorrelationId());
+            return true;
+        }));
+    }
+
+    @Test
+    void appTokenProvider_DefaultSkipCache_CallsProviderEachTime() throws Exception {
+        @SuppressWarnings("unchecked")
+        Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> provider =
+                mock(Function.class);
+
+        when(provider.apply(any())).thenReturn(
+                CompletableFuture.completedFuture(validTokenProviderResult()));
+
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(provider);
+
+        ClientCredentialParameters parameters = ClientCredentialParameters
+                .builder(TestHelper.TEST_SCOPE_SET).build();
+
+        // Default skipCache (null) bypasses cache lookup, so provider is called each time
+        cca.acquireToken(parameters).get();
+        cca.acquireToken(parameters).get();
+
+        verify(provider, times(2)).apply(any());
+    }
+
+    @Test
+    void appTokenProvider_SkipCache_BypassesCacheLookup() throws Exception {
+        @SuppressWarnings("unchecked")
+        Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> provider =
+                mock(Function.class);
+
+        when(provider.apply(any())).thenReturn(
+                CompletableFuture.completedFuture(validTokenProviderResult()));
+
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(provider);
+
+        ClientCredentialParameters parameters = ClientCredentialParameters
+                .builder(TestHelper.TEST_SCOPE_SET)
+                .skipCache(true)
+                .build();
+
+        cca.acquireToken(parameters).get();
+        cca.acquireToken(parameters).get();
+
+        // With skipCache=true, provider should be called each time
+        verify(provider, times(2)).apply(any());
+    }
+
+    // ========================================================================
+    // Validation: invalid TokenProviderResult fields
+    // ========================================================================
+
+    @ParameterizedTest(name = "appTokenProvider_InvalidResult_{0}_Throws")
+    @MethodSource("invalidTokenProviderResults")
+    void appTokenProvider_InvalidResult_Throws(String scenario, TokenProviderResult result) throws Exception {
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(providerReturning(result));
+
+        ClientCredentialParameters parameters = ClientCredentialParameters
+                .builder(TestHelper.TEST_SCOPE_SET).build();
+
+        ExecutionException ex = assertThrows(ExecutionException.class,
+                () -> cca.acquireToken(parameters).get());
+        assertInstanceOf(MsalClientException.class, ex.getCause());
+    }
+
+    private static Stream<Arguments> invalidTokenProviderResults() {
+        return Stream.of(
+                Arguments.of("NullAccessToken", invalidResult(r -> r.setAccessToken(null))),
+                Arguments.of("EmptyAccessToken", invalidResult(r -> r.setAccessToken(""))),
+                Arguments.of("ZeroExpiry", invalidResult(r -> r.setExpiresInSeconds(0))),
+                Arguments.of("NegativeExpiry", invalidResult(r -> r.setExpiresInSeconds(-1))),
+                Arguments.of("NullTenantId", invalidResult(r -> r.setTenantId(null))),
+                Arguments.of("EmptyTenantId", invalidResult(r -> r.setTenantId("")))
+        );
+    }
+
+    // ========================================================================
+    // refreshInSeconds auto-calculation
+    // ========================================================================
+
+    @Test
+    void appTokenProvider_ExpiryAtLeastTwoHours_AutoCalculatesRefreshIn() throws Exception {
+        TokenProviderResult providerResult = validTokenProviderResult();
+        providerResult.setExpiresInSeconds(TWO_HOURS_SECONDS);
+        providerResult.setRefreshInSeconds(0);
+
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(
+                providerReturning(providerResult));
+
+        IAuthenticationResult result = cca.acquireToken(
+                ClientCredentialParameters.builder(TestHelper.TEST_SCOPE_SET).build()).get();
+
+        assertEquals(VALID_ACCESS_TOKEN, result.accessToken());
+        assertTrue(result.metadata().refreshOn() > 0,
+                "refreshOn should be auto-calculated when expiresIn >= 2 hours");
+    }
+
+    @Test
+    void appTokenProvider_ExpiryLessThanTwoHours_NoAutoRefreshIn() throws Exception {
+        TokenProviderResult providerResult = validTokenProviderResult();
+        providerResult.setExpiresInSeconds(TWO_HOURS_SECONDS - 1);
+        providerResult.setRefreshInSeconds(0);
+
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(
+                providerReturning(providerResult));
+
+        IAuthenticationResult result = cca.acquireToken(
+                ClientCredentialParameters.builder(TestHelper.TEST_SCOPE_SET).build()).get();
+
+        assertEquals(VALID_ACCESS_TOKEN, result.accessToken());
+        assertEquals(0, result.metadata().refreshOn(),
+                "refreshOn should not be auto-calculated when expiresIn < 2 hours");
+    }
+
+    @Test
+    void appTokenProvider_ExplicitRefreshIn_NotOverridden() throws Exception {
+        TokenProviderResult providerResult = validTokenProviderResult();
+        providerResult.setExpiresInSeconds(TWO_HOURS_SECONDS);
+        providerResult.setRefreshInSeconds(1800); // explicit 30-minute refresh
+
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(
+                providerReturning(providerResult));
+
+        IAuthenticationResult result = cca.acquireToken(
+                ClientCredentialParameters.builder(TestHelper.TEST_SCOPE_SET).build()).get();
+
+        assertEquals(VALID_ACCESS_TOKEN, result.accessToken());
+        // Auto-calculation only triggers when refreshInSeconds == 0
+        assertTrue(result.metadata().refreshOn() > 0);
+    }
+
+    // ========================================================================
+    // Provider exception wrapping
+    // ========================================================================
+
+    @Test
+    void appTokenProvider_ProviderThrows_WrappedInMsalAzureSDKException() throws Exception {
+        Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> throwingProvider =
+                params -> {
+                    CompletableFuture<TokenProviderResult> future = new CompletableFuture<>();
+                    future.completeExceptionally(new RuntimeException("Provider failed"));
+                    return future;
+                };
+
+        ConfidentialClientApplication cca = TestHelper.buildCcaWithAppTokenProvider(throwingProvider);
+
+        ExecutionException ex = assertThrows(ExecutionException.class,
+                () -> cca.acquireToken(
+                        ClientCredentialParameters.builder(TestHelper.TEST_SCOPE_SET).build()).get());
+        assertInstanceOf(MsalAzureSDKException.class, ex.getCause());
+    }
+}