Run mock API tests without cmd line param (#1980)

Common counterpart AzureAD/microsoft-authentication-library-common-for-android#2260
AzureAD · Dec 29, 2023 · 1768ece · 1768ece
1 parent 101b836
commit 1768ece
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml
@@ -62,13 +62,7 @@ jobs:
   - task: Gradle@2
     displayName: Run Unit tests
     inputs:
-      tasks: msal:testLocalDebugUnitTest -Plabtest -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}} --tests *com.microsoft.identity.client*
-      javaHomeSelection: $(BuildParameters.javaHomeSelection)
-      jdkVersion: 1.11
-  - task: Gradle@2
-    displayName: Run NativeAuth Unit tests
-    inputs:
-      tasks: msal:testLocalDebugUnitTest -PuseMockApiForNativeAuth=true -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}} --tests *com.microsoft.identity.nativeauth*
+      tasks: msal:testLocalDebugUnitTest -Plabtest -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
       javaHomeSelection: $(BuildParameters.javaHomeSelection)
       jdkVersion: 1.11
 - job: spotbugs

diff --git a/...est/java/com/microsoft/identity/nativeauth/NativeAuthPublicClientApplicationJavaTest.java b/...est/java/com/microsoft/identity/nativeauth/NativeAuthPublicClientApplicationJavaTest.java
@@ -22,6 +22,8 @@
 //  THE SOFTWARE.
 package com.microsoft.identity.nativeauth;
 
+import static com.microsoft.identity.common.java.nativeauth.BuildValues.*;
+
 import android.app.Activity;
 import android.content.Context;
 
@@ -32,6 +34,7 @@
 import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper;
 import com.microsoft.identity.client.exception.MsalClientException;
 import com.microsoft.identity.client.exception.MsalException;
+import com.microsoft.identity.common.java.nativeauth.BuildValues;
 import com.microsoft.identity.nativeauth.statemachine.errors.GetAccessTokenError;
 import com.microsoft.identity.nativeauth.statemachine.errors.ResetPasswordError;
 import com.microsoft.identity.nativeauth.statemachine.errors.ResetPasswordSubmitPasswordError;
@@ -77,7 +80,9 @@
 import com.microsoft.identity.nativeauth.statemachine.states.SignUpPasswordRequiredState;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -124,6 +129,16 @@ public String getConfigFilePath() {
         return "src/test/res/raw/native_auth_native_only_test_config.json";
     }
 
+    @BeforeClass
+    public static void setupClass() {
+        setUseMockApiForNativeAuth(true);
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+        setUseMockApiForNativeAuth(false);
+    }
+
     @Before
     public void setup() {
         context = ApplicationProvider.getApplicationContext();

diff --git a/...est/java/com/microsoft/identity/nativeauth/NativeAuthPublicClientApplicationKotlinTest.kt b/...est/java/com/microsoft/identity/nativeauth/NativeAuthPublicClientApplicationKotlinTest.kt
@@ -60,17 +60,20 @@ import com.microsoft.identity.common.nativeauth.MockApiResponseType
 import com.microsoft.identity.common.nativeauth.MockApiUtils.Companion.configureMockApi
 import com.microsoft.identity.common.java.exception.BaseException
 import com.microsoft.identity.common.java.interfaces.IPlatformComponents
+import com.microsoft.identity.common.java.nativeauth.BuildValues
 import com.microsoft.identity.common.java.util.ResultFuture
 import com.microsoft.identity.internal.testutils.TestUtils
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import org.junit.After
+import org.junit.AfterClass
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.Before
+import org.junit.BeforeClass
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -102,6 +105,20 @@ class NativeAuthPublicClientApplicationKotlinTest : PublicClientApplicationAbstr
 
     override fun getConfigFilePath() = "src/test/res/raw/native_auth_native_only_test_config.json"
 
+    companion object {
+        @BeforeClass
+        @JvmStatic
+        fun setupClass() {
+            BuildValues.setUseMockApiForNativeAuth(true)
+        }
+
+        @AfterClass
+        @JvmStatic
+        fun tearDownClass() {
+            BuildValues.setUseMockApiForNativeAuth(false)
+        }
+    }
+
     @Before
     override fun setup() {
         context = ApplicationProvider.getApplicationContext()