template layouts tests

2026-02-23 19:49:43 +01:00 · 2023-11-22 13:27:51 +01:00
parent 96d426b52f
commit e5668fb239
3 changed files with 294 additions and 178 deletions
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializaionTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializaionTests.cs
@@ -7,10 +7,7 @@ using FancyZonesEditorCommon.Data;
 using Microsoft.FancyZonesEditor.UITests.Utils;
 using Microsoft.FancyZonesEditor.UnitTests.Utils;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using static FancyZonesEditorCommon.Data.AppliedLayouts;
-using static FancyZonesEditorCommon.Data.DefaultLayouts;
 using static FancyZonesEditorCommon.Data.EditorParameters;
-using static FancyZonesEditorCommon.Data.LayoutTemplates;

 namespace Microsoft.FancyZonesEditor.UITests
 {
@@ -20,9 +17,6 @@ namespace Microsoft.FancyZonesEditor.UITests
        private static TestContext? _context;
        private static FancyZonesEditorSession? _session;
        private static IOTestHelper? _editorParamsIOHelper;
-        private static IOTestHelper? _templatesIOHelper;
-        private static IOTestHelper? _defaultLayoutsIOHelper;
-        private static IOTestHelper? _appliedLayoutsIOHelper;

        [ClassInitialize]
        public static void ClassInitialize(TestContext testContext)
@@ -42,9 +36,6 @@ namespace Microsoft.FancyZonesEditor.UITests
            _session?.Close(_context!);

            _editorParamsIOHelper?.RestoreData();
-            _templatesIOHelper?.RestoreData();
-            _defaultLayoutsIOHelper?.RestoreData();
-            _appliedLayoutsIOHelper?.RestoreData();
        }

        [TestMethod]
@@ -210,173 +201,5 @@ namespace Microsoft.FancyZonesEditor.UITests
            Assert.IsNotNull(monitor);
            Assert.IsTrue(monitor.Selected);
        }
-
-        [TestMethod]
-        public void TemplateLayouts_ZoneNumber() // verify zone numbers are set correctly
-        {
-            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 = 192,
-                        LeftCoordinate = 0,
-                        TopCoordinate = 0,
-                        WorkAreaHeight = 1040,
-                        WorkAreaWidth = 1920,
-                        MonitorHeight = 1080,
-                        MonitorWidth = 1920,
-                        IsSelected = true,
-                    },
-                },
-            };
-            _editorParamsIOHelper = new IOTestHelper(editorParameters.File);
-            _editorParamsIOHelper.WriteData(editorParameters.Serialize(parameters));
-
-            LayoutTemplates layoutTemplates = new LayoutTemplates();
-            TemplateLayoutsListWrapper list = new TemplateLayoutsListWrapper
-            {
-                LayoutTemplates = new List<TemplateLayoutWrapper>
-                {
-                    new TemplateLayoutWrapper
-                    {
-                        Type = Constants.LayoutTypes[Constants.Layouts.Empty],
-                    },
-                    new TemplateLayoutWrapper
-                    {
-                        Type = Constants.LayoutTypes[Constants.Layouts.Focus],
-                        ZoneCount = 10,
-                    },
-                    new TemplateLayoutWrapper
-                    {
-                        Type = Constants.LayoutTypes[Constants.Layouts.Rows],
-                        ZoneCount = 2,
-                        ShowSpacing = true,
-                        Spacing = 10,
-                        SensitivityRadius = 10,
-                    },
-                    new TemplateLayoutWrapper
-                    {
-                        Type = Constants.LayoutTypes[Constants.Layouts.Columns],
-                        ZoneCount = 2,
-                        ShowSpacing = true,
-                        Spacing = 20,
-                        SensitivityRadius = 20,
-                    },
-                    new TemplateLayoutWrapper
-                    {
-                        Type = Constants.LayoutTypes[Constants.Layouts.Grid],
-                        ZoneCount = 4,
-                        ShowSpacing = false,
-                        Spacing = 10,
-                        SensitivityRadius = 30,
-                    },
-                    new TemplateLayoutWrapper
-                    {
-                        Type = Constants.LayoutTypes[Constants.Layouts.PriorityGrid],
-                        ZoneCount = 3,
-                        ShowSpacing = true,
-                        Spacing = 1,
-                        SensitivityRadius = 40,
-                    },
-                },
-            };
-            _templatesIOHelper = new IOTestHelper(layoutTemplates.File);
-            _templatesIOHelper.WriteData(layoutTemplates.Serialize(list));
-
-            // Default layouts should match templates
-            DefaultLayouts defaultLayouts = new DefaultLayouts();
-            DefaultLayoutsListWrapper defaultLayoutsList = new DefaultLayoutsListWrapper
-            {
-                DefaultLayouts = new List<DefaultLayoutWrapper>
-                {
-                    new DefaultLayoutWrapper
-                    {
-                        MonitorConfiguration = MonitorConfigurationType.Vertical.ToString(),
-                        Layout = new DefaultLayoutWrapper.LayoutWrapper
-                        {
-                            Type = Constants.LayoutTypes[Constants.Layouts.Rows],
-                            ZoneCount = 2,
-                            ShowSpacing = true,
-                            Spacing = 10,
-                            SensitivityRadius = 10,
-                        },
-                    },
-                    new DefaultLayoutWrapper
-                    {
-                        MonitorConfiguration = MonitorConfigurationType.Horizontal.ToString(),
-                        Layout = new DefaultLayoutWrapper.LayoutWrapper
-                        {
-                            Type = Constants.LayoutTypes[Constants.Layouts.PriorityGrid],
-                            ZoneCount = 3,
-                            ShowSpacing = true,
-                            Spacing = 1,
-                            SensitivityRadius = 40,
-                        },
-                    },
-                },
-            };
-            _defaultLayoutsIOHelper = new IOTestHelper(defaultLayouts.File);
-            _defaultLayoutsIOHelper.WriteData(defaultLayouts.Serialize(defaultLayoutsList));
-
-            // Make sure applied layouts don't replate template settings
-            AppliedLayouts appliedLayouts = new AppliedLayouts();
-            AppliedLayoutsListWrapper appliedLayoutsList = new AppliedLayoutsListWrapper
-            {
-                AppliedLayouts = new List<AppliedLayoutWrapper>
-                {
-                    new AppliedLayoutWrapper
-                    {
-                        Device = new AppliedLayoutWrapper.DeviceIdWrapper
-                        {
-                            Monitor = "monitor-1",
-                            MonitorInstance = "instance-id-1",
-                            MonitorNumber = 1,
-                            SerialNumber = "serial-number-1",
-                            VirtualDesktop = "{FF34D993-73F3-4B8C-AA03-73730A01D6A8}",
-                        },
-                        AppliedLayout = new AppliedLayoutWrapper.LayoutWrapper
-                        {
-                            Type = Constants.LayoutTypes[Constants.Layouts.PriorityGrid],
-                            ZoneCount = 3,
-                            ShowSpacing = true,
-                            Spacing = 1,
-                            SensitivityRadius = 40,
-                        },
-                    },
-                },
-            };
-            _appliedLayoutsIOHelper = new IOTestHelper(appliedLayouts.File);
-            _appliedLayoutsIOHelper.WriteData(appliedLayouts.Serialize(appliedLayoutsList));
-
-            _session = new FancyZonesEditorSession(_context!);
-
-            foreach (var (key, name) in Constants.LayoutNames)
-            {
-                if (key == Constants.Layouts.Empty)
-                {
-                    continue;
-                }
-
-                _session?.Click_EditLayout(name);
-                Assert.IsNotNull(_session?.Session?.FindElementsByName($"Edit '{name}'"));
-
-                // Number of zones slider. Possible range is from 1 to 128. Value is 3.
-                var slider = _session.GetZoneCountSlider();
-                var expectedZoneCount = list.LayoutTemplates.Find(x => x.Type == Constants.LayoutTypes[key]).ZoneCount;
-                Assert.AreEqual($"{expectedZoneCount}", slider.Text);
-
-                _session?.Click_Cancel();
-            }
-        }
    }
 }
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializationTests_TemplateLayouts.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializationTests_TemplateLayouts.cs
@@ -0,0 +1,281 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using FancyZonesEditorCommon.Data;
+using Microsoft.FancyZonesEditor.UITests.Utils;
+using Microsoft.FancyZonesEditor.UnitTests.Utils;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium.Support.UI;
+using static FancyZonesEditorCommon.Data.AppliedLayouts;
+using static FancyZonesEditorCommon.Data.DefaultLayouts;
+using static FancyZonesEditorCommon.Data.EditorParameters;
+using static FancyZonesEditorCommon.Data.LayoutTemplates;
+
+namespace Microsoft.FancyZonesEditor.UITests
+{
+    [TestClass]
+    public class UIInitializationTests_TemplateLayouts
+    {
+        private static readonly TemplateLayoutsListWrapper Layouts = new TemplateLayoutsListWrapper
+        {
+            LayoutTemplates = new List<TemplateLayoutWrapper>
+            {
+                new TemplateLayoutWrapper
+                {
+                    Type = Constants.LayoutTypes[Constants.Layouts.Empty],
+                },
+                new TemplateLayoutWrapper
+                {
+                    Type = Constants.LayoutTypes[Constants.Layouts.Focus],
+                    ZoneCount = 10,
+                },
+                new TemplateLayoutWrapper
+                {
+                    Type = Constants.LayoutTypes[Constants.Layouts.Rows],
+                    ZoneCount = 2,
+                    ShowSpacing = true,
+                    Spacing = 10,
+                    SensitivityRadius = 10,
+                },
+                new TemplateLayoutWrapper
+                {
+                    Type = Constants.LayoutTypes[Constants.Layouts.Columns],
+                    ZoneCount = 2,
+                    ShowSpacing = true,
+                    Spacing = 20,
+                    SensitivityRadius = 20,
+                },
+                new TemplateLayoutWrapper
+                {
+                    Type = Constants.LayoutTypes[Constants.Layouts.Grid],
+                    ZoneCount = 4,
+                    ShowSpacing = false,
+                    Spacing = 10,
+                    SensitivityRadius = 30,
+                },
+                new TemplateLayoutWrapper
+                {
+                    Type = Constants.LayoutTypes[Constants.Layouts.PriorityGrid],
+                    ZoneCount = 3,
+                    ShowSpacing = true,
+                    Spacing = 1,
+                    SensitivityRadius = 40,
+                },
+            },
+        };
+
+        private static TestContext? _context;
+        private static FancyZonesEditorSession? _session;
+        private static IOTestHelper? _editorParamsIOHelper;
+        private static IOTestHelper? _templatesIOHelper;
+        private static IOTestHelper? _defaultLayoutsIOHelper;
+        private static IOTestHelper? _appliedLayoutsIOHelper;
+
+        [ClassInitialize]
+        public static void ClassInitialize(TestContext testContext)
+        {
+            _context = testContext;
+
+            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 = 192,
+                        LeftCoordinate = 0,
+                        TopCoordinate = 0,
+                        WorkAreaHeight = 1040,
+                        WorkAreaWidth = 1920,
+                        MonitorHeight = 1080,
+                        MonitorWidth = 1920,
+                        IsSelected = true,
+                    },
+                },
+            };
+            _editorParamsIOHelper = new IOTestHelper(editorParameters.File);
+            _editorParamsIOHelper.WriteData(editorParameters.Serialize(parameters));
+
+            LayoutTemplates layoutTemplates = new LayoutTemplates();
+            _templatesIOHelper = new IOTestHelper(layoutTemplates.File);
+            _templatesIOHelper.WriteData(layoutTemplates.Serialize(Layouts));
+
+            // Default layouts should match templates
+            DefaultLayouts defaultLayouts = new DefaultLayouts();
+            DefaultLayoutsListWrapper defaultLayoutsList = new DefaultLayoutsListWrapper
+            {
+                DefaultLayouts = new List<DefaultLayoutWrapper>
+                {
+                    new DefaultLayoutWrapper
+                    {
+                        MonitorConfiguration = MonitorConfigurationType.Vertical.ToString(),
+                        Layout = new DefaultLayoutWrapper.LayoutWrapper
+                        {
+                            Type = Constants.LayoutTypes[Constants.Layouts.Rows],
+                            ZoneCount = 2,
+                            ShowSpacing = true,
+                            Spacing = 10,
+                            SensitivityRadius = 10,
+                        },
+                    },
+                    new DefaultLayoutWrapper
+                    {
+                        MonitorConfiguration = MonitorConfigurationType.Horizontal.ToString(),
+                        Layout = new DefaultLayoutWrapper.LayoutWrapper
+                        {
+                            Type = Constants.LayoutTypes[Constants.Layouts.PriorityGrid],
+                            ZoneCount = 3,
+                            ShowSpacing = true,
+                            Spacing = 1,
+                            SensitivityRadius = 40,
+                        },
+                    },
+                },
+            };
+            _defaultLayoutsIOHelper = new IOTestHelper(defaultLayouts.File);
+            _defaultLayoutsIOHelper.WriteData(defaultLayouts.Serialize(defaultLayoutsList));
+
+            // Make sure applied layouts don't replate template settings
+            AppliedLayouts appliedLayouts = new AppliedLayouts();
+            AppliedLayoutsListWrapper appliedLayoutsList = new AppliedLayoutsListWrapper
+            {
+                AppliedLayouts = new List<AppliedLayoutWrapper>
+                {
+                    new AppliedLayoutWrapper
+                    {
+                        Device = new AppliedLayoutWrapper.DeviceIdWrapper
+                        {
+                            Monitor = "monitor-1",
+                            MonitorInstance = "instance-id-1",
+                            MonitorNumber = 1,
+                            SerialNumber = "serial-number-1",
+                            VirtualDesktop = "{FF34D993-73F3-4B8C-AA03-73730A01D6A8}",
+                        },
+                        AppliedLayout = new AppliedLayoutWrapper.LayoutWrapper
+                        {
+                            Type = Constants.LayoutTypes[Constants.Layouts.PriorityGrid],
+                            ZoneCount = 3,
+                            ShowSpacing = true,
+                            Spacing = 1,
+                            SensitivityRadius = 40,
+                        },
+                    },
+                },
+            };
+            _appliedLayoutsIOHelper = new IOTestHelper(appliedLayouts.File);
+            _appliedLayoutsIOHelper.WriteData(appliedLayouts.Serialize(appliedLayoutsList));
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            _editorParamsIOHelper?.RestoreData();
+            _templatesIOHelper?.RestoreData();
+            _defaultLayoutsIOHelper?.RestoreData();
+            _appliedLayoutsIOHelper?.RestoreData();
+
+            _context = null;
+        }
+
+        [TestInitialize]
+        public void TestInitialize()
+        {
+            _session = new FancyZonesEditorSession(_context!);
+        }
+
+        [TestCleanup]
+        public void TestCleanup()
+        {
+            _session?.Close(_context!);
+        }
+
+        [TestMethod]
+        public void ZoneNumber()
+        {
+            foreach (var (key, name) in Constants.LayoutNames)
+            {
+                if (key == Constants.Layouts.Empty)
+                {
+                    continue;
+                }
+
+                _session?.Click_EditLayout(name);
+
+                var slider = _session?.GetZoneCountSlider();
+                var expected = Layouts.LayoutTemplates.Find(x => x.Type == Constants.LayoutTypes[key]).ZoneCount;
+                Assert.AreEqual($"{expected}", slider?.Text);
+
+                _session?.Click_Cancel();
+
+                // let the dialog window close
+                WebDriverWait wait = new WebDriverWait(_session?.Session, TimeSpan.FromSeconds(1));
+                wait.Timeout = TimeSpan.FromSeconds(0.5);
+            }
+        }
+
+        [TestMethod]
+        public void HighlightDistance()
+        {
+            foreach (var (key, name) in Constants.LayoutNames)
+            {
+                if (key == Constants.Layouts.Empty)
+                {
+                    continue;
+                }
+
+                _session?.Click_EditLayout(name);
+
+                var slider = _session?.GetSensitivitySlider();
+                var expected = Layouts.LayoutTemplates.Find(x => x.Type == Constants.LayoutTypes[key]).SensitivityRadius;
+                Assert.AreEqual($"{expected}", slider?.Text);
+
+                _session?.Click_Cancel();
+
+                // let the dialog window close
+                WebDriverWait wait = new WebDriverWait(_session?.Session, TimeSpan.FromSeconds(1));
+                wait.Timeout = TimeSpan.FromSeconds(0.5);
+            }
+        }
+
+        [TestMethod]
+        public void SpaceAroundZones()
+        {
+            foreach (var (key, name) in Constants.LayoutNames)
+            {
+                if (key == Constants.Layouts.Empty || key == Constants.Layouts.Focus)
+                {
+                    // only for grid layouts
+                    continue;
+                }
+
+                _session?.Click_EditLayout(name);
+
+                var toggle = _session?.GetSpaceAroundZonesToggle();
+                var slider = _session?.GetSpaceAroudZonesSlider();
+
+                var spacingEnabled = Layouts.LayoutTemplates.Find(x => x.Type == Constants.LayoutTypes[key]).ShowSpacing;
+                Assert.AreEqual(spacingEnabled, slider?.Enabled);
+
+                var expected = Layouts.LayoutTemplates.Find(x => x.Type == Constants.LayoutTypes[key]).Spacing;
+                Assert.AreEqual($"{expected}", slider?.Text);
+
+                _session?.Click_Cancel();
+
+                // let the dialog window close
+                WebDriverWait wait = new WebDriverWait(_session?.Session, TimeSpan.FromSeconds(1));
+                wait.Timeout = TimeSpan.FromSeconds(0.5);
+            }
+        }
+    }
+}
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs
@@ -45,9 +45,11 @@ namespace Microsoft.FancyZonesEditor.UnitTests.Utils
            // layout card
            public const string EditLayoutButton = "EditLayoutButton";

-            // edit layout window
+            // edit template layout window
            public const string TemplateZoneSlider = "TemplateZoneCount";
            public const string SensitivitySlider = "SensitivityInput";
+            public const string SpacingSlider = "Spacing";
+            public const string SpacingToggle = "spaceAroundSetting";
        }

        public WindowsDriver<WindowsElement>? Session { get; }
@@ -164,6 +166,16 @@ namespace Microsoft.FancyZonesEditor.UnitTests.Utils
            return FindByAccessibilityId(AccessibilityId.SensitivitySlider);
        }

+        public WindowsElement? GetSpaceAroudZonesSlider()
+        {
+            return FindByAccessibilityId(AccessibilityId.SpacingSlider);
+        }
+
+        public WindowsElement? GetSpaceAroundZonesToggle()
+        {
+            return FindByAccessibilityId(AccessibilityId.SpacingToggle);
+        }
+
        public void Click_CreateNewLayout()
        {
            var button = FindByAccessibilityId(AccessibilityId.NewLayoutButton);