Log updates and Test Cases

microsoft · Nov 20, 2024 · 102db5d · 102db5d
1 parent 09a3422
commit 102db5d
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 42 deletions.
diff --git a/samples/coe-kit-setup-wizard/Record.ps1 b/samples/coe-kit-setup-wizard/Record.ps1
@@ -5,31 +5,35 @@ $jsonContent = Get-Content -Path .\config.json -Raw
 $config = $jsonContent | ConvertFrom-Json
 $tenantId = $config.tenantId
 $environmentId = $config.environmentId
+$user1Email = $config.user1Email
 
 if ([string]::IsNullOrEmpty($environmentId)) {
     Write-Error "Environment not configured. Please update config.json"
     return
 }
 
-$textResult = [string] (pac env list)
-
 $foundEnvironment = $false
-$textResult = [string] (pac env select --environment $environmentId)
+$textResult = (pac env select --environment $environmentId)
+$textResult = (pac env list)
 
-try{
-    $textResult -match "'(https://[^\s']+)'"
-    $environmentMatch = $matches
-    $foundEnvironment = $true
-} catch {
-
+$environmentUrl = ""
+
+Write-Host "Searching for $environmentId"
+
+foreach ($line in $textResult) {
+    if ($line -match $environmentId) {
+        if ($line -match "(https://\S+/)") {
+            $environmentUrl = $matches[0].Substring(0,$matches[0].Length - 1)
+            $foundEnvironment = $true
+            break
+        }
+    }
 }
 
-# Extract the URL using a general regular expression
-if ($foundEnvironment -and $environmentMatch.Count -ge 1) {
-    $environmentUrl = $environmentMatch[1].TrimEnd("/")
+if ($foundEnvironment) {
+    Write-Output "Found matching Environment URL: $environmentUrl"
 } else {
-    Write-Output "URL not found. Please create authentication and re-run script"
-    pac auth create --environment $environmentId
+    Write-Output "Environment ID not found."
     return
 }
 
@@ -62,7 +66,8 @@ if ($config.installPlaywright) {
 
 Set-Location ..\bin\Debug\PowerAppsTestEngine
 # Run the tests for each user in the configuration file.
-dotnet PowerAppsTestEngine.dll -u "browser" -p "mda" -a "none" -r True -i "$currentDirectory\record.fx.yaml" -t $tenantId -e $environmentId -d "$mdaUrl" -w True
+$env:user1Email = $user1Email
+dotnet PowerAppsTestEngine.dll -u "storagestate" -p "mda" -a "none" -r True -i "$currentDirectory\record.fx.yaml" -t $tenantId -e $environmentId -d "$mdaUrl" -w True
 
 # Reset the location back to the original directory.
 Set-Location $currentDirectory
diff --git a/samples/coe-kit-setup-wizard/RunTests.ps1 b/samples/coe-kit-setup-wizard/RunTests.ps1
@@ -5,31 +5,35 @@ $jsonContent = Get-Content -Path .\config.json -Raw
 $config = $jsonContent | ConvertFrom-Json
 $tenantId = $config.tenantId
 $environmentId = $config.environmentId
+$user1Email = $config.user1Email
 
 if ([string]::IsNullOrEmpty($environmentId)) {
     Write-Error "Environment not configured. Please update config.json"
     return
 }
 
-$textResult = [string] (pac env list)
-
 $foundEnvironment = $false
-$textResult = [string] (pac env select --environment $environmentId)
+$textResult = (pac env select --environment $environmentId)
+$textResult = (pac env list)
 
-try{
-    $textResult -match "'(https://[^\s']+)'"
-    $environmentMatch = $matches
-    $foundEnvironment = $true
-} catch {
-
+$environmentUrl = ""
+
+Write-Host "Searching for $environmentId"
+
+foreach ($line in $textResult) {
+    if ($line -match $environmentId) {
+        if ($line -match "(https://\S+/)") {
+            $environmentUrl = $matches[0].Substring(0,$matches[0].Length - 1)
+            $foundEnvironment = $true
+            break
+        }
+    }
 }
 
-# Extract the URL using a general regular expression
-if ($foundEnvironment -and $environmentMatch.Count -ge 1) {
-    $environmentUrl = $environmentMatch[1].TrimEnd("/")
+if ($foundEnvironment) {
+    Write-Output "Found matching Environment URL: $environmentUrl"
 } else {
-    Write-Output "URL not found. Please create authentication and re-run script"
-    pac auth create --environment $environmentId
+    Write-Output "Environment ID not found."
     return
 }
 
@@ -60,6 +64,7 @@ if ($config.installPlaywright) {
 }
 
 Set-Location ..\bin\Debug\PowerAppsTestEngine
+$env:user1Email = $user1Email
 # Run the tests for each user in the configuration file.
 dotnet PowerAppsTestEngine.dll -u "storagestate" -p "mda" -a "none" -i "$currentDirectory\testPlan.fx.yaml" -t $tenantId -e $environmentId -d "$mdaUrl" -l Debug
 

diff --git a/samples/coe-kit-setup-wizard/record.fx.yaml b/samples/coe-kit-setup-wizard/record.fx.yaml
@@ -23,5 +23,5 @@ testSettings:
 environmentVariables:
   users:
     - personaName: User1
-      emailKey: NotNeeded
+      emailKey: user1Email
       passwordKey: NotNeeded
diff --git a/samples/coe-kit-setup-wizard/testPlan.fx.yaml b/samples/coe-kit-setup-wizard/testPlan.fx.yaml
@@ -9,8 +9,8 @@ testSuite:
       testCaseDescription: Verify pre-requistes in place
       testSteps: |
         = 
-        TestEngine.ConsentDialog(Table({Text: "Center of Excellence Setup Wizard"}));
-        TestEngine.Pause();
+        Experimental.ConsentDialog(Table({Text: "Center of Excellence Setup Wizard"}));
+        Experimental.Pause();
         Set(configStep, 1); 
         Assert(configStep=1);
         Select(btnNext);
@@ -21,7 +21,7 @@ testSuite:
         Assert(configStep=2);
         Assert(CountRows(colCommunicate)=3);
         Experimental.SelectControl(Button3,1);
-        TestEngine.Pause();    
+        Experimental.Pause();    
 testSettings:
   headless: false
   locale: "en-US"
@@ -35,5 +35,5 @@ testSettings:
 environmentVariables:
   users:
     - personaName: User1
-      emailKey: NotNeeded
+      emailKey: user1Email
       passwordKey: NotNeeded
diff --git a/src/Microsoft.PowerApps.TestEngine.Tests/Reporting/TestLogTests.cs b/src/Microsoft.PowerApps.TestEngine.Tests/Reporting/TestLogTests.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+using System;
+using Microsoft.PowerApps.TestEngine.Reporting;
+using Xunit;
+
+namespace Microsoft.PowerApps.TestEngine.Tests.Reporting
+{
+    public class TestLogTests
+    {
+        [Fact]
+        public void DateTest()
+        {
+            // Arrange
+            var test = new DateTime(2022, 11, 16);
+            var log = new TestLog() { TimeStamper = () => test };
+
+            // Act & Assert
+            Assert.Equal(test ,log.When);
+
+            // Assert
+        }
+    }
+}
diff --git a/src/Microsoft.PowerApps.TestEngine.Tests/TestEngineTests.cs b/src/Microsoft.PowerApps.TestEngine.Tests/TestEngineTests.cs
@@ -82,14 +82,16 @@ public async Task TestEngineWithDefaultParamsTest()
             var outputDirectory = new DirectoryInfo("TestOutput");
             var testRunId = Guid.NewGuid().ToString();
             var expectedOutputDirectory = outputDirectory.FullName;
-            var testRunDirectory = Path.Combine(expectedOutputDirectory, testRunId.Substring(0, 6));
+            var testRunDirectory = Path.Combine(expectedOutputDirectory, "2024-11-20T00-00-00-0000000-" + testRunId.Substring(0, 6));
             var domain = "apps.powerapps.com";
 
             var expectedTestReportPath = "C:\\test.trx";
 
             SetupMocks(expectedOutputDirectory, testSettings, testSuiteDefinition, testRunId, expectedTestReportPath);
 
             var testEngine = new TestEngine(MockState.Object, ServiceProvider, MockTestReporter.Object, MockFileSystem.Object, MockLoggerFactory.Object, MockTestEngineEventHandler.Object);
+            testEngine.Timestamper = () => new DateTime(2024, 11, 20);
+
             var testReportPath = await testEngine.RunTestAsync(testConfigFile, environmentId, tenantId, outputDirectory, domain, "");
 
             Assert.Equal(expectedTestReportPath, testReportPath);
@@ -156,14 +158,16 @@ public async Task TestEngineWithUnspecifiedLocaleShowsWarning()
             var outputDirectory = new DirectoryInfo("TestOutput");
             var testRunId = Guid.NewGuid().ToString();
             var expectedOutputDirectory = outputDirectory.FullName;
-            var testRunDirectory = Path.Combine(expectedOutputDirectory, testRunId.Substring(0, 6));
+            var testRunDirectory = Path.Combine(expectedOutputDirectory, "2024-11-20T00-00-00-0000000-" + testRunId.Substring(0, 6));
             var domain = "apps.powerapps.com";
 
             var expectedTestReportPath = "C:\\test.trx";
 
             SetupMocks(expectedOutputDirectory, testSettings, testSuiteDefinition, testRunId, expectedTestReportPath);
 
             var testEngine = new TestEngine(MockState.Object, ServiceProvider, MockTestReporter.Object, MockFileSystem.Object, MockLoggerFactory.Object, MockTestEngineEventHandler.Object);
+            testEngine.Timestamper = () => new DateTime(2024, 11, 20);
+
             var testReportPath = await testEngine.RunTestAsync(testConfigFile, environmentId, tenantId, outputDirectory, domain, "");
 
             Assert.Equal(expectedTestReportPath, testReportPath);
@@ -197,14 +201,16 @@ public async Task TestEngineWithMultipleBrowserConfigTest()
             var outputDirectory = new DirectoryInfo("TestOutput");
             var testRunId = Guid.NewGuid().ToString();
             var expectedOutputDirectory = outputDirectory.FullName;
-            var testRunDirectory = Path.Combine(expectedOutputDirectory, testRunId.Substring(0, 6));
+            var testRunDirectory = Path.Combine(expectedOutputDirectory, "2024-11-20T00-00-00-0000000-" + testRunId.Substring(0, 6));
             var domain = "apps.powerapps.com";
 
             var expectedTestReportPath = "C:\\test.trx";
 
             SetupMocks(expectedOutputDirectory, testSettings, testSuiteDefinition, testRunId, expectedTestReportPath);
 
             var testEngine = new TestEngine(MockState.Object, ServiceProvider, MockTestReporter.Object, MockFileSystem.Object, MockLoggerFactory.Object, MockTestEngineEventHandler.Object);
+            testEngine.Timestamper = () => new DateTime(2024, 11, 20);
+
             var testReportPath = await testEngine.RunTestAsync(testConfigFile, environmentId, tenantId, outputDirectory, domain, "");
 
             Assert.Equal(expectedTestReportPath, testReportPath);
@@ -246,7 +252,7 @@ public async Task TestEngineTest(DirectoryInfo outputDirectory, string domain, T
             {
                 expectedOutputDirectory = new DirectoryInfo("TestOutput");
             }
-            var testRunDirectory = Path.Combine(expectedOutputDirectory.FullName, testRunId.Substring(0, 6));
+            var testRunDirectory = Path.Combine(expectedOutputDirectory.FullName, "2024-11-20T00-00-00-0000000-" + testRunId.Substring(0, 6));
 
             if (string.IsNullOrEmpty(domain))
             {
@@ -258,6 +264,8 @@ public async Task TestEngineTest(DirectoryInfo outputDirectory, string domain, T
             SetupMocks(expectedOutputDirectory.FullName, testSettings, testSuiteDefinition, testRunId, expectedTestReportPath);
 
             var testEngine = new TestEngine(MockState.Object, ServiceProvider, MockTestReporter.Object, MockFileSystem.Object, MockLoggerFactory.Object, MockTestEngineEventHandler.Object);
+            testEngine.Timestamper = () => new DateTime(2024, 11, 20);
+
             var testReportPath = await testEngine.RunTestAsync(testConfigFile, environmentId, tenantId, outputDirectory, domain, "");
 
             Assert.Equal(expectedTestReportPath, testReportPath);

diff --git a/src/Microsoft.PowerApps.TestEngine/Reporting/TestLog.cs b/src/Microsoft.PowerApps.TestEngine/Reporting/TestLog.cs
@@ -8,6 +8,25 @@ namespace Microsoft.PowerApps.TestEngine.Reporting
 {
     public class TestLog
     {
+        private Func<DateTime> _timeStamper =  () => DateTime.Now;
+        public Func<DateTime> TimeStamper { 
+            get { 
+                return _timeStamper;
+            }
+
+            set
+            {
+                _timeStamper = value;
+                When = _timeStamper();
+            }
+        }
+
+        public TestLog() {
+            When = TimeStamper();
+        }
+
+        public DateTime When { get; private set; }
+
         public string ScopeFilter { get; set; }
         public string LogMessage { get; set; }
     }

diff --git a/src/Microsoft.PowerApps.TestEngine/Reporting/TestLogger.cs b/src/Microsoft.PowerApps.TestEngine/Reporting/TestLogger.cs
@@ -17,9 +17,12 @@ public class TestLogger : ITestLogger
         public List<TestLog> DebugLogs { get; set; } = new List<TestLog>();
         private TestLoggerScope currentScope = null;
 
+        public Func<DateTime> TimeStamper { get; set; }
+
         public TestLogger(IFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
+            TimeStamper = new TestLog().TimeStamper;
         }
 
         public IDisposable BeginScope<TState>(TState state)
@@ -95,15 +98,15 @@ public void Log<TState>(LogLevel messageLevel, EventId eventId, TState state, Ex
                 }
             }
 
-            logString += $"{formatter(state, exception)}{Environment.NewLine}";
+            logString += $"{TimeStamper().ToString("o")} - {formatter(state, exception)}{Environment.NewLine}";
 
             var scopeFilter = currentScope != null ? currentScope.GetScopeString() : "";
             if (messageLevel > LogLevel.Debug)
             {
-                Logs.Add(new TestLog() { LogMessage = logString, ScopeFilter = scopeFilter });
+                Logs.Add(new TestLog() { TimeStamper = TimeStamper, LogMessage = logString, ScopeFilter = scopeFilter });
             }
 
-            DebugLogs.Add(new TestLog() { LogMessage = logString, ScopeFilter = scopeFilter });
+            DebugLogs.Add(new TestLog() { TimeStamper = TimeStamper, LogMessage = logString, ScopeFilter = scopeFilter });
         }
     }
 }
diff --git a/src/Microsoft.PowerApps.TestEngine/TestEngine.cs b/src/Microsoft.PowerApps.TestEngine/TestEngine.cs
@@ -29,6 +29,8 @@ public class TestEngine
 
         public ILogger Logger { get; set; }
 
+        public Func<DateTime> Timestamper { get; set; }
+
         public TestEngine(ITestState state,
                           IServiceProvider serviceProvider,
                           ITestReporter testReporter,
@@ -42,6 +44,7 @@ public TestEngine(ITestState state,
             _fileSystem = fileSystem;
             _loggerFactory = loggerFactory;
             _eventHandler = eventHandler;
+            Timestamper = () => DateTime.UtcNow;
         }
 
         /// <summary>
@@ -113,7 +116,11 @@ public async Task<string> RunTestAsync(FileInfo testConfigFile, string environme
 
                 _state.SetTestConfigFile(testConfigFile);
 
-                testRunDirectory = Path.Combine(_state.GetOutputDirectory(), testRunId.Substring(0, 6));
+                var now = Timestamper().ToString("o")
+                    .Replace(":", "-")
+                    .Replace(".", "-");
+
+                testRunDirectory = Path.Combine(_state.GetOutputDirectory(), now + "-" + testRunId.Substring(0, 6));
                 _fileSystem.CreateDirectory(testRunDirectory);
                 Logger.LogInformation($"Test results will be stored in: {testRunDirectory}");