diff --git a/src/modules/fancyzones/lib/JsonHelpers.h b/src/modules/fancyzones/lib/JsonHelpers.h index bc07083e95..13d48affa0 100644 --- a/src/modules/fancyzones/lib/JsonHelpers.h +++ b/src/modules/fancyzones/lib/JsonHelpers.h @@ -224,6 +224,7 @@ namespace JSONHelpers { std::wstring result = PTSettingsHelper::get_module_save_folder_location(moduleName); jsonFilePath = result + L"\\" + std::wstring(L"zones-settings.json"); + appZoneHistoryFilePath = result + L"\\" + std::wstring(L"app-zone-history.json"); } #endif diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorCanvasZoneResizeTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorCanvasZoneResizeTests.cs index f43b329f07..c8d6b18701 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorCanvasZoneResizeTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorCanvasZoneResizeTests.cs @@ -261,6 +261,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context, false); + if (session == null) + return; + ResetSettings(); if (!isPowerToysLaunched) @@ -281,6 +284,9 @@ namespace PowerToysTests [TestInitialize] public void TestInitialize() { + if (session == null) + return; + //create canvas zone OpenCreatorWindow("Create new custom", "Custom layout creator"); session.FindElementByAccessibilityId("newZoneButton").Click(); @@ -289,6 +295,9 @@ namespace PowerToysTests [TestCleanup] public void TestCleanup() { + if (session == null) + return; + new Actions(session).MoveToElement(session.FindElementByXPath("//Button[@Name=\"Cancel\"]")).Click().Perform(); } } diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs index 9c8ceec813..67289b2478 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorCustomLayoutsTests.cs @@ -292,6 +292,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context, false); + if (session == null) + return; + ResetSettings(); } @@ -304,6 +307,9 @@ namespace PowerToysTests [TestInitialize] public void TestInitialize() { + if (session == null) + return; + if (!isPowerToysLaunched) { LaunchPowerToys(); diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorGridZoneResizeTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorGridZoneResizeTests.cs index 79f6287853..961b0113e7 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorGridZoneResizeTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorGridZoneResizeTests.cs @@ -397,6 +397,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context, false); + if (session == null) + return; + ResetSettings(); if (!isPowerToysLaunched) diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs index b9f4866841..02f5877096 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorOpeningTests.cs @@ -233,6 +233,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context, false); + if (session == null) + return; + ResetDefaultFancyZonesSettings(true); } diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorSettingsTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorSettingsTests.cs index 009862b297..bca8542c19 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorSettingsTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorSettingsTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -179,6 +179,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context, false); + if (session == null) + return; + ResetSettings(); } diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesApplyTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesApplyTests.cs index d40088d0a2..938dd520de 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesApplyTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesApplyTests.cs @@ -68,6 +68,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context, false); + if (session == null) + return; + ResetDefaultFancyZonesSettings(true); } @@ -81,6 +84,9 @@ namespace PowerToysTests [TestInitialize] public void TestInitialize() { + if (session == null) + return; + OpenEditor(); OpenTemplates(); } diff --git a/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs b/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs index 345c628f1c..24dbf0bb37 100644 --- a/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs @@ -157,6 +157,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context, false); + if (session == null) + return; + ResetDefaultFancyZonesSettings(false); ResetDefaultZoneSettings(true); } @@ -171,6 +174,9 @@ namespace PowerToysTests [TestInitialize] public void TestInitialize() { + if (session == null) + return; + if (!isPowerToysLaunched) { LaunchPowerToys(); diff --git a/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs b/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs index 678897e83d..b32e12da98 100644 --- a/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs +++ b/src/tests/win-app-driver/FancyZonesTests/FancyZonesEditor.cs @@ -1,6 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium.Appium.Windows; using OpenQA.Selenium.Interactions; +using System; namespace PowerToysTests { @@ -16,13 +17,20 @@ namespace PowerToysTests protected static void OpenEditor() { - new Actions(session).KeyDown(OpenQA.Selenium.Keys.Command).SendKeys("`").KeyUp(OpenQA.Selenium.Keys.Command).Perform(); - WaitSeconds(2); - //editorWindow = WaitElementByXPath("//Window[@Name=\"FancyZones Editor\"]"); - editorWindow = WaitElementByName("FancyZones Editor"); - //may not find editor by name in 0.16.1 - //editorWindow = WaitElementByAccessibilityId("MainWindow1"); - Assert.IsNotNull(editorWindow, "Couldn't find editor window"); + try + { + new Actions(session).KeyDown(OpenQA.Selenium.Keys.Command).SendKeys("`").KeyUp(OpenQA.Selenium.Keys.Command).Perform(); + WaitSeconds(2); + //editorWindow = WaitElementByXPath("//Window[@Name=\"FancyZones Editor\"]"); + editorWindow = WaitElementByName("FancyZones Editor"); + //may not find editor by name in 0.16.1 + //editorWindow = WaitElementByAccessibilityId("MainWindow1"); + Assert.IsNotNull(editorWindow, "Couldn't find editor window"); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } } protected static void CloseEditor() @@ -42,28 +50,49 @@ namespace PowerToysTests protected static void OpenCustomLayouts() { - WindowsElement customsTab = session.FindElementByName("Custom"); - customsTab.Click(); - string isSelected = customsTab.GetAttribute("SelectionItem.IsSelected"); - Assert.AreEqual("True", isSelected, "Custom tab cannot be opened"); + try + { + WindowsElement customsTab = session.FindElementByName("Custom"); + customsTab.Click(); + string isSelected = customsTab.GetAttribute("SelectionItem.IsSelected"); + Assert.AreEqual("True", isSelected, "Custom tab cannot be opened"); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } } protected static void OpenTemplates() { - WindowsElement templatesTab = session.FindElementByName("Templates"); - templatesTab.Click(); - string isSelected = templatesTab.GetAttribute("SelectionItem.IsSelected"); - Assert.AreEqual("True", isSelected, "Templates tab cannot be opened"); + try + { + WindowsElement templatesTab = session.FindElementByName("Templates"); + templatesTab.Click(); + string isSelected = templatesTab.GetAttribute("SelectionItem.IsSelected"); + Assert.AreEqual("True", isSelected, "Templates tab cannot be opened"); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } } protected static void OpenCreatorWindow(string tabName, string creatorWindowName, string buttonId = "EditCustomButton") { - string elementXPath = "//Text[@Name=\"" + tabName + "\"]"; - WaitElementByXPath(elementXPath).Click(); - WaitElementByAccessibilityId(buttonId).Click(); + try + { + string elementXPath = "//Text[@Name=\"" + tabName + "\"]"; + WaitElementByXPath(elementXPath).Click(); + WaitElementByAccessibilityId(buttonId).Click(); - WindowsElement creatorWindow = WaitElementByName(creatorWindowName); - Assert.IsNotNull(creatorWindow, "Creator window didn't open"); + WindowsElement creatorWindow = WaitElementByName(creatorWindowName); + Assert.IsNotNull(creatorWindow, "Creator window didn't open"); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } } protected void ZoneCountTest(int canvasZoneCount, int gridZoneCount) diff --git a/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs b/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs index 18d058397c..68e55a275d 100644 --- a/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs +++ b/src/tests/win-app-driver/FancyZonesTests/FancyZonesSettingsTests.cs @@ -713,6 +713,9 @@ namespace PowerToysTests public static void ClassInitialize(TestContext context) { Setup(context); + if (session == null) + return; + Init(); } @@ -740,6 +743,9 @@ namespace PowerToysTests [TestInitialize] public void TestInitialize() { + if (session == null) + return; + try { _initialSettingsJson = JObject.Parse(_initialSettings); diff --git a/src/tests/win-app-driver/PowerToysSession.cs b/src/tests/win-app-driver/PowerToysSession.cs index 8977269a08..8db49b06c7 100644 --- a/src/tests/win-app-driver/PowerToysSession.cs +++ b/src/tests/win-app-driver/PowerToysSession.cs @@ -1,5 +1,5 @@ using System; -using System.Diagnostics; +using System.Diagnostics; using System.IO; using System.Threading; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -22,155 +22,175 @@ namespace PowerToysTests protected static string _settingsFolderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\FancyZones"); protected static string _settingsPath = _settingsFolderPath + "\\settings.json"; protected static string _zoneSettingsPath = _settingsFolderPath + "\\zones-settings.json"; + protected static string _appHistoryPath = _settingsFolderPath + "\\app-zone-history.json"; protected static string _initialSettings = ""; protected static string _initialZoneSettings = ""; + protected static string _initialAppHistorySettings = ""; - protected const string _defaultSettings = "{\"version\":\"1.0\",\"name\":\"FancyZones\",\"properties\":{\"fancyzones_shiftDrag\":{\"value\":true},\"fancyzones_mouseSwitch\":{\"value\":false},\"fancyzones_overrideSnapHotkeys\":{\"value\":false},\"fancyzones_moveWindowAcrossMonitors\":{\"value\":false},\"fancyzones_zoneSetChange_flashZones\":{\"value\":false},\"fancyzones_displayChange_moveWindows\":{\"value\":false},\"fancyzones_zoneSetChange_moveWindows\":{\"value\":false},\"fancyzones_appLastZone_moveWindows\":{\"value\":false},\"use_cursorpos_editor_startupscreen\":{\"value\":true},\"fancyzones_zoneHighlightColor\":{\"value\":\"#0078D7\"},\"fancyzones_highlight_opacity\":{\"value\":90},\"fancyzones_editor_hotkey\":{\"value\":{\"win\":true,\"ctrl\":false,\"alt\":false,\"shift\":false,\"code\":192,\"key\":\"`\"}},\"fancyzones_excluded_apps\":{\"value\":\"\"}}}"; + protected const string _defaultSettings = "{\"version\":\"1.0\",\"name\":\"FancyZones\",\"properties\":{\"fancyzones_shiftDrag\":{\"value\":true},\"fancyzones_mouseSwitch\":{\"value\":false},\"fancyzones_overrideSnapHotkeys\":{\"value\":false},\"fancyzones_moveWindowAcrossMonitors\":{\"value\":false},\"fancyzones_zoneSetChange_flashZones\":{\"value\":false},\"fancyzones_displayChange_moveWindows\":{\"value\":false},\"fancyzones_zoneSetChange_moveWindows\":{\"value\":false},\"fancyzones_appLastZone_moveWindows\":{\"value\":false},\"use_cursorpos_editor_startupscreen\":{\"value\":true},\"fancyzones_zoneHighlightColor\":{\"value\":\"#0078D7\"},\"fancyzones_highlight_opacity\":{\"value\":90},\"fancyzones_editor_hotkey\":{\"value\":{\"win\":true,\"ctrl\":false,\"alt\":false,\"shift\":false,\"code\":192,\"key\":\"`\"}},\"fancyzones_excluded_apps\":{\"value\":\"\"}}}"; protected const string _defaultZoneSettings = "{\"app-zone-history\":[],\"devices\":[],\"custom-zone-sets\":[]}"; public static void Setup(TestContext context, bool isLaunchRequired = true) - { - ReadUserSettings(); //read settings before running tests to restore them after - + { if (session == null) { + ReadUserSettings(); //read settings before running tests to restore them after + // Create a new Desktop session to use PowerToys. AppiumOptions appiumOptions = new AppiumOptions(); appiumOptions.PlatformName = "Windows"; appiumOptions.AddAdditionalCapability("app", "Root"); - session = new WindowsDriver(new Uri(WindowsApplicationDriverUrl), appiumOptions); - Assert.IsNotNull(session); - - trayButton = session.FindElementByAccessibilityId("1502"); - - isPowerToysLaunched = CheckPowerToysLaunched(); - if (!isPowerToysLaunched && isLaunchRequired) + try { - LaunchPowerToys(); + session = new WindowsDriver(new Uri(WindowsApplicationDriverUrl), appiumOptions); + trayButton = session.FindElementByAccessibilityId("1502"); + + isPowerToysLaunched = CheckPowerToysLaunched(); + if (!isPowerToysLaunched && isLaunchRequired) + { + LaunchPowerToys(); + } + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); } - } + } } public static void TearDown() - { - RestoreUserSettings(); //restore initial settings files + { + RestoreUserSettings(); //restore initial settings files if (session != null) { session.Quit(); session = null; - } - } - - public static void WaitSeconds(double seconds) - { - Thread.Sleep(TimeSpan.FromSeconds(seconds)); + } } - - //Trying to find element by XPath - protected static WindowsElement WaitElementByName(string name, double maxTime = 10) - { - WindowsElement result = null; - Stopwatch timer = new Stopwatch(); - timer.Start(); - while (timer.Elapsed < TimeSpan.FromSeconds(maxTime)) - { - try - { - result = session.FindElementByName(name); - } - catch { } - return result; - } - return null; - } - - //Trying to find element by XPath - protected static WindowsElement WaitElementByXPath(string xPath, double maxTime = 10) - { - WindowsElement result = null; - Stopwatch timer = new Stopwatch(); - timer.Start(); - while (timer.Elapsed < TimeSpan.FromSeconds(maxTime)) - { - try - { - result = session.FindElementByXPath(xPath); - } - catch { } - return result; - } - return null; - } - - //Trying to find element by AccessibilityId - protected static WindowsElement WaitElementByAccessibilityId(string accessibilityId, double maxTime = 10) - { - WindowsElement result = null; - Stopwatch timer = new Stopwatch(); - timer.Start(); - while (timer.Elapsed < TimeSpan.FromSeconds(maxTime)) - { - try - { - result = session.FindElementByAccessibilityId(accessibilityId); - } - catch { } - return result; - } - return null; + + public static void WaitSeconds(double seconds) + { + Thread.Sleep(TimeSpan.FromSeconds(seconds)); + } + + //Trying to find element by XPath + protected static WindowsElement WaitElementByName(string name, double maxTime = 10) + { + WindowsElement result = null; + Stopwatch timer = new Stopwatch(); + timer.Start(); + while (timer.Elapsed < TimeSpan.FromSeconds(maxTime)) + { + try + { + result = session.FindElementByName(name); + } + catch { } + return result; + } + return null; + } + + //Trying to find element by XPath + protected static WindowsElement WaitElementByXPath(string xPath, double maxTime = 10) + { + WindowsElement result = null; + Stopwatch timer = new Stopwatch(); + timer.Start(); + while (timer.Elapsed < TimeSpan.FromSeconds(maxTime)) + { + try + { + result = session.FindElementByXPath(xPath); + } + catch { } + return result; + } + return null; + } + + //Trying to find element by AccessibilityId + protected static WindowsElement WaitElementByAccessibilityId(string accessibilityId, double maxTime = 10) + { + WindowsElement result = null; + Stopwatch timer = new Stopwatch(); + timer.Start(); + while (timer.Elapsed < TimeSpan.FromSeconds(maxTime)) + { + try + { + result = session.FindElementByAccessibilityId(accessibilityId); + } + catch { } + return result; + } + return null; } public static void OpenSettings() { - trayButton.Click(); - session.FindElementByXPath("//Button[@Name=\"PowerToys\"]").Click(); - trayButton.Click(); + try + { + trayButton.Click(); + session.FindElementByXPath("//Button[@Name=\"PowerToys\"]").Click(); + trayButton.Click(); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } } public static void OpenFancyZonesSettings() { - WindowsElement fzNavigationButton = WaitElementByXPath("//Button[@Name=\"FancyZones\"]"); - Assert.IsNotNull(fzNavigationButton); + try + { + WindowsElement fzNavigationButton = WaitElementByXPath("//Button[@Name=\"FancyZones\"]"); + Assert.IsNotNull(fzNavigationButton); - fzNavigationButton.Click(); - fzNavigationButton.Click(); - } + fzNavigationButton.Click(); + fzNavigationButton.Click(); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } +} public static void CloseSettings() { - try - { - WindowsElement settings = session.FindElementByName("PowerToys Settings"); - if (settings != null) - { - settings.SendKeys(Keys.Alt + Keys.F4); - } + try + { + WindowsElement settings = session.FindElementByName("PowerToys Settings"); + if (settings != null) + { + settings.SendKeys(Keys.Alt + Keys.F4); + } } - catch(Exception) - { - + catch (Exception ex) + { + Console.WriteLine(ex.Message); } } private static bool CheckPowerToysLaunched() { - trayButton.Click(); bool isLaunched = false; - try { + trayButton.Click(); WindowsElement pt = WaitElementByXPath("//Button[@Name=\"PowerToys\"]"); isLaunched = (pt != null); + trayButton.Click(); //close } catch(OpenQA.Selenium.WebDriverException) { //PowerToys not found } - - trayButton.Click(); //close + return isLaunched; } @@ -190,93 +210,120 @@ namespace PowerToysTests { Console.WriteLine("Exception on PowerToys launch:" + ex.Message); //exception could be thrown even if app launched successfully - } - + } + isPowerToysLaunched = true; } - public static void ExitPowerToys() - { - trayButton.Click(); + public static void ExitPowerToys() + { + try + { + trayButton.Click(); - WindowsElement pt = WaitElementByXPath("//Button[@Name=\"PowerToys\"]"); - Assert.IsNotNull(pt, "Couldn't find \'PowerToys\' button"); - new Actions(session).MoveToElement(pt).ContextClick().Perform(); - - WaitElementByXPath("//MenuItem[@Name=\"Exit\"]").Click(); - trayButton.Click(); //close tray - isPowerToysLaunched = false; - } - - public static void ResetDefaultFancyZonesSettings(bool relaunch) - { - ResetSettings(_settingsFolderPath, _settingsPath, _defaultSettings, relaunch); + WindowsElement pt = WaitElementByXPath("//Button[@Name=\"PowerToys\"]"); + new Actions(session).MoveToElement(pt).ContextClick().Perform(); + + WaitElementByXPath("//MenuItem[@Name=\"Exit\"]").Click(); + trayButton.Click(); //close tray + isPowerToysLaunched = false; + } + catch(Exception ex) + { + Console.WriteLine(ex.Message); + } } - public static void ResetDefaultZoneSettings(bool relaunch) - { - ResetSettings(_settingsFolderPath, _zoneSettingsPath, _defaultZoneSettings, relaunch); + public static void ResetDefaultFancyZonesSettings(bool relaunch) + { + ResetSettings(_settingsFolderPath, _settingsPath, _defaultSettings, relaunch); } - private static void ResetSettings(string folder, string filePath, string data, bool relaunch) - { - if (!Directory.Exists(folder)) - { - Directory.CreateDirectory(folder); - } - File.WriteAllText(filePath, data); - - if (isPowerToysLaunched) - { - ExitPowerToys(); - } - - if (relaunch) - { - LaunchPowerToys(); - } + public static void ResetDefaultZoneSettings(bool relaunch) + { + ResetSettings(_settingsFolderPath, _zoneSettingsPath, _defaultZoneSettings, relaunch); } - private static void ReadUserSettings() - { - try - { - _initialSettings = File.ReadAllText(_settingsPath); - } - catch (Exception) - { - //failed to read settings - } - - try - { - _initialZoneSettings = File.ReadAllText(_zoneSettingsPath); - } - catch (Exception) - { - //failed to read settings - } - } - - private static void RestoreUserSettings() - { + private static void ResetSettings(string folder, string filePath, string data, bool relaunch) + { + if (!Directory.Exists(folder)) + { + Directory.CreateDirectory(folder); + } + File.WriteAllText(filePath, data); + + if (isPowerToysLaunched) + { + ExitPowerToys(); + } + + if (relaunch) + { + LaunchPowerToys(); + } + } + + private static void ReadUserSettings() + { + try + { + if (_initialSettings.Length == 0) + { + _initialSettings = File.ReadAllText(_settingsPath); + } + } + catch (Exception) + { } + + try + { + if (_initialZoneSettings.Length == 0) + { + _initialZoneSettings = File.ReadAllText(_zoneSettingsPath); + } + } + catch (Exception) + { } + + try + { + if (_initialAppHistorySettings.Length == 0) + { + _initialAppHistorySettings = File.ReadAllText(_appHistoryPath); + } + } + catch (Exception) + { } + } + + private static void RestoreUserSettings() + { if (_initialSettings.Length > 0) { File.WriteAllText(_settingsPath, _initialSettings); - } - else - { - File.Delete(_settingsPath); - } - + } + else + { + File.Delete(_settingsPath); + } + if (_initialZoneSettings.Length > 0) { File.WriteAllText(_zoneSettingsPath, _initialZoneSettings); - } - else - { - File.Delete(_zoneSettingsPath); - } + } + else + { + File.Delete(_zoneSettingsPath); + } + + if (_initialAppHistorySettings.Length > 0) + { + File.WriteAllText(_appHistoryPath, _initialAppHistorySettings); + } + else + { + File.Delete(_appHistoryPath); + } } } } diff --git a/src/tests/win-app-driver/PowerToysTrayTests.cs b/src/tests/win-app-driver/PowerToysTrayTests.cs index 304cb8e0bf..a8b21432f8 100644 --- a/src/tests/win-app-driver/PowerToysTrayTests.cs +++ b/src/tests/win-app-driver/PowerToysTrayTests.cs @@ -1,4 +1,4 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium.Appium; using OpenQA.Selenium.Appium.Windows; using OpenQA.Selenium.Interactions; @@ -95,6 +95,9 @@ namespace PowerToysTests [TestInitialize] public void TestInitialize() { + if (session == null) + return; + isSettingsOpened = false; isTrayOpened = false; } diff --git a/src/tests/win-app-driver/TestShortcutHelper.cs b/src/tests/win-app-driver/TestShortcutHelper.cs index 286031116c..cb69738d2e 100644 --- a/src/tests/win-app-driver/TestShortcutHelper.cs +++ b/src/tests/win-app-driver/TestShortcutHelper.cs @@ -111,6 +111,9 @@ namespace PowerToysTests [TestInitialize] public void TestInitialize() { + if (session == null) + return; + isWinKeyPressed = false; // If the start menu is open, close it.