making draft PR

Author: JoshLozensky

UiTests/Common/UiTestHelpers.cs

@@ -376,7 +376,7 @@ public static bool StartAndVerifyProcessesAreRunning(List<ProcessStartOptions> p
                 processes.Add(processDataEntry.ExecutableName, process);
 
                 // Gives the current process time to start up before the next process is run
-                Thread.Sleep(5000);
+                Thread.Sleep(2000);
             }
 
             //Verify that processes are running

UiTests/UiTests/MultiApiTest.cs renamed to UiTests/UiTests/AnyOrgOrPersonalTest.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.Versioning;
 using System.Text;
 using System.Threading.Tasks;
@@ -14,22 +15,21 @@
 using Xunit.Abstractions;
 using Process = System.Diagnostics.Process;
 using TC = Common.TestConstants;
-using TH = Common.UiTestHelpers;
 
 namespace MultipleApiUiTest
 {
-    public class MultiApiTest : IClassFixture<InstallPlaywrightBrowserFixture>
+    public class AnyOrgOrPersonalTest : IClassFixture<InstallPlaywrightBrowserFixture>
     {
         private const string SignOutPageUriPath = @"/MicrosoftIdentity/Account/SignedOut";
         private const uint ClientPort = 44321;
         private const string TraceFileClassName = "OpenIDConnect";
         private const uint NumProcessRetries = 3;
-        private readonly LocatorAssertionsToBeVisibleOptions _assertVisibleOptions = new() { Timeout = 15000 };
-        private readonly string _sampleAppPath = "3-WebApp-multi-APIs" + Path.DirectorySeparatorChar.ToString();
-        private readonly string _testAssemblyLocation = typeof(MultiApiTest).Assembly.Location;
+        private readonly LocatorAssertionsToBeVisibleOptions _assertVisibleOptions = new() { Timeout = 25000 };
+        private readonly string _sampleAppPath = "1-WebApp-OIDC" + Path.DirectorySeparatorChar + "1-3-AnyOrgOrPersonal" + Path.DirectorySeparatorChar.ToString();
+        private readonly string _testAssemblyLocation = typeof(AnyOrgOrPersonalTest).Assembly.Location;
         private readonly ITestOutputHelper _output;
 
-        public MultiApiTest(ITestOutputHelper output)
+        public AnyOrgOrPersonalTest(ITestOutputHelper output)
         {
             _output = output;
         }
@@ -62,7 +62,7 @@ public async Task ChallengeUser_MicrosoftIdFlow_LocalApp_ValidEmailPasswordCreds
                 // The delay before starting client prevents transient devbox issue where the client fails to load the first time after rebuilding
                 var clientProcessOptions = new ProcessStartOptions(_testAssemblyLocation, _sampleAppPath, TC.s_oidcWebAppExe, clientEnvVars);
 
-                bool areProcessesRunning = TH.StartAndVerifyProcessesAreRunning([clientProcessOptions], out processes, NumProcessRetries);
+                bool areProcessesRunning = UiTestHelpers.StartAndVerifyProcessesAreRunning([clientProcessOptions], out processes, NumProcessRetries);
 
                 if (!areProcessesRunning)
                 {
@@ -71,7 +71,7 @@ public async Task ChallengeUser_MicrosoftIdFlow_LocalApp_ValidEmailPasswordCreds
                     foreach (var process in processes)
                     {
 #pragma warning disable CA1305 // Specify IFormatProvider
-                        runningProcesses.AppendLine($"Is {process.Key} running: {TH.ProcessIsAlive(process.Value)}");
+                        runningProcesses.AppendLine($"Is {process.Key} running: {UiTestHelpers.ProcessIsAlive(process.Value)}");
 #pragma warning restore CA1305 // Specify IFormatProvider
                     }
                     Assert.Fail(TC.WebAppCrashedString + " " + runningProcesses.ToString());
@@ -82,17 +82,17 @@ public async Task ChallengeUser_MicrosoftIdFlow_LocalApp_ValidEmailPasswordCreds
                 // Initial sign in
                 _output.WriteLine("Starting web app sign-in flow.");
                 string email = labResponse.User.Upn;
-                await TH.NavigateToWebApp(uriWithPort, page);
-                await TH.EnterEmailAsync(page, email, _output);
-                await TH.EnterPasswordAsync(page, labResponse.User.GetOrFetchPassword(), _output);
+                await UiTestHelpers.NavigateToWebApp(uriWithPort, page);
+                await UiTestHelpers.EnterEmailAsync(page, email, _output);
+                await UiTestHelpers.EnterPasswordAsync(page, labResponse.User.GetOrFetchPassword(), _output);
                 await Assertions.Expect(page.GetByText("Integrating Azure AD V2")).ToBeVisibleAsync(_assertVisibleOptions);
                 await Assertions.Expect(page.GetByText(email)).ToBeVisibleAsync(_assertVisibleOptions);
                 _output.WriteLine("Web app sign-in flow successful.");
 
                 // Sign out
                 _output.WriteLine("Starting web app sign-out flow.");
                 await page.GetByRole(AriaRole.Link, new() { Name = "Sign out" }).ClickAsync();
-                await TH.PerformSignOut_MicrosoftIdFlow(page, email, TC.LocalhostUrl + ClientPort + SignOutPageUriPath, _output);
+                await UiTestHelpers.PerformSignOut_MicrosoftIdFlow(page, email, TC.LocalhostUrl + ClientPort + SignOutPageUriPath, _output);
                 _output.WriteLine("Web app sign out successful.");
             }
             catch (Exception ex)
@@ -111,16 +111,16 @@ public async Task ChallengeUser_MicrosoftIdFlow_LocalApp_ValidEmailPasswordCreds
                     _output.WriteLine("No Screenshot.");
                 }
 
-                string runningProcesses = TH.GetRunningProcessAsString(processes);
+                string runningProcesses = UiTestHelpers.GetRunningProcessAsString(processes);
                 Assert.Fail($"the UI automation failed: {ex} output: {ex.Message}.\n{runningProcesses}\nTest run: {guid}");
             }
             finally
             {
                 // Add the following to make sure all processes and their children are stopped.
-                TH.EndProcesses(processes);
+                UiTestHelpers.EndProcesses(processes);
 
                 // Stop tracing and export it into a zip archive.
-                string path = TH.GetTracePath(_testAssemblyLocation, TraceFileName);
+                string path = UiTestHelpers.GetTracePath(_testAssemblyLocation, TraceFileName);
                 await context.Tracing.StopAsync(new() { Path = path });
                 _output.WriteLine($"Trace data for {TraceFileName} recorded to {path}.");
 

UiTests/UiTests/MultipleApiUiTest.csproj renamed to UiTests/UiTests/AnyOrgOrPersonalUiTest.csproj

@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj" />
-    <ProjectReference Include="..\..\3-WebApp-multi-APIs\WebApp-OpenIDConnect-DotNet.csproj" />
+    <ProjectReference Include="..\..\1-WebApp-OIDC\1-3-AnyOrgOrPersonal\WebApp-OpenIDConnect-DotNet.csproj" />
   </ItemGroup>
 
 </Project>

UiTests/UiTests/UiTests.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35303.130
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleApiUiTest", "MultipleApiUiTest.csproj", "{2B42751A-8650-4DE4-9B46-B01C21825EB1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnyOrgOrPersonalUiTest", "AnyOrgOrPersonalUiTest.csproj", "{2B42751A-8650-4DE4-9B46-B01C21825EB1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "..\Common\Common.csproj", "{3074B729-52E8-408E-8BBC-815FE9217385}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "..\Common\Common.csproj", "{3074B729-52E8-408E-8BBC-815FE9217385}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6A8B8F57-DBC6-43E2-84E7-16D24E54157B}"
 	ProjectSection(SolutionItems) = preProject

UiTests/UiTests/appsettings.Development.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}

UiTests/UiTests/appsettings.json

@@ -0,0 +1,18 @@
+{
+  "AzureAd": {
+    "Instance": "https://login.microsoftonline.com/",
+    "Domain": "msidlab3.onmicrosoft.com",
+    "TenantId": "8e44f19d-bbab-4a82-b76b-4cd0a6fbc97a",
+    "ClientId": "d9cde0be-ad97-41e6-855e-2f85136671c1",
+    "CallbackPath": "/signin-oidc",
+    "SignedOutCallbackPath": "/signout-callback-oidc"
+  },
+  "Logging": {
+    "LogLevel": {
+    "Default": "Information",
+    "Microsoft": "Warning",
+    "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}