add cleanup test function and change file init

microsoft · Mar 4, 2025 · e2651fe · e2651fe · github-actions · Mar 4, 2025
1 parent 3fa0a74
commit e2651fe
Showing 5 changed files with 64 additions and 10 deletions.
diff --git a/src/common/UITestAutomation/SessionHelper.cs b/src/common/UITestAutomation/SessionHelper.cs
@@ -71,6 +71,7 @@ public SessionHelper Init()
         /// </summary>
         public void Cleanup()
         {
+            ExitScopeExe();
             try
             {
                 appDriver?.Kill();

diff --git a/src/common/UITestAutomation/UITestBase.cs b/src/common/UITestAutomation/UITestBase.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
@@ -31,12 +32,6 @@ public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings)
             this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
         }
 
-        ~UITestBase()
-        {
-            this.ExitScopeExe();
-            this.sessionHelper.Cleanup();
-        }
-
         /// <summary>
         /// Initializes the test.
         /// </summary>
@@ -54,6 +49,14 @@ public void TestInit()
             }
         }
 
+        /// <summary>
+        /// UnInitializes the test.
+        /// </summary>
+        public void TestClean()
+        {
+            this.sessionHelper.Cleanup();
+        }
+
         /// <summary>
         /// Finds an element by selector.
         /// Shortcut for this.Session.Find<T>(by, timeoutMS)
@@ -160,7 +163,7 @@ protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
         /// </summary>
         public void RestartScopeExe()
         {
-            sessionHelper.RestartScopeExe();
+            this.sessionHelper.RestartScopeExe();
             this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
             return;
         }
@@ -170,7 +173,7 @@ public void RestartScopeExe()
         /// </summary>
         public void ExitScopeExe()
         {
-            sessionHelper.ExitScopeExe();
+            this.sessionHelper.ExitScopeExe();
             return;
         }
     }

diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs
@@ -10,6 +10,7 @@
 using Microsoft.PowerToys.UITest;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Windows.UI;
+using static FancyZonesEditorCommon.Data.EditorParameters;
 using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext;
 
 namespace UITests_FancyZonesEditor
@@ -20,7 +21,55 @@ public class DefaultLayoutsTest : UITestBase
         public DefaultLayoutsTest()
             : base(PowerToysModule.FancyZone)
         {
-            // FancyZonesEditorHelper.InitFancyZonesLayout();
+            FancyZonesEditorHelper.Files.ParamsIOHelper.RestoreData();
+            EditorParameters editorParameters = new EditorParameters();
+            ParamsWrapper parameters = new ParamsWrapper
+            {
+                ProcessId = 1,
+                SpanZonesAcrossMonitors = false,
+                Monitors = new List<NativeMonitorDataWrapper>
+                {
+                    new NativeMonitorDataWrapper
+                    {
+                        Monitor = "monitor-1",
+                        MonitorInstanceId = "instance-id-1",
+                        MonitorSerialNumber = "serial-number-1",
+                        MonitorNumber = 1,
+                        VirtualDesktop = "{FF34D993-73F3-4B8C-AA03-73730A01D6A8}",
+                        Dpi = 96,
+                        LeftCoordinate = 0,
+                        TopCoordinate = 0,
+                        WorkAreaHeight = 1040,
+                        WorkAreaWidth = 1920,
+                        MonitorHeight = 1080,
+                        MonitorWidth = 1920,
+                        IsSelected = true,
+                    },
+                    new NativeMonitorDataWrapper
+                    {
+                        Monitor = "monitor-2",
+                        MonitorInstanceId = "instance-id-2",
+                        MonitorSerialNumber = "serial-number-2",
+                        MonitorNumber = 2,
+                        VirtualDesktop = "{FF34D993-73F3-4B8C-AA03-73730A01D6A8}",
+                        Dpi = 96,
+                        LeftCoordinate = 1920,
+                        TopCoordinate = 0,
+                        WorkAreaHeight = 1040,
+                        WorkAreaWidth = 1920,
+                        MonitorHeight = 1080,
+                        MonitorWidth = 1920,
+                        IsSelected = false,
+                    },
+                },
+            };
+            FancyZonesEditorHelper.Files.ParamsIOHelper.WriteData(editorParameters.Serialize(parameters));
+        }
+
+        [TestCleanup]
+        public void TestCleanup()
+        {
+            this.TestClean();
         }
 
         [TestMethod]

diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/NewFancyZonesEditorTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/NewFancyZonesEditorTest.cs
@@ -43,6 +43,7 @@ public void TestInitialize()
             [TestCleanup]
             public void TestCleanup()
             {
+                this.TestClean();
             }
 
             [TestMethod]

diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializaionTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializaionTest.cs
@@ -33,7 +33,7 @@ public void TestInitialize()
         [TestCleanup]
         public void TestCleanup()
         {
-            this.ExitScopeExe();
+            this.TestClean();
         }
 
         [TestMethod]