Merged PR 1887339: Fix WebDriverAPI tests for updated Calculator and Alarm App.

Fix WebDriverAPI tests for updated Calculator and Alarm App.

Dismiss save confirmation dialog in the alarms app.
Update the way to find the title on the calculator app.

Author: khouzam

Tests/WebDriverAPI/AppSessionBase/AlarmClockBase.cs

@@ -72,6 +72,7 @@ public virtual void TestInit()
             {
                 session.Navigate().Back();
                 Thread.Sleep(TimeSpan.FromSeconds(1));
+                session.DismissAlarmDialogIfThere();
 
                 try
                 {
@@ -80,6 +81,7 @@ public virtual void TestInit()
                 catch
                 {
                     session.FindElementByAccessibilityId("Back").Click(); // Press back button if navigating back somehow failed
+                    session.DismissAlarmDialogIfThere();
                     alarmTabElement = session.FindElementByAccessibilityId("AlarmPivotItem");
                 }
             }
@@ -145,6 +147,7 @@ protected static WindowsElement GetStaleElement()
             Thread.Sleep(TimeSpan.FromSeconds(0.5));
             WindowsElement staleElement = session.FindElementByAccessibilityId("AlarmSaveButton");
             session.Navigate().Back(); // Dismiss add alarm page
+            session.DismissAlarmDialogIfThere();
             Thread.Sleep(TimeSpan.FromSeconds(2));
             return staleElement;
         }

Tests/WebDriverAPI/AppSessionBase/Utility.cs

@@ -113,7 +113,7 @@ private static void InitializeOrphanedSession()
             // Create new calculator session and close the window to get an orphaned element
             CleanupOrphanedSession();
             orphanedSession = CreateNewSession(CommonTestSettings.CalculatorAppId);
-            orphanedElement = orphanedSession.FindElementByAccessibilityId("AppNameTitle");
+            orphanedElement = orphanedSession.FindCalculatorTitleByAccessibilityId();
             orphanedWindowHandle = orphanedSession.CurrentWindowHandle;
             orphanedSession.Close();
         }

Tests/WebDriverAPI/AppSessionBase/WebDriverApiExtensions.cs

@@ -0,0 +1,49 @@
+//******************************************************************************
+//
+// Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//******************************************************************************
+
+using OpenQA.Selenium.Appium.Windows;
+using System;
+
+namespace WebDriverAPI
+{
+    static class WebDriverApiExtensions
+    {
+        internal static WindowsElement FindCalculatorTitleByAccessibilityId(this WindowsDriver<WindowsElement> session)
+        {
+            WindowsElement element;
+            try
+            {
+                element = session.FindElementByAccessibilityId("AppNameTitle");
+            }
+            catch (InvalidOperationException)
+            {
+                element = session.FindElementByAccessibilityId("AppName");
+            }
+            return element;
+        }
+
+        internal static void DismissAlarmDialogIfThere(this WindowsDriver<WindowsElement> session)
+        {
+            try
+            {
+                session.FindElementByAccessibilityId("SecondaryButton").Click();
+            }
+            catch (InvalidOperationException)
+            {
+            }
+        }
+    }
+}

Tests/WebDriverAPI/AppiumAppLaunch.cs

@@ -66,7 +66,7 @@ public void Launch_ModernApp()
             // This will create a new calculator window and point the current active session to it
             session.LaunchApp();
             Assert.AreEqual(originalSessionId, session.SessionId);
-            Assert.AreEqual(originalTitle, session.Title);
+            Assert.IsTrue(originalTitle.Contains(session.Title));
             Assert.AreEqual(originalWindowHandlesCount + 1, session.WindowHandles.Count);
             Assert.AreNotEqual(originalLaunchedWindowHandle, session.CurrentWindowHandle);
 

Tests/WebDriverAPI/Back.cs

@@ -66,6 +66,7 @@ public void NavigateBack_ModernApp()
 
             // Ensure alarms & clock are in Alarm Pivot view
             session.Navigate().Back();
+            session.DismissAlarmDialogIfThere();
             session.FindElementByAccessibilityId("AlarmPivotItem").Click();
 
             // Navigate to New Alarm view
@@ -74,6 +75,7 @@ public void NavigateBack_ModernApp()
 
             // Navigate back to the original view
             session.Navigate().Back();
+            session.DismissAlarmDialogIfThere();
             Assert.IsNotNull(session.FindElementByAccessibilityId("AlarmPivotItem"));
         }
 

Tests/WebDriverAPI/ElementEquals.cs

@@ -42,7 +42,7 @@ public static void ClassCleanup()
         [TestMethod]
         public void CompareElements()
         {
-            WindowsElement header = session.FindElementByAccessibilityId("AppNameTitle");
+            WindowsElement header = session.FindCalculatorTitleByAccessibilityId();
             Assert.IsNotNull(header);
             Assert.IsFalse(header.Equals(referenceElement));
             Assert.IsFalse(referenceElement.Equals(header));

Tests/WebDriverAPI/ElementName.cs

@@ -38,7 +38,7 @@ public static void ClassCleanup()
         [TestMethod]
         public void GetElementTagName()
         {
-            WindowsElement header = session.FindElementByAccessibilityId("AppNameTitle");
+            WindowsElement header = session.FindCalculatorTitleByAccessibilityId();
             Assert.AreEqual("ControlType.Text", header.TagName);
 
             WindowsElement navButton = session.FindElementByAccessibilityId("NavButton");

Tests/WebDriverAPI/Mouse.cs

@@ -72,7 +72,7 @@ public void MouseClick()
             // Open a context menu on the application title bar to expose the context menu and verify that it contains minimize.
             // The context menu is parented on the desktop instead of the application. Thus, a desktop session is used to find it.
             // This command implicitly invoke /session/:sessionId/moveto and /session/:sessionId/click with button 2 parameter
-            WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppNameTitle");
+            WindowsElement appNameTitle = session.FindCalculatorTitleByAccessibilityId();
             session.Mouse.ContextClick(appNameTitle.Coordinates);
             Thread.Sleep(TimeSpan.FromSeconds(1.5));
             WindowsDriver<WindowsElement> desktopSession = Utility.CreateNewSession(CommonTestSettings.DesktopAppId);
@@ -100,7 +100,7 @@ public void MouseDoubleClick()
             Assert.IsTrue(maximizeButton.Text.Contains("Maximize"));
 
             // Perform mouse double click on the title bar to maximize the Calculator window
-            WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppNameTitle");
+            WindowsElement appNameTitle = session.FindCalculatorTitleByAccessibilityId();
             session.Mouse.MouseMove(appNameTitle.Coordinates);
             session.Mouse.DoubleClick(null); // Pass null as this command omit the given parameter
             Thread.Sleep(TimeSpan.FromSeconds(1));
@@ -117,7 +117,7 @@ public void MouseDoubleClick()
         public void MouseDownMoveUp()
         {
             const int offset = 100;
-            WindowsElement appNameTitle = session.FindElementByAccessibilityId("AppNameTitle");
+            WindowsElement appNameTitle = session.FindCalculatorTitleByAccessibilityId();
             Assert.IsNotNull(appNameTitle);
 
             // Save application window original position

Tests/WebDriverAPI/Session.cs

@@ -87,7 +87,7 @@ public void CreateSession_ModernApp()
             session = new WindowsDriver<WindowsElement>(new Uri(CommonTestSettings.WindowsApplicationDriverUrl), appCapabilities);
             Assert.IsNotNull(session);
             Assert.IsNotNull(session.SessionId);
-            Assert.AreEqual("Calculator", session.Title);
+            Assert.IsTrue(session.Title.Contains("Calculator"));
         }
 
         [TestMethod]
@@ -229,7 +229,7 @@ public void CreateSessionFromExistingWindowHandle_ModernApp()
 
             // Verify that newly created session is indeed attached to the correct application top level window
             Assert.AreEqual(secondarySession.CurrentWindowHandle, session.CurrentWindowHandle);
-            Assert.AreEqual(secondarySession.FindElementByAccessibilityId("AppNameTitle"), session.FindElementByAccessibilityId("AppNameTitle"));
+            Assert.AreEqual(secondarySession.FindCalculatorTitleByAccessibilityId(), session.FindCalculatorTitleByAccessibilityId());
         }
 
         [TestMethod]

Tests/WebDriverAPI/Title.cs

@@ -56,7 +56,7 @@ public void GetTitle_ModernApp()
         {
             session = Utility.CreateNewSession(CommonTestSettings.CalculatorAppId);
             Assert.IsNotNull(session);
-            Assert.AreEqual("Calculator", session.Title);
+            Assert.IsTrue(session.Title.Contains("Calculator"));
         }
 
         [TestMethod]