WIP changes for MDA and Simulation

microsoft · Dec 10, 2024 · d18981f · d18981f
1 parent 506f455
commit d18981f
Show file tree

Hide file tree

Showing 27 changed files with 383 additions and 52 deletions.
diff --git a/samples/weather/testPlan.fx.yaml b/samples/weather/testPlan.fx.yaml
@@ -12,7 +12,7 @@ testSuite:
           {
               'te_categoryname': "Test Category",
               'createdon': "2024-12-02T17:52:45Z",
-              'te_weathercategoryid': "f58de6c-905d-457d-846b-3e0b2aa4c5fd"
+              'te_weathercategoryid': "8cd3faaa-97ac-4e78-8b71-16c82cabb856"
           }
         )
       });
@@ -59,6 +59,11 @@ testSuite:
           Assert(CountRows(WeatherCategory.Items)=1);
           Assert(CountRows(Gallery1.Items)=1);
           Assert(Summary.Text="Match: Test Location, Temp: 30^F, Feels: 20^F, Sunny");
+    - testCaseName: Select category
+      testCaseDescription: Select a category from the dropdown
+      testSteps: |
+        = SetProperty(WeatherCategory.SelectedItems,Table(First(WeatherCategory.Items)));
+          Experimental.Pause();
      
 testSettings:
   headless: false

diff --git a/src/Microsoft.PowerApps.TestEngine/Microsoft.PowerApps.TestEngine.csproj b/src/Microsoft.PowerApps.TestEngine/Microsoft.PowerApps.TestEngine.csproj
@@ -7,6 +7,11 @@
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <!-- Nuget Properties -->
   <PropertyGroup>    
     <Authors>Microsoft</Authors>
@@ -54,4 +59,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+
+  <ItemGroup>
+    <MySourceFiles Include="..\..\bin\$(configuration)\Microsoft.PowerApps.TestEngine\Microsoft.PowerApps.TestEngine.pdb" />
+  </ItemGroup>
+
+  <Target Name="CopyFiles" AfterTargets="AfterBuild">
+    <Copy SourceFiles="@(MySourceFiles)" DestinationFolder="..\..\bin\$(configuration)\PowerAppsTestEngine" />
+  </Target>
 </Project>
diff --git a/src/Microsoft.PowerApps.TestEngine/Providers/PowerFxModel/ControlRecordValue.cs b/src/Microsoft.PowerApps.TestEngine/Providers/PowerFxModel/ControlRecordValue.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -73,6 +74,7 @@ public ItemPath GetItemPath(string propertyName = null)
         /// <returns>True if able to get the field value</returns>
         protected override bool TryGetField(FormulaType fieldType, string fieldName, out FormulaValue result)
         {
+
             if (fieldType is TableType)
             {
                 // This would be if we were referencing a property that could be indexed. Eg. Gallery1.AllItems (fieldName = AllItems)
@@ -106,6 +108,13 @@ protected override bool TryGetField(FormulaType fieldType, string fieldName, out
                 var itemPath = GetItemPath(fieldName);
 
                 var propertyValueJson = _testWebProvider.GetPropertyValueFromControl<string>(itemPath);
+
+                if (string.IsNullOrEmpty(propertyValueJson))
+                {
+                    result = BlankValue.NewBlank(fieldType);
+                    return true;
+                }
+
                 var jsPropertyValueModel = JsonConvert.DeserializeObject<JSPropertyValueModel>(propertyValueJson);
 
                 if (jsPropertyValueModel != null)

diff --git a/src/testengine.auth.certificatestore/testengine.auth.certificatestore.csproj b/src/testengine.auth.certificatestore/testengine.auth.certificatestore.csproj
@@ -9,6 +9,11 @@
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
+    <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.auth.localcertificate.tests/testengine.auth.localcertificate.tests.csproj b/src/testengine.auth.localcertificate.tests/testengine.auth.localcertificate.tests.csproj
@@ -7,6 +7,11 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.auth.localcertificate/testengine.auth.localcertificate.csproj b/src/testengine.auth.localcertificate/testengine.auth.localcertificate.csproj
@@ -9,6 +9,11 @@
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.common.user/testengine.common.user.csproj b/src/testengine.common.user/testengine.common.user.csproj
@@ -6,6 +6,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.module.mda/testengine.module.mda.csproj b/src/testengine.module.mda/testengine.module.mda.csproj
@@ -18,6 +18,11 @@
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.module.pause/testengine.module.pause.csproj b/src/testengine.module.pause/testengine.module.pause.csproj
@@ -18,6 +18,11 @@
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.module.playwrightaction/testengine.module.playwrightaction.csproj b/src/testengine.module.playwrightaction/testengine.module.playwrightaction.csproj
@@ -6,6 +6,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.module.playwrightscript/testengine.module.playwrightscript.csproj b/src/testengine.module.playwrightscript/testengine.module.playwrightscript.csproj
@@ -7,6 +7,11 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.module.powerapps.portal/testengine.module.powerapps.portal.csproj b/src/testengine.module.powerapps.portal/testengine.module.powerapps.portal.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -18,6 +17,11 @@
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.module.sample/testengine.module.sample.csproj b/src/testengine.module.sample/testengine.module.sample.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -18,6 +17,11 @@
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.module.simulation/testengine.module.simulation.csproj b/src/testengine.module.simulation/testengine.module.simulation.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -12,6 +11,11 @@
     <AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>

diff --git a/src/testengine.module.tests.common/testengine.module.tests.common.csproj b/src/testengine.module.tests.common/testengine.module.tests.common.csproj
@@ -6,6 +6,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.provider.canvas/testengine.provider.canvas.csproj b/src/testengine.provider.canvas/testengine.provider.canvas.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -9,6 +8,11 @@
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SignAssembly>true</SignAssembly>
     <PublicSign>true</PublicSign>

diff --git a/src/testengine.provider.mda.tests/ModelDrivenApplicationProviderCustomPageTest.cs b/src/testengine.provider.mda.tests/ModelDrivenApplicationProviderCustomPageTest.cs
@@ -293,5 +293,76 @@ public static IEnumerable<object[]> GetSetValueData()
                     "Hello"
             };
         }
+
+        [Theory]
+        [MemberData(nameof(GetDataFromParentData))]
+        public async Task GetValueFromParent(ItemPath path, string parentJson, object? expected)
+        {
+            // Arrange
+            MockTestInfraFunctions.Setup(m => m.RunJavascriptAsync<object>(It.IsAny<string>())).Returns(Task.FromResult((object)parentJson));
+            MockTestState.Setup(m => m.GetDomain()).Returns("https://www.microsoft.com");
+            MockTestState.Setup(m => m.GetTimeout()).Returns(1000);
+            MockSingleTestInstanceState.Setup(m => m.GetLogger()).Returns(MockLogger.Object);
+
+            // Act
+            var provider = new ModelDrivenApplicationProvider(MockTestInfraFunctions.Object, MockSingleTestInstanceState.Object, MockTestState.Object);
+            var json = provider.GetPropertyValueFromControl<string>(path);
+
+            // Assert
+            dynamic result = JsonConvert.DeserializeObject<ExpandoObject>(json);
+
+            Assert.Equal(expected, result.PropertyValue);
+        }
+
+        /// <summary>
+        /// Test data for <see cref="GetDataFromParentData"/>
+        /// </summary>
+        /// <returns>MemberData items</returns>
+        public static IEnumerable<object[]> GetDataFromParentData()
+        {
+            var sampleDateUnix = new DateTimeOffset(new DateTime(2024, 12, 1)).ToUnixTimeSeconds();
+
+            // Date Time in unix test
+            yield return new object[] {
+                new ItemPath{ ControlName = "TableRow", PropertyName = "when", ParentControl = new ItemPath { ControlName = "Gallery", PropertyName = "Items", Index = 0 } },
+                $"[{{ \"Key\": \"Items\", \"Value\": [ {{ \"when\":{sampleDateUnix} }} ] }}]",
+                sampleDateUnix
+            };
+
+            // Numeric test
+            yield return new object[] {
+                new ItemPath{ ControlName = "TableRow", PropertyName = "num", ParentControl = new ItemPath { ControlName = "Gallery", PropertyName = "Items", Index = 0 } },
+                $"[{{ \"Key\": \"Items\", \"Value\":[ {{ \"num\": 1}} ] }}]",
+                (long)1
+            };
+
+            // Numeric test
+            yield return new object[] {
+                new ItemPath{ ControlName = "TableRow", PropertyName = "num", ParentControl = new ItemPath { ControlName = "Gallery", PropertyName = "Items", Index = 0 } },
+                $"[{{ \"Key\": \"Items\", \"Value\":[ {{ \"num\": 1.1}} ] }}]",
+                1.1
+            };
+
+            // String test
+            yield return new object[] {
+                new ItemPath{ ControlName = "TableRow", PropertyName = "text", ParentControl = new ItemPath { ControlName = "Gallery", PropertyName = "Items", Index = 0 } },
+                $"[{{ \"Key\": \"Items\", \"Value\": [ {{ \"text\": \"A\"}} ] }}]",
+                "A"
+            };
+
+            // String test
+            yield return new object[] {
+                new ItemPath{ ControlName = "TableRow", PropertyName = "text", ParentControl = new ItemPath { ControlName = "Gallery", PropertyName = "Items", Index = 1 } },
+                $"[{{ \"Key\": \"Items\", \"Value\": [ {{ \"text\": \"A\"}}, {{ \"text\": \"B\"}} ] }}]",
+                "B"
+            };
+
+            // Object test
+            yield return new object[] {
+                new ItemPath{ ControlName = "TableRow", PropertyName = "object", ParentControl = new ItemPath { ControlName = "Gallery", PropertyName = "Items", Index = 0 } },
+                $"[{{ \"Key\": \"Items\", \"Value\": [ {{ \"object\": {{ \"id\": 1 }} }} ] }}]",
+                "{\"id\":1}"
+            };
+        }
     }
 }
diff --git a/src/testengine.provider.mda.tests/ModelDrivenApplicationProviderTest.cs b/src/testengine.provider.mda.tests/ModelDrivenApplicationProviderTest.cs
@@ -11,6 +11,7 @@
 using Microsoft.PowerApps.TestEngine.Config;
 using Microsoft.PowerApps.TestEngine.Providers;
 using Microsoft.PowerApps.TestEngine.TestInfra;
+using Microsoft.PowerFx;
 using Microsoft.PowerFx.Types;
 using Moq;
 using Newtonsoft.Json;
@@ -771,5 +772,40 @@ public async Task EmbedMDAJSScripts_EmbedsScriptSuccessfully()
             // Verify that AddScriptTagAsync was called with the correct PageAddScriptTagOptions
             mockPage.Verify(p => p.AddScriptTagAsync(It.Is<PageAddScriptTagOptions>(opt => opt.Url.Contains(expectedScriptHash))), Times.Once);
         }
+
+        [Theory]
+        [MemberData(nameof(RecordTestValues))]
+        public async Task SetRecordValue(FormulaValue data)
+        {
+            // Arrange
+            MockSingleTestInstanceState.Setup(m => m.GetLogger()).Returns(MockLogger.Object);
+            MockTestInfraFunctions = new Mock<ITestInfraFunctions>();
+            MockTestInfraFunctions.Setup(m => m.RunJavascriptAsync<string>(It.IsAny<string>()));
+
+            var provider = new ModelDrivenApplicationProvider(MockTestInfraFunctions.Object, MockSingleTestInstanceState.Object, MockTestState.Object);
+
+
+            // Act
+            var row = RecordValue.NewRecordFromFields(new NamedValue("Selected", data)); // BlankValue.NewBlank(RecordValue.NewRecordFromFields(new NamedValue("Name", StringValue.New("")));
+            var value = RecordValue.NewRecordFromFields(new NamedValue("PropertyValue", row));
+            await provider.SetPropertyAsync(new ItemPath() { ControlName = "Dropdown1", PropertyName = "Selected" }, value);
+
+            // Assert
+        }
+
+        /// <summary>
+        /// Test data for <see cref="SetRecordValue"/>
+        /// </summary>
+        /// <returns>MemberData items</returns>
+        public static IEnumerable<object[]> RecordTestValues()
+        {
+            yield return new object[] {
+                    BlankValue.NewBlank()
+            };
+
+            yield return new object[] {
+                    RecordValue.NewRecordFromFields(new NamedValue("Name", StringValue.New("Test")))
+            };
+        }
     }
 }
diff --git a/src/testengine.provider.mda/ModelDrivenApplicationCanvasState.cs b/src/testengine.provider.mda/ModelDrivenApplicationCanvasState.cs
@@ -90,7 +90,7 @@ public async Task ApplyChanges(ITestInfraFunctions testInfraFunctions, ModelDriv
                         }
                         else
                         {
-                            originalState.VariableState.Add(variable, await originalState.ConvertToVariableState(newPowerFxVariableValue));
+                            originalState.VariableState.TryAdd(variable, await originalState.ConvertToVariableState(newPowerFxVariableValue));
                         }
                     }
                 }
@@ -121,7 +121,7 @@ public async Task ApplyChanges(ITestInfraFunctions testInfraFunctions, ModelDriv
                     {
                         // Add the new collction and cache a copy of the collection state
                         originalEngine.UpdateVariable(collection, newPowerFxCollectionValue);
-                        originalState.CollectionState.Add(collection, await originalState.ConvertToVariableState(newPowerFxCollectionValue));
+                        originalState.CollectionState.TryAdd(collection, await originalState.ConvertToVariableState(newPowerFxCollectionValue));
                     }
                 }
             }