Add a test scenario for pen barrel button click operation using W3C Actions API

timotiusmargo · timotiusmargo · commit b59eafb6569d · 2018-08-08T17:16:06.000-07:00
Create FindAppTitleBar in AlarmsClockBase WebDriverAPI tests to support older apps
Update Window WebDriverAPI tests to use Edge private windows
diff --git a/Tests/WebDriverAPI/ActionsPen.cs b/Tests/WebDriverAPI/ActionsPen.cs
@@ -46,6 +46,36 @@ public static void ClassCleanup()
             TearDown();
         }
 
+        [TestMethod]
+        public void Pen_Click_BarrelButton()
+        {
+            // Create a new test alarm
+            string alarmName = "PenBarrelButtonTest";
+            DeletePreviouslyCreatedAlarmEntry(alarmName);
+            AddAlarmEntry(alarmName);
+            Thread.Sleep(TimeSpan.FromSeconds(3));
+
+            var alarmEntries = session.FindElementsByXPath($"//ListItem[starts-with(@Name, \"{alarmName}\")]");
+            Assert.IsNotNull(alarmEntries);
+            Assert.AreEqual(1, alarmEntries.Count);
+
+            // Open a the context menu on the alarm entry using long tap (press and hold) action and click delete
+            PointerInputDevice penDevice = new PointerInputDevice(PointerKind.Pen);
+            ActionSequence sequence = new ActionSequence(penDevice, 0);
+            sequence.AddAction(penDevice.CreatePointerMove(alarmEntries[0], 0, 0, TimeSpan.Zero));
+            sequence.AddAction(penDevice.CreatePointerDown(PointerButton.PenBarrel));
+            sequence.AddAction(penDevice.CreatePointerUp(PointerButton.PenBarrel));
+            session.PerformActions(new List<ActionSequence> { sequence });
+
+            Thread.Sleep(TimeSpan.FromSeconds(1));
+            session.FindElementByName("Delete").Click();
+            Thread.Sleep(TimeSpan.FromSeconds(1));
+
+            alarmEntries = session.FindElementsByXPath($"//ListItem[starts-with(@Name, \"{alarmName}\")]");
+            Assert.IsNotNull(alarmEntries);
+            Assert.AreEqual(0, alarmEntries.Count);
+        }
+
         [TestMethod]
         public void Pen_Click_OriginElement()
         {
@@ -161,7 +191,7 @@ public void Pen_Click_OriginViewport()
         [TestMethod]
         public void Pen_DoubleClick()
         {
-            WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppName");
+            WindowsElement appNameTitle = FindAppTitleBar();
             WindowsElement maximizeButton = session.FindElementByAccessibilityId("Maximize");
 
             // Set focus on the application by switching window to itself
@@ -203,7 +233,7 @@ public void Pen_DoubleClick()
         [TestMethod]
         public void Pen_DragAndDrop()
         {
-            WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppName");
+            WindowsElement appNameTitle = FindAppTitleBar();
             const int offset = 100;
 
             // Save application window original position
@@ -287,7 +317,6 @@ public void Pen_LongClick()
             Assert.AreEqual(0, alarmEntries.Count);
         }
 
-
         [TestMethod]
         public void Pen_Scroll_Horizontal()
         {
diff --git a/Tests/WebDriverAPI/ActionsTouch.cs b/Tests/WebDriverAPI/ActionsTouch.cs
@@ -161,7 +161,7 @@ public void Touch_Click_OriginViewport()
         [TestMethod]
         public void Touch_DoubleClick()
         {
-            WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppName");
+            WindowsElement appNameTitle = FindAppTitleBar();
             WindowsElement maximizeButton = session.FindElementByAccessibilityId("Maximize");
 
             // Set focus on the application by switching window to itself
@@ -203,7 +203,7 @@ public void Touch_DoubleClick()
         [TestMethod]
         public void Touch_DragAndDrop()
         {
-            WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppName");
+            WindowsElement appNameTitle = FindAppTitleBar();
             const int offset = 100;
 
             // Save application window original position
@@ -287,7 +287,6 @@ public void Touch_LongClick()
             Assert.AreEqual(0, alarmEntries.Count);
         }
 
-
         [TestMethod]
         public void Touch_Scroll_Horizontal()
         {
diff --git a/Tests/WebDriverAPI/AppSessionBase/AlarmClockBase.cs b/Tests/WebDriverAPI/AppSessionBase/AlarmClockBase.cs
@@ -152,5 +152,19 @@ protected static void DismissAddAlarmPage()
                 session.DismissAlarmDialogIfThere();
             }
         }
+
+        protected static WindowsElement FindAppTitleBar()
+        {
+            WindowsElement element;
+            try
+            {
+                element = session.FindElementByAccessibilityId("AppName");
+            }
+            catch (InvalidOperationException)
+            {
+                element = session.FindElementByAccessibilityId("TitleBar");
+            }
+            return element;
+        }
     }
 }
diff --git a/Tests/WebDriverAPI/AppSessionBase/WebDriverApiExtensions.cs b/Tests/WebDriverAPI/AppSessionBase/WebDriverApiExtensions.cs
@@ -26,11 +26,11 @@ internal static WindowsElement FindCalculatorTitleByAccessibilityId(this Windows
             WindowsElement element;
             try
             {
-                element = session.FindElementByAccessibilityId("AppNameTitle");
+                element = session.FindElementByAccessibilityId("AppName");
             }
             catch (InvalidOperationException)
             {
-                element = session.FindElementByAccessibilityId("AppName");
+                element = session.FindElementByAccessibilityId("AppNameTitle");
             }
             return element;
         }
diff --git a/Tests/WebDriverAPI/Window.cs b/Tests/WebDriverAPI/Window.cs
@@ -133,8 +133,8 @@ public void GetWindowHandles_ModernApp()
             // Set focus on itself
             session.SwitchTo().Window(session.CurrentWindowHandle);
 
-            // Open a new window
-            session.Keyboard.SendKeys(Keys.Control + "n" + Keys.Control);
+            // Open a new window in private mode
+            session.Keyboard.SendKeys(Keys.Control + Keys.Shift + "p" + Keys.Shift + Keys.Control);
             Thread.Sleep(TimeSpan.FromSeconds(3));
             var windowHandlesAfter = session.WindowHandles;
             Assert.IsNotNull(windowHandlesAfter);
@@ -167,8 +167,8 @@ public void SwitchWindows()
             // Set focus on itself
             session.SwitchTo().Window(session.CurrentWindowHandle);
 
-            // Open a new window
-            session.Keyboard.SendKeys(Keys.Control + "n" + Keys.Control);
+            // Open a new window in private mode
+            session.Keyboard.SendKeys(Keys.Control + Keys.Shift + "p" + Keys.Shift + Keys.Control);
             Thread.Sleep(TimeSpan.FromSeconds(3));
             var multipleWindowHandles = session.WindowHandles;
             Assert.IsTrue(multipleWindowHandles.Count > 1);

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public void Touch_Click_OriginViewport()`
`161`	`161`	`[TestMethod]`
`162`	`162`	`public void Touch_DoubleClick()`
`163`	`163`	`{`
`164`		`- WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppName");`
	`164`	`+ WindowsElement appNameTitle = FindAppTitleBar();`
`165`	`165`	`WindowsElement maximizeButton = session.FindElementByAccessibilityId("Maximize");`
`166`	`166`
`167`	`167`	`// Set focus on the application by switching window to itself`
`@@ -203,7 +203,7 @@ public void Touch_DoubleClick()`
`203`	`203`	`[TestMethod]`
`204`	`204`	`public void Touch_DragAndDrop()`
`205`	`205`	`{`
`206`		`- WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppName");`
	`206`	`+ WindowsElement appNameTitle = FindAppTitleBar();`
`207`	`207`	`const int offset = 100;`
`208`	`208`
`209`	`209`	`// Save application window original position`
`@@ -287,7 +287,6 @@ public void Touch_LongClick()`
`287`	`287`	`Assert.AreEqual(0, alarmEntries.Count);`
`288`	`288`	`}`
`289`	`289`
`290`		`-`
`291`	`290`	`[TestMethod]`
`292`	`291`	`public void Touch_Scroll_Horizontal()`
`293`	`292`	`{`
Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,19 @@ protected static void DismissAddAlarmPage()`
`152`	`152`	`session.DismissAlarmDialogIfThere();`
`153`	`153`	`}`
`154`	`154`	`}`
	`155`	`+`
	`156`	`+ protected static WindowsElement FindAppTitleBar()`
	`157`	`+ {`
	`158`	`+ WindowsElement element;`
	`159`	`+ try`
	`160`	`+ {`
	`161`	`+ element = session.FindElementByAccessibilityId("AppName");`
	`162`	`+ }`
	`163`	`+ catch (InvalidOperationException)`
	`164`	`+ {`
	`165`	`+ element = session.FindElementByAccessibilityId("TitleBar");`
	`166`	`+ }`
	`167`	`+ return element;`
	`168`	`+ }`
`155`	`169`	`}`
`156`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ internal static WindowsElement FindCalculatorTitleByAccessibilityId(this Windows`
`26`	`26`	`WindowsElement element;`
`27`	`27`	`try`
`28`	`28`	`{`
`29`		`- element = session.FindElementByAccessibilityId("AppNameTitle");`
	`29`	`+ element = session.FindElementByAccessibilityId("AppName");`
`30`	`30`	`}`
`31`	`31`	`catch (InvalidOperationException)`
`32`	`32`	`{`
`33`		`- element = session.FindElementByAccessibilityId("AppName");`
	`33`	`+ element = session.FindElementByAccessibilityId("AppNameTitle");`
`34`	`34`	`}`
`35`	`35`	`return element;`
`36`	`36`	`}`