From 80a5d43810f13eba66d95ed2fa74e776eb00122d Mon Sep 17 00:00:00 2001 From: seraphima Date: Tue, 12 Mar 2024 20:23:14 +0100 Subject: [PATCH] rename --- .../CopyLayoutTests.cs | 4 +-- .../DeleteLayoutTests.cs | 18 +++++----- .../RunFancyZonesEditorTest.cs | 4 +-- .../Utils/FancyZonesEditorSession.cs | 35 ++++++++++++++----- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs index 55d37f0a1e..43684e9c4e 100644 --- a/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs @@ -207,7 +207,7 @@ namespace Microsoft.FancyZonesEditor.UITests public void CopyTemplate_FromContextMenu() { string copiedLayoutName = Constants.TemplateLayoutNames[Constants.TemplateLayouts.Rows] + " (1)"; - _session?.Click_ContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Rows], "Create custom layout"); + _session?.ClickContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Rows], "Create custom layout"); // verify the layout is copied _session?.WaitElementDisplayedByName(copiedLayoutName); @@ -274,7 +274,7 @@ namespace Microsoft.FancyZonesEditor.UITests public void CopyCustomLayout_FromContextMenu() { string copiedLayoutName = CustomLayouts.CustomLayouts[0].Name + " (1)"; - _session?.Click_ContextMenuItem(CustomLayouts.CustomLayouts[0].Name, "Duplicate"); + _session?.ClickContextMenuItem(CustomLayouts.CustomLayouts[0].Name, "Duplicate"); // verify the layout is copied _session?.WaitElementDisplayedByName(copiedLayoutName); diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs index c29d9b2257..f4613e9c45 100644 --- a/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs @@ -233,7 +233,7 @@ namespace Microsoft.FancyZonesEditor.UITests var deletedLayout = CustomLayouts.CustomLayouts[1].Name; _session?.ClickEditLayout(deletedLayout); _session?.ClickDeleteLayout(); - _session?.ClickConfirmDeletion(); + _session?.ClickConfirmDialog(); _session?.WaitFor(1); // verify the layout is removed @@ -252,7 +252,7 @@ namespace Microsoft.FancyZonesEditor.UITests var deletedLayout = CustomLayouts.CustomLayouts[0].Name; _session?.ClickEditLayout(deletedLayout); _session?.ClickDeleteLayout(); - _session?.ClickConfirmDeletion(); + _session?.ClickConfirmDialog(); _session?.WaitFor(1); // verify the layout is removed @@ -278,7 +278,7 @@ namespace Microsoft.FancyZonesEditor.UITests var deletedLayout = CustomLayouts.CustomLayouts[1].Name; _session?.ClickEditLayout(deletedLayout); _session?.ClickDeleteLayout(); - _session?.ClickCancelDeletion(); + _session?.ClickCancelDialog(); _session?.WaitFor(1); // verify the layout is not removed @@ -295,8 +295,8 @@ namespace Microsoft.FancyZonesEditor.UITests public void DeleteFromContextMenu() { var deletedLayout = CustomLayouts.CustomLayouts[1].Name; - _session?.Click_ContextMenuItem(deletedLayout, "Delete"); - _session?.ClickConfirmDeletion(); + _session?.ClickContextMenuItem(deletedLayout, "Delete"); + _session?.ClickConfirmDialog(); _session?.WaitFor(1); // verify the layout is removed @@ -313,8 +313,8 @@ namespace Microsoft.FancyZonesEditor.UITests public void DeleteDefaultLayout() { var deletedLayout = CustomLayouts.CustomLayouts[1].Name; - _session?.Click_ContextMenuItem(deletedLayout, "Delete"); - _session?.ClickConfirmDeletion(); + _session?.ClickContextMenuItem(deletedLayout, "Delete"); + _session?.ClickConfirmDialog(); _session?.WaitFor(1); // verify the default layout is reset to the "default" default @@ -333,8 +333,8 @@ namespace Microsoft.FancyZonesEditor.UITests public void DeleteLayoutWithHotkey() { var deletedLayout = CustomLayouts.CustomLayouts[1].Name; - _session?.Click_ContextMenuItem(deletedLayout, "Delete"); - _session?.ClickConfirmDeletion(); + _session?.ClickContextMenuItem(deletedLayout, "Delete"); + _session?.ClickConfirmDialog(); _session?.WaitFor(1); // verify the hotkey is available diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs index 0de4059c13..7dca0c65ad 100644 --- a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs @@ -201,7 +201,7 @@ namespace Microsoft.FancyZonesEditor.UITests [TestMethod] public void OpenEditLayoutDialog_ByContextMenu_TemplateLayout() // verify the edit layout dialog is opened { - _session?.Click_ContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Grid], "Edit"); + _session?.ClickContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Grid], "Edit"); Assert.IsNotNull(_session?.Session?.FindElementByAccessibilityId("EditLayoutDialogTitle")); // check the pane header Assert.IsNotNull(_session?.Session?.FindElementsByName("Edit 'Grid'")); // verify it's opened for the correct layout } @@ -209,7 +209,7 @@ namespace Microsoft.FancyZonesEditor.UITests [TestMethod] public void OpenEditLayoutDialog_ByContextMenu_CustomLayout() // verify the edit layout dialog is opened { - _session?.Click_ContextMenuItem("Custom layout", "Edit"); + _session?.ClickContextMenuItem("Custom layout", "Edit"); Assert.IsNotNull(_session?.Session?.FindElementByAccessibilityId("EditLayoutDialogTitle")); // check the pane header Assert.IsNotNull(_session?.Session?.FindElementsByName("Edit 'Grid'")); // verify it's opened for the correct layout } diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs index 0bf6e73a5d..5dc03252d1 100644 --- a/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs @@ -345,31 +345,50 @@ namespace Microsoft.FancyZonesEditor.UnitTests.Utils button?.Click(); } - public void ClickConfirmDeletion() + public void ClickConfirm() + { + WaitElementDisplayedById(AccessibilityId.PrimaryButton); + WindowsElement? button = Session?.FindElementByAccessibilityId(AccessibilityId.PrimaryButton); + button?.Click(); + WaitUntilHidden(button!); + } + + public void ClickConfirmDialog() { - // WaitElementDisplayedById(AccessibilityId.PrimaryButton); - // WindowsElement? button = Session?.FindElementByAccessibilityId(AccessibilityId.PrimaryButton); - // button?.Click(); - doesn't work Actions actions = new Actions(Session); actions.SendKeys(Keys.Tab).SendKeys(Keys.Enter); actions.Build().Perform(); - - // WaitUntilHidden(button!); } - public void ClickCancelDeletion() + public void ClickCancelDialog() { Actions actions = new Actions(Session); actions.SendKeys(Keys.Tab).SendKeys(Keys.Tab).SendKeys(Keys.Enter); actions.Build().Perform(); } - public void Click_ContextMenuItem(string layoutName, string menuItem) + public void ClickContextMenuItem(string layoutName, string menuItem) { WindowsElement menu = OpenContextMenu(layoutName); Click(menu.FindElementByName(menuItem)); } + public void SelectNewLayoutType(Constants.CustomLayoutType type) + { + WindowsElement? button = null; + switch (type) + { + case Constants.CustomLayoutType.Canvas: + button = FindByAccessibilityId(AccessibilityId.CanvasRadioButton); + break; + case Constants.CustomLayoutType.Grid: + button = FindByAccessibilityId(AccessibilityId.GridRadioButton); + break; + } + + Click(button!); + } + private WindowsElement? FindByAccessibilityId(string name) { try