Added sample build logic to test

Author: JoshLozensky

UiTests/AnyOrgOrPersonalUiTest/AnyOrgOrPersonalTest.cs

@@ -61,7 +61,7 @@ public async Task ChallengeUser_MicrosoftIdFlow_LocalApp_ValidEmailPasswordCreds
             try
             {
                 // Build the sample app with correct appsettings file.
-                UiTestHelpers.BuildSampleWithTestAppsettings(_testAssemblyLocation, _sampleAppPath, _testAppsettingsPath, SampleSlnFileName);
+                UiTestHelpers.BuildSampleUsingTestAppsettings(_testAssemblyLocation, _sampleAppPath, _testAppsettingsPath, SampleSlnFileName);
 
                 // Start the web app and api processes.
                 // The delay before starting client prevents transient devbox issue where the client fails to load the first time after rebuilding

UiTests/B2CUiTest/B2CUiTest.cs

@@ -24,19 +24,24 @@ public class B2CUiTest : IClassFixture<InstallPlaywrightBrowserFixture>
         private const string KeyvaultClientSecretName = "IdWeb-B2C-Client-ClientSecret";
         private const string NameOfUser = "unknown";
         private const uint ProcessStartupRetryNum = 3;
+        private const string SampleSolutionFileName = "4-2-B2C-Secured-API.sln";
         private const uint TodoListClientPort = 5000;
         private const uint TodoListServicePort = 44332;
         private const string TraceClassName = "B2C-Login";
+
         private readonly LocatorAssertionsToBeVisibleOptions _assertVisibleOptions = new() { Timeout = 25000 };
-        private readonly string _sampleClientAppPath = Path.Join("4-WebApp-your-API", "4-2-B2C", TC.s_todoListClientPath);
-        private readonly string _sampleServiceAppPath = Path.Join("4-WebApp-your-API", "4-2-B2C", TC.s_todoListServicePath);
+        private readonly string _sampleClientAppPath;
+        private readonly string _samplePath = Path.Join("4-WebApp-your-API", "4-2-B2C");
+        private readonly string _sampleServiceAppPath;
         private readonly Uri _keyvaultUri = new("https://webappsapistests.vault.azure.net");
         private readonly ITestOutputHelper _output;
         private readonly string _testAssemblyLocation = typeof(B2CUiTest).Assembly.Location;
 
         public B2CUiTest(ITestOutputHelper output)
         {
             _output = output;
+            _sampleClientAppPath = Path.Join(_samplePath, TC.s_todoListClientPath);
+            _sampleServiceAppPath = Path.Join(_samplePath, TC.s_todoListServicePath);
         }
 
         [Fact]
@@ -72,6 +77,8 @@ public async Task B2C_ValidCreds_LoginLogout()
 
             try
             {
+                UiTestHelpers.BuildSampleUsingSampleAppsettings(_testAssemblyLocation, _samplePath, SampleSolutionFileName);
+
                 // Start the web app and api processes.
                 // 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, _sampleClientAppPath, TC.s_todoListClientExe, clientEnvVars); // probs need to add client specific path

UiTests/Common/UiTestHelpers.cs

@@ -235,7 +235,7 @@ private static string GetApplicationWorkingDirectory(string testAssemblyLocation
         /// <param name="testAssemblyLocation">The path to the test's directory</param>
         /// <param name="appLocation">The path to the processes directory</param>
         /// <returns>The path to the directory for the given app</returns>
-        private static string GetAppsettingsDirectory(string testAssemblyLocation, string appLocation)
+        private static string GetAbsoluteAppDirectory(string testAssemblyLocation, string appLocation)
         {
             string testedAppLocation = Path.GetDirectoryName(testAssemblyLocation)!;
             // e.g. microsoft-identity-web\tests\E2E Tests\WebAppUiTests\bin\Debug\net6.0
@@ -528,7 +528,7 @@ private static void BuildSolution(string solutionPath)
                 process.WaitForExit();
             }
 
-            Console.WriteLine("Solution rebuild initiated.");
+            Console.WriteLine("Solution build initiated.");
         }
 
         /// <summary>
@@ -538,23 +538,29 @@ private static void BuildSolution(string solutionPath)
         /// <param name="sampleRelPath">Relative path to the sample app to build starting at the repo's root, does not include appsettings filename</param>
         /// <param name="testAppsettingsRelPath">Relative path to the test appsettings file starting at the repo's root, includes appsettings filename</param>
         /// <param name="solutionFileName">Filename for the sln file to build</param>
-        public static void BuildSampleWithTestAppsettings(
+        public static void BuildSampleUsingTestAppsettings(
             string testAssemblyLocation, 
             string sampleRelPath, 
             string testAppsettingsRelPath,
             string solutionFileName
             )
         {
-            string appsettingsDirectory = GetAppsettingsDirectory(testAssemblyLocation, sampleRelPath);
+            string appsettingsDirectory = GetAbsoluteAppDirectory(testAssemblyLocation, sampleRelPath);
             string appsettingsAbsPath = Path.Combine(appsettingsDirectory, TestConstants.AppSetttingsDotJson);
-            string testAppsettingsAbsPath = GetAppsettingsDirectory(testAssemblyLocation, testAppsettingsRelPath);
+            string testAppsettingsAbsPath = GetAbsoluteAppDirectory(testAssemblyLocation, testAppsettingsRelPath);
 
             SwapFiles(appsettingsAbsPath, testAppsettingsAbsPath);
 
-            try { BuildSolution(appsettingsDirectory + solutionFileName); }
+            try { BuildSolution(Path.Combine(appsettingsDirectory, solutionFileName)); }
             catch (Exception) { throw; }
             finally { SwapFiles(appsettingsAbsPath, testAppsettingsAbsPath); }
         }
+
+        public static void BuildSampleUsingSampleAppsettings(string testAssemblyLocation, string sampleRelPath, string solutionFileName)
+        {
+            string appsDirectory = GetAbsoluteAppDirectory(testAssemblyLocation, sampleRelPath);
+            BuildSolution(Path.Combine(appsDirectory, solutionFileName)); 
+        }
     }
 
     /// <summary>