Remove ADFS usage where not needed (#5444)

test fixes

Author: gladjohn

tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/OnBehalfOfTests.cs

@@ -226,20 +226,17 @@ public async Task OboAndClientCredentials_WithRegional_ReturnsCorrectTokens_Test
         }
 
         [TestMethod]
-#if IGNORE_FEDERATED
-        [Ignore]
-#endif
         public async Task WithMultipleUsers_TestAsync()
         {
             var aadUser1 = (await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false)).User;
             var aadUser2 = (await LabUserHelper.GetDefaultUser2Async().ConfigureAwait(false)).User;
-            var adfsUser = (await LabUserHelper.GetAdfsUserAsync(FederationProvider.ADFSv2019).ConfigureAwait(false)).User;
+            var aadUser3 = (await LabUserHelper.GetDefaultUser3Async().ConfigureAwait(false)).User;
 
-            await RunOnBehalfOfTestAsync(adfsUser, false).ConfigureAwait(false);
+            await RunOnBehalfOfTestAsync(aadUser3, false).ConfigureAwait(false);
             await RunOnBehalfOfTestAsync(aadUser1, false).ConfigureAwait(false);
             await RunOnBehalfOfTestAsync(aadUser1, true).ConfigureAwait(false);
             await RunOnBehalfOfTestAsync(aadUser2, false).ConfigureAwait(false);
-            await RunOnBehalfOfTestAsync(adfsUser, true).ConfigureAwait(false);
+            await RunOnBehalfOfTestAsync(aadUser3, true).ConfigureAwait(false);
             await RunOnBehalfOfTestAsync(aadUser2, true).ConfigureAwait(false);
             await RunOnBehalfOfTestAsync(aadUser2, false, true).ConfigureAwait(false);
         }

tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/UsernamePasswordIntegrationTests.NetFwk.cs

@@ -81,14 +81,10 @@ public async Task ARLINGTON_ROPC_AAD_CCA_Async()
         }
 
         [RunOn(TargetFrameworks.NetCore)]
-        [TestCategory(TestCategories.Arlington)]
-#if IGNORE_FEDERATED
-        [Ignore]
-#endif
-        public async Task ARLINGTON_ROPC_ADFS_Async()
+        public async Task Public_ROPC_Cloud_Async()
         {
-            var labResponse = await LabUserHelper.GetArlingtonADFSUserAsync().ConfigureAwait(false);
-            await RunHappyPathTestAsync(labResponse).ConfigureAwait(false);
+            var aadUser = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
+            await RunHappyPathTestAsync(aadUser).ConfigureAwait(false);
         }
 
         [RunOn(TargetFrameworks.NetCore)]

tests/Microsoft.Identity.Test.Integration.netcore/SeleniumTests/DeviceCodeFlowIntegrationTest.cs

@@ -62,19 +62,6 @@ public async Task ArlingtonDeviceCodeFlowTestAsync()
             await AcquireTokenWithDeviceCodeFlowAsync(labResponse, "aad user").ConfigureAwait(false);
         }
 
-        [TestMethod]
-        [Timeout(2 * 60 * 1000)] // 2 min timeout
-        [TestCategory(TestCategories.ADFS)]
-#if IGNORE_FEDERATED
-        [Ignore]
-#endif
-        public async Task DeviceCodeFlowAdfsTestAsync()
-        {
-            LabResponse labResponse = await LabUserHelper.GetAdfsUserAsync(FederationProvider.ADFSv2019, true).ConfigureAwait(false);
-
-            await AcquireTokenWithDeviceCodeFlowAsync(labResponse, "adfs user").ConfigureAwait(false);
-        }
-
         [TestMethod]
         [Timeout(2 * 60 * 1000)] // 2 min timeout
         [TestCategory(TestCategories.Arlington)]

tests/Microsoft.Identity.Test.LabInfrastructure/LabUserHelper.cs

@@ -75,6 +75,15 @@ public static Task<LabResponse> GetDefaultUser2Async()
             return GetLabUserDataAsync(UserQuery.PublicAadUser2Query);
         }
 
+        /// <summary>
+        /// Returns the AAD cloud user [email protected]
+        /// </summary>
+        /// <returns></returns>
+        public static Task<LabResponse> GetDefaultUser3Async()
+        {
+            return GetLabUserDataAsync(UserQuery.PublicAadUser3Query);
+        }
+
         public static Task<LabResponse> GetMsaUserAsync()
         {
             return GetLabUserDataAsync(UserQuery.MsaUserQuery);

tests/Microsoft.Identity.Test.LabInfrastructure/UserQueryParameters.cs

@@ -35,6 +35,11 @@ public struct UserQuery
             Upn = "[email protected]"
         };
 
+        public static UserQuery PublicAadUser3Query => new UserQuery()
+        {
+            Upn = "[email protected]"
+        };
+
         public static UserQuery MsaUserQuery => new UserQuery
         {
             UserType = LabInfrastructure.UserType.MSA