diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs b/src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs index c1eea18d98..872f1270f1 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs +++ b/src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs @@ -10,33 +10,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.CmdPal.UITests; [TestClass] -public class BasicTests : UITestBase +public class BasicTests : CommandPaletteTestBase { public BasicTests() - : base(PowerToysModule.CommandPalette) { } - private void SetSearchBox(string text) - { - Assert.AreEqual(this.Find("Type here to search...").SetText(text, true).Text, text); - } - - private void SetFilesExtensionSearchBox(string text) - { - Assert.AreEqual(this.Find("Search for files and folders...").SetText(text, true).Text, text); - } - - private void SetCalculatorExtensionSearchBox(string text) - { - Assert.AreEqual(this.Find("Type an equation...").SetText(text, true).Text, text); - } - - private void SetTimeAndDaterExtensionSearchBox(string text) - { - Assert.AreEqual(this.Find("Search values or type a custom time stamp...").SetText(text, true).Text, text); - } - [TestMethod] public void BasicFileSearchTest() { diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs b/src/modules/cmdpal/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs new file mode 100644 index 0000000000..da259e3b18 --- /dev/null +++ b/src/modules/cmdpal/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs @@ -0,0 +1,48 @@ +// 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 System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.PowerToys.UITest; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Microsoft.CmdPal.UITests; + +public class CommandPaletteTestBase : UITestBase +{ + public CommandPaletteTestBase() + : base(PowerToysModule.CommandPalette) + { + } + + protected void SetSearchBox(string text) + { + Assert.AreEqual(this.Find("Type here to search...").SetText(text, true).Text, text); + } + + protected void SetFilesExtensionSearchBox(string text) + { + Assert.AreEqual(this.Find("Search for files and folders...").SetText(text, true).Text, text); + } + + protected void SetCalculatorExtensionSearchBox(string text) + { + Assert.AreEqual(this.Find("Type an equation...").SetText(text, true).Text, text); + } + + protected void SetTimeAndDaterExtensionSearchBox(string text) + { + Assert.AreEqual(this.Find("Search values or type a custom time stamp...").SetText(text, true).Text, text); + } + + protected void OpenContextMenu() + { + var contextMenuButton = this.Find