Migrate tests to using ID4SLAB2, Fixes AB#3525444

docs/access_token-pop.md

@@ -28,7 +28,7 @@ In order to use PoP with MSAL, the `minimum_required_broker_protocol_version` mu
 `app_config.json`
 ```json
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "broker_redirect_uri_registered": true,
   "minimum_required_broker_protocol_version" : "4.0",

msal/build.gradle

@@ -281,9 +281,9 @@ dependencies {
     testImplementation ("org.robolectric:robolectric:$rootProject.ext.robolectricVersion")
     testImplementation "androidx.test:core:$rootProject.ext.androidxTestCoreVersion"
     testLocalImplementation project(':testutils')
+    testLocalImplementation project(':LabApiUtilities')
     testDistImplementation("com.microsoft.identity:testutils:0.0+") {
         exclude module: 'common'
-        exclude group: 'com.microsoft.identity', module: 'LabApiUtilities'
     }
     testImplementation("org.mockito.kotlin:mockito-kotlin:$rootProject.ext.mockitoKotlinVersion") {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'

msal/src/androidTest/res/raw/test_msal_config_multiple_account.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "multiple_clouds_supported":true,

msal/src/androidTest/res/raw/test_msal_config_single_account.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "multiple_clouds_supported":true,

msal/src/androidTest/res/raw/test_pcaconfig_empty_redirect.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "",
   "multiple_clouds_supported":true,

msal/src/test/java/com/microsoft/identity/client/e2e/tests/AcquireTokenAbstractTest.java

@@ -28,6 +28,9 @@
 import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper;
 import com.microsoft.identity.http.MockHttpClient;
 import com.microsoft.identity.internal.testutils.TestUtils;
+import com.microsoft.identity.labapi.utilities.BuildConfig;
+import com.microsoft.identity.labapi.utilities.authentication.LabApiAuthenticationClient;
+import com.microsoft.identity.labapi.utilities.client.LabClient;
 
 import org.junit.After;
 import org.junit.Before;
@@ -44,6 +47,9 @@ public abstract class AcquireTokenAbstractTest extends PublicClientApplicationAb
     protected String[] mScopes;
     protected final MockHttpClient mockHttpClient = MockHttpClient.install();
 
+    private final LabApiAuthenticationClient labApiAuthenticationClient = new LabApiAuthenticationClient(BuildConfig.LAB_CLIENT_SECRET);
+    public final LabClient labClient = new LabClient(labApiAuthenticationClient);
+
     @Before
     public void setup() {
         mScopes = getScopes();

msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/DeviceCodeFlowWithClaimsApiTest.java

@@ -22,56 +22,17 @@
 // THE SOFTWARE.
 package com.microsoft.identity.client.e2e.tests.mocked;
 
-import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_CONFIG_FILE_PATH;
-import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_USGOV_CONFIG_FILE_PATH;
 import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.SINGLE_ACCOUNT_DCF_TEST_CONFIG_FILE_PATH;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.microsoft.identity.client.IAuthenticationResult;
-import com.microsoft.identity.client.IPublicClientApplication;
-import com.microsoft.identity.client.PublicClientApplication;
-import com.microsoft.identity.client.PublicClientApplicationConfiguration;
 import com.microsoft.identity.client.claims.ClaimsRequest;
 import com.microsoft.identity.client.claims.RequestedClaimAdditionalInformation;
-import com.microsoft.identity.client.e2e.shadows.ShadowDeviceCodeFlowCommandAuthError;
-import com.microsoft.identity.client.e2e.shadows.ShadowDeviceCodeFlowCommandSuccessful;
-import com.microsoft.identity.client.e2e.shadows.ShadowDeviceCodeFlowCommandTokenError;
 import com.microsoft.identity.client.e2e.tests.PublicClientApplicationAbstractTest;
-import com.microsoft.identity.client.e2e.utils.RoboTestUtils;
-import com.microsoft.identity.client.exception.MsalException;
-import com.microsoft.identity.common.java.authorities.Authority;
-import com.microsoft.identity.common.java.exception.ClientException;
-import com.microsoft.identity.common.java.exception.ErrorStrings;
-import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsAuthorizationErrorResponse;
-import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsAuthorizationRequest;
-import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsAuthorizationResponse;
-import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsTokenRequest;
-import com.microsoft.identity.common.java.providers.oauth2.AuthorizationResult;
-import com.microsoft.identity.common.java.providers.oauth2.OAuth2Strategy;
-import com.microsoft.identity.common.java.providers.oauth2.OAuth2StrategyParameters;
-import com.microsoft.identity.common.java.providers.oauth2.TokenRequest;
-import com.microsoft.identity.common.java.providers.oauth2.TokenResult;
-import com.microsoft.identity.common.java.util.ResultFuture;
-import com.microsoft.identity.common.java.util.StringUtil;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Testing class for the device code flow protocol. Currently only supporting testing for the API-side

msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenAADTest.java

@@ -25,9 +25,11 @@
 import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper;
 import com.microsoft.identity.internal.testutils.labutils.LabConstants;
 import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;
+import com.microsoft.identity.labapi.utilities.constants.UserType;
 
 import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_CONFIG_FILE_PATH;
 import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_MOONCAKE_CONFIG_FILE_PATH;
+import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_USGOV_CONFIG_FILE_PATH;
 import static com.microsoft.identity.internal.testutils.TestConstants.Scopes.AD_GRAPH_USER_READ_SCOPE;
 import static com.microsoft.identity.internal.testutils.TestConstants.Scopes.OFFICE_USER_READ_SCOPE;
 import static com.microsoft.identity.internal.testutils.TestConstants.Scopes.USER_READ_SCOPE;
@@ -54,19 +56,20 @@ public String getAuthority() {
 
     public static class AzureWorldWideCloudUser extends AcquireTokenAADTest {
         @Override
-        public LabUserQuery getLabUserQuery() {
-            final LabUserQuery query = new LabUserQuery();
-            query.azureEnvironment = LabConstants.AzureEnvironment.AZURE_CLOUD;
-            return query;
+        public UserType getUserType() {
+            return UserType.BASIC;
         }
     }
 
     public static class AzureUsGovCloudUser extends AcquireTokenAADTest {
         @Override
-        public LabUserQuery getLabUserQuery() {
-            final LabUserQuery query = new LabUserQuery();
-            query.azureEnvironment = LabConstants.AzureEnvironment.AZURE_US_GOVERNMENT;
-            return query;
+        public String getConfigFilePath() {
+            return MULTIPLE_ACCOUNT_MODE_AAD_USGOV_CONFIG_FILE_PATH;
+        }
+
+        @Override
+        public UserType getUserType() {
+            return UserType.USGOV;
         }
     }
 
@@ -77,10 +80,8 @@ public String getConfigFilePath() {
         }
 
         @Override
-        public LabUserQuery getLabUserQuery() {
-            final LabUserQuery query = new LabUserQuery();
-            query.azureEnvironment = LabConstants.AzureEnvironment.AZURE_CHINA_CLOUD;
-            return query;
+        public UserType getUserType() {
+            return UserType.CHINA;
         }
     }
 
@@ -91,10 +92,8 @@ public String[] getScopes() {
         }
 
         @Override
-        public LabUserQuery getLabUserQuery() {
-            final LabUserQuery query = new LabUserQuery();
-            query.protectionPolicy = LabConstants.ProtectionPolicy.MAM_CA;
-            return query;
+        public UserType getUserType() {
+            return UserType.MAM_CA;
         }
     }
 
@@ -105,10 +104,9 @@ public String[] getScopes() {
         }
 
         @Override
-        public LabUserQuery getLabUserQuery() {
-            final LabUserQuery query = new LabUserQuery();
-            query.protectionPolicy = LabConstants.ProtectionPolicy.MAM_SPO;
-            return query;
+        public UserType getUserType() {
+            return UserType.MAM_ON_SPO;
         }
+
     }
 }

msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenB2CTest.java

@@ -24,6 +24,7 @@
 
 import com.microsoft.identity.internal.testutils.labutils.LabConstants;
 import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;
+import com.microsoft.identity.labapi.utilities.constants.UserType;
 
 import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.B2C_CUSTOM_DOMAIN_CONFIG_FILE_PATH;
 import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.B2C_GLOBAL_DOMAIN_CONFIG_FILE_PATH;
@@ -57,11 +58,8 @@ public String getConfigFilePath() {
         }
 
         @Override
-        public LabUserQuery getLabUserQuery() {
-            final LabUserQuery query = new LabUserQuery();
-            query.userType = LabConstants.UserType.B2C;
-            query.b2cProvider = LabConstants.B2CProvider.LOCAL;
-            return query;
+        public UserType getUserType() {
+            return UserType.B2C;
         }
 
     }
@@ -74,13 +72,8 @@ public String getConfigFilePath() {
         }
 
         @Override
-        public LabUserQuery getLabUserQuery() {
-            final LabUserQuery query = new LabUserQuery();
-            query.userType = LabConstants.UserType.B2C;
-            query.b2cProvider = LabConstants.B2CProvider.LOCAL;
-            return query;
+        public UserType getUserType() {
+            return UserType.B2C;
         }
-
     }
-
 }

msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenCIAMTest.java

@@ -30,6 +30,7 @@
 import com.microsoft.identity.common.internal.util.StringUtil;
 import com.microsoft.identity.internal.testutils.labutils.LabConstants;
 import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;
+import com.microsoft.identity.labapi.utilities.constants.UserType;
 
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -62,10 +63,8 @@ public String getAuthority() {
     }
 
     @Override
-    public LabUserQuery getLabUserQuery() {
-        final LabUserQuery query = new LabUserQuery();
-        query.federationProvider = LabConstants.FederationProvider.CIAM;
-        return query;
+    public UserType getUserType() {
+        return UserType.CIAM;
     }
 
     public static AuthenticationCallback successfulVerifyIssuerCallback() {

msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenNetworkTest.java

@@ -32,7 +32,8 @@
 import com.microsoft.identity.client.e2e.utils.ErrorCodes;
 import com.microsoft.identity.internal.testutils.TestUtils;
 import com.microsoft.identity.internal.testutils.labutils.LabUserHelper;
-import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;
+import com.microsoft.identity.labapi.utilities.client.ILabAccount;
+import com.microsoft.identity.labapi.utilities.exception.LabApiException;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -62,8 +63,13 @@ public abstract class AcquireTokenNetworkTest extends AcquireTokenAbstractTest i
     @Before
     public void setup() {
         AcquireTokenTestHelper.setAccount(null);
-        final LabUserQuery query = getLabUserQuery();
-        mUsername = LabUserHelper.loadUserForTest(query);
+        try {
+            ILabAccount user = labClient.getAccountFromLabJsonStringInMobileBuildVault(getUserType());
+            mUsername = user.getUsername();
+        } catch (LabApiException e){
+            throw new AssertionError(e);
+        }
+
         super.setup();
     }
 

msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/IAcquireTokenNetworkTest.java

@@ -23,11 +23,13 @@
 package com.microsoft.identity.client.e2e.tests.network;
 
 import com.microsoft.identity.client.e2e.tests.IAcquireTokenTest;
+import com.microsoft.identity.internal.testutils.labutils.LabConstants;
 import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;
+import com.microsoft.identity.labapi.utilities.constants.UserType;
 
 public interface IAcquireTokenNetworkTest extends IAcquireTokenTest {
 
-    LabUserQuery getLabUserQuery();
+    UserType getUserType();
 
 }
 

msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/MultiAccountAndResourceAcquireTokenNetworkTests.java

@@ -30,7 +30,7 @@
 import com.microsoft.identity.client.e2e.tests.AcquireTokenAbstractTest;
 import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper;
 import com.microsoft.identity.internal.testutils.labutils.LabUserHelper;
-import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;
+import com.microsoft.identity.labapi.utilities.constants.UserType;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -75,15 +75,20 @@ public String getConfigFilePath() {
     @Test // test that accounts belonging to multiple clouds can live together in the app
     public void testAcquireTokenAndSilentWithMultipleCloudAccountsSuccess() {
 
-        final LabUserQuery[] queries = new LabUserQuery[]{
-                new AcquireTokenAADTest.AzureWorldWideCloudUser().getLabUserQuery(),
-                new AcquireTokenAADTest.AzureUsGovCloudUser().getLabUserQuery()};
+        final UserType[] userTypes = new UserType[]{
+                new AcquireTokenAADTest.AzureWorldWideCloudUser().getUserType(),
+                new AcquireTokenAADTest.AzureUsGovCloudUser().getUserType()};
 
-        final IAccount[] accounts = new IAccount[queries.length];
+        final IAccount[] accounts = new IAccount[userTypes.length];
 
         // perform interactive call for each account
-        for (int i = 0; i < queries.length; i++) {
-            final String username = LabUserHelper.loadUserForTest(queries[i]);
+        for (int i = 0; i < userTypes.length; i++) {
+            final String username;
+            try {
+                username = labClient.getAccountFromLabJsonStringInMobileBuildVault(new AcquireTokenAADTest.AzureWorldWideCloudUser().getUserType()).getUsername();
+            } catch (Exception e) {
+                throw new AssertionError(e);
+            }
             performInteractiveAcquireTokenCall(username);
             accounts[i] = getAccount();
         }
@@ -96,9 +101,12 @@ public void testAcquireTokenAndSilentWithMultipleCloudAccountsSuccess() {
 
     @Test // test that we can use mrrt to get a token silently for other resources
     public void testAcquireTokenSilentUsingMrrtSuccess() {
-        final LabUserQuery query = new AcquireTokenAADTest.AzureWorldWideCloudUser().getLabUserQuery();
-
-        final String username = LabUserHelper.loadUserForTest(query);
+        final String username;
+        try {
+            username = labClient.getAccountFromLabJsonStringInMobileBuildVault(new AcquireTokenAADTest.AzureWorldWideCloudUser().getUserType()).getUsername();
+        } catch (Exception e) {
+            throw new AssertionError(e);
+        }
 
         final AcquireTokenParameters parameters = new AcquireTokenParameters.Builder()
                 .startAuthorizationFromActivity(mActivity)

msal/src/test/res/raw/aad_capabilities_cp1.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "multiple_clouds_supported":true,

msal/src/test/res/raw/aad_capabilities_none.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "multiple_clouds_supported":true,

msal/src/test/res/raw/multiple_account_aad_test_config.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "multiple_clouds_supported":true,

msal/src/test/res/raw/multiple_account_mock_test_config.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "multiple_clouds_supported":false,

msal/src/test/res/raw/single_account_aad_test_config.json

@@ -1,5 +1,5 @@
 {
-  "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
+  "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80",
   "authorization_user_agent" : "DEFAULT",
   "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
   "multiple_clouds_supported":true,