From ed4940ca68512aa712901cd9372f136ca700a9fd Mon Sep 17 00:00:00 2001 From: seraphima Date: Mon, 20 Nov 2023 15:00:23 +0100 Subject: [PATCH] Moved constants --- .../UITests-FancyZonesEditor/Constants.cs | 41 +++++++++++++++++++ .../RunFancyZonesEditorTest.cs | 24 +---------- 2 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 src/modules/fancyzones/UITests-FancyZonesEditor/Constants.cs diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/Constants.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/Constants.cs new file mode 100644 index 0000000000..8c2c525e1c --- /dev/null +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/Constants.cs @@ -0,0 +1,41 @@ +// 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.Collections.Generic; + +namespace Microsoft.FancyZonesEditor.UITests +{ + public static class Constants + { + public enum Layouts + { + Empty, + Focus, + Rows, + Columns, + Grid, + PriorityGrid, + } + + public static readonly Dictionary LayoutNames = new Dictionary() + { + { Layouts.Empty, "No layout" }, + { Layouts.Focus, "Focus" }, + { Layouts.Rows, "Rows" }, + { Layouts.Columns, "Columns" }, + { Layouts.Grid, "Grid" }, + { Layouts.PriorityGrid, "PriorityGrid" }, + }; + + public static readonly Dictionary LayoutTypes = new Dictionary() + { + { Layouts.Empty, "blank" }, + { Layouts.Focus, "focus" }, + { Layouts.Rows, "rows" }, + { Layouts.Columns, "columns" }, + { Layouts.Grid, "grid" }, + { Layouts.PriorityGrid, "priority-grid" }, + }; + } +} diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs index fc1dddc464..0941ff3297 100644 --- a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs +++ b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs @@ -14,26 +14,6 @@ namespace UITests_FancyZonesEditor private static FancyZonesEditorSession? _session; private static TestContext? _context; - private enum Layouts - { - Empty, - Focus, - Rows, - Columns, - Grid, - PriorityGrid, - } - - private static readonly Dictionary LayoutNames = new Dictionary() - { - { Layouts.Empty, "No layout" }, - { Layouts.Focus, "Focus" }, - { Layouts.Rows, "Rows" }, - { Layouts.Columns, "Columns" }, - { Layouts.Grid, "Grid" }, - { Layouts.PriorityGrid, "PriorityGrid" }, - }; - [ClassInitialize] public static void ClassInitialize(TestContext testContext) { @@ -74,7 +54,7 @@ namespace UITests_FancyZonesEditor [TestMethod] public void OpenEditLayoutDialog() // verify the edit layout dialog is opened { - _session?.Click_EditLayout(LayoutNames[Layouts.Grid]); + _session?.Click_EditLayout(Constants.LayoutNames[Constants.Layouts.Grid]); 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 } @@ -82,7 +62,7 @@ namespace UITests_FancyZonesEditor [TestMethod] public void OpenContextMenu() // verify the context menu is opened { - Assert.IsNotNull(_session?.OpenContextMenu(LayoutNames[Layouts.Columns])); + Assert.IsNotNull(_session?.OpenContextMenu(Constants.LayoutNames[Constants.Layouts.Columns])); } } }