Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

WinAppDriver tests update (#5882)

Browse Source 
* tray button fix
* settings closing changed
* ignore old settings tests
* changed test init
* changed launch
* separated app history file
* select enabled modules on launch
This commit is contained in:
Seraphima Zykova
2020-08-18 12:23:43 +03:00
committed by GitHub
parent c6c9839208
commit 13d61bd866
13 changed files with 402 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/tests/win-app-driver/FancyZonesTests/EditorTemplatesEditTests.cs
View File

@@ -1,7 +1,7 @@
using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json.Linq;
using OpenQA.Selenium.Appium.Windows;
using OpenQA.Selenium.Appium;
using OpenQA.Selenium.Interactions;
namespace PowerToysTests
@@ -11,13 +11,19 @@ namespace PowerToysTests
{
private void ChangeLayout()
{
new Actions(session).MoveToElement(session.FindElementByAccessibilityId("PART_TitleBar")).MoveByOffset(0, -50).Click().Perform();
new Actions(session).MoveToElement(creatorWindow.FindElementByAccessibilityId("PART_TitleBar")).MoveByOffset(0, -50).Click().Perform();
}
private void CancelTest()
private void Cancel(AppiumWebElement creatorWindow)
{
WindowsElement cancelButton = session.FindElementByXPath("//Window[@Name=\"FancyZones Editor\"]/Window/Button[@Name=\"Cancel\"]");
AppiumWebElement cancelButton = creatorWindow.FindElementByName("Cancel");
Assert.IsNotNull(cancelButton);
new Actions(session).MoveToElement(cancelButton).Click().Perform();
}
private void CancelTest(AppiumWebElement creatorWindow)
{
Cancel(creatorWindow);
WaitSeconds(1);
Assert.AreEqual(_defaultZoneSettings, File.ReadAllText(_zoneSettingsPath), "Settings were changed");
@@ -25,7 +31,7 @@ namespace PowerToysTests
private void SaveTest()
{
new Actions(session).MoveToElement(session.FindElementByName("Save and apply")).Click().Perform();
new Actions(session).MoveToElement(creatorWindow.FindElementByName("Save and apply")).Click().Perform();
WaitSeconds(1);
JObject settings = JObject.Parse(File.ReadAllText(_zoneSettingsPath));
@@ -36,70 +42,70 @@ namespace PowerToysTests
[TestMethod]
public void EditFocusCancel()
{
OpenCreatorWindow("Focus", "Custom layout creator", "EditTemplateButton");
OpenCreatorWindow("Focus", "EditTemplateButton");
ZoneCountTest(3, 0);
session.FindElementByAccessibilityId("newZoneButton").Click();
creatorWindow.FindElementByAccessibilityId("newZoneButton").Click();
ZoneCountTest(4, 0);
CancelTest();
CancelTest(creatorWindow);
}
[TestMethod]
public void EditColumnsCancel()
{
OpenCreatorWindow("Columns", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Columns", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
ZoneCountTest(0, 4);
CancelTest();
CancelTest(creatorWindow);
}
[TestMethod]
public void EditRowsCancel()
{
OpenCreatorWindow("Rows", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Rows", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
ZoneCountTest(0, 4);
CancelTest();
CancelTest(creatorWindow);
}
[TestMethod]
public void EditGridCancel()
{
OpenCreatorWindow("Grid", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Grid", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
ZoneCountTest(0, 4);
CancelTest();
CancelTest(creatorWindow);
}
[TestMethod]
public void EditPriorityGridCancel()
{
OpenCreatorWindow("Priority Grid", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Priority Grid", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
ZoneCountTest(0, 4);
CancelTest();
CancelTest(creatorWindow);
}
[TestMethod]
public void EditFocusSave()
{
OpenCreatorWindow("Focus", "Custom layout creator", "EditTemplateButton");
OpenCreatorWindow("Focus", "EditTemplateButton");
ZoneCountTest(3, 0);
session.FindElementByAccessibilityId("newZoneButton").Click();
creatorWindow.FindElementByAccessibilityId("newZoneButton").Click();
ZoneCountTest(4, 0);
SaveTest();
@@ -108,7 +114,7 @@ namespace PowerToysTests
[TestMethod]
public void EditColumnsSave()
{
OpenCreatorWindow("Columns", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Columns", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
@@ -120,7 +126,7 @@ namespace PowerToysTests
[TestMethod]
public void EditRowsSave()
{
OpenCreatorWindow("Rows", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Rows", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
@@ -132,7 +138,7 @@ namespace PowerToysTests
[TestMethod]
public void EditGridSave()
{
OpenCreatorWindow("Grid", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Grid", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
@@ -144,7 +150,7 @@ namespace PowerToysTests
[TestMethod]
public void EditPriorityGridSave()
{
OpenCreatorWindow("Priority Grid", "Custom table layout creator", "EditTemplateButton");
OpenCreatorWindow("Priority Grid", "EditTemplateButton");
ZoneCountTest(0, 3);
ChangeLayout();
@@ -156,32 +162,26 @@ namespace PowerToysTests
[ClassInitialize]
public static void ClassInitialize(TestContext context)
{
Setup(context, false);
if (session == null)
return;
Setup(context);
Assert.IsNotNull(session);
EnableModules(false, true, false, false, false, false, false, false);
ResetDefaultFancyZonesSettings(false);
ResetDefaultZoneSettings(true);
}
[ClassCleanup]
public static void ClassCleanup()
{
CloseSettings();
ExitPowerToys();
TearDown();
}
[TestInitialize]
public void TestInitialize()
{
if (session == null)
return;
if (!isPowerToysLaunched)
{
LaunchPowerToys();
}
OpenEditor();
ResetDefaultZoneSettings(true);
Assert.IsTrue(OpenEditor());
OpenTemplates();
}
@@ -198,10 +198,8 @@ namespace PowerToysTests
}
catch (OpenQA.Selenium.WebDriverException)
{
//editor has already closed
//editor was already closed
}
ResetDefaultZoneSettings(false);
}
}
}