Refactor add alarm page dismissal and create a helper function

Strategically add delay to prevent false negatives

Author: timotiusmargo

Tests/WebDriverAPI/AppSessionBase/AlarmClockBase.cs

@@ -70,20 +70,8 @@ public virtual void TestInit()
             }
             catch
             {
-                session.Navigate().Back();
-                Thread.Sleep(TimeSpan.FromSeconds(1));
-                session.DismissAlarmDialogIfThere();
-
-                try
-                {
-                    alarmTabElement = session.FindElementByAccessibilityId("AlarmPivotItem");
-                }
-                catch
-                {
-                    session.FindElementByAccessibilityId("Back").Click(); // Press back button if navigating back somehow failed
-                    session.DismissAlarmDialogIfThere();
-                    alarmTabElement = session.FindElementByAccessibilityId("AlarmPivotItem");
-                }
+                DismissAddAlarmPage();
+                alarmTabElement = session.FindElementByAccessibilityId("AlarmPivotItem");
             }
 
             Assert.IsNotNull(alarmTabElement);
@@ -146,10 +134,23 @@ protected static WindowsElement GetStaleElement()
             session.FindElementByAccessibilityId("AddAlarmButton").Click();
             Thread.Sleep(TimeSpan.FromSeconds(0.5));
             WindowsElement staleElement = session.FindElementByAccessibilityId("AlarmSaveButton");
-            session.Navigate().Back(); // Dismiss add alarm page
-            session.DismissAlarmDialogIfThere();
+            DismissAddAlarmPage();
             Thread.Sleep(TimeSpan.FromSeconds(2));
             return staleElement;
         }
+
+        protected static void DismissAddAlarmPage()
+        {
+            try
+            {
+                session.FindElementByAccessibilityId("CancelButton").Click(); // Press cancel button to dismiss any non-main page
+            }
+            catch
+            {
+                session.FindElementByAccessibilityId("Back").Click(); // Press back button if cancel button above somehow failed
+                Thread.Sleep(TimeSpan.FromSeconds(1));
+                session.DismissAlarmDialogIfThere();
+            }
+        }
     }
 }

Tests/WebDriverAPI/AppSessionBase/EdgeBase.cs

@@ -116,14 +116,14 @@ protected static RemoteWebElement GetStaleElement()
 
             // Navigate to Edge about:flags page
             session.FindElementByAccessibilityId("addressEditBox").SendKeys(Keys.Alt + 'd' + Keys.Alt + CommonTestSettings.EdgeAboutFlagsURL + Keys.Enter);
-            Thread.Sleep(TimeSpan.FromSeconds(2));
+            Thread.Sleep(TimeSpan.FromSeconds(3));
             Assert.AreNotEqual(originalTitle, session.Title);
 
             // Save a reference to Reset all flags button on the page and navigate back to home
             staleElement = session.FindElementByAccessibilityId("ResetAllFlags");
             Assert.IsNotNull(staleElement);
             session.Navigate().Back();
-            Thread.Sleep(TimeSpan.FromSeconds(1));
+            Thread.Sleep(TimeSpan.FromSeconds(3));
             Assert.AreEqual(originalTitle, session.Title);
 
             return staleElement;

Tests/WebDriverAPI/ElementClick.cs

@@ -52,8 +52,7 @@ public void ClickElement()
             Assert.AreEqual("30", minuteSelector.Text);
 
             // Return to main page and click on pivot items to switch between tabs
-            session.FindElementByAccessibilityId("CancelButton").Click();
-
+            DismissAddAlarmPage();
             WindowsElement worldPivot = session.FindElementByAccessibilityId("WorldClockPivotItem");
             WindowsElement alarmPivot = session.FindElementByAccessibilityId("AlarmPivotItem");
 

Tests/WebDriverAPI/ElementSendKeys.cs

@@ -175,7 +175,7 @@ public void SendKeysToElementError_StaleElement()
         {
             try
             {
-                session.FindElementByAccessibilityId("CancelButton").Click();
+                DismissAddAlarmPage();
                 Thread.Sleep(TimeSpan.FromSeconds(1));
                 alarmNameTextBox.SendKeys("keys");
                 Assert.Fail("Exception should have been thrown");

Tests/WebDriverAPI/Forward.cs

@@ -79,10 +79,12 @@ public void NavigateForward_SystemApp()
 
             // Navigate back to the original folder
             session.Navigate().Back();
+            Thread.Sleep(TimeSpan.FromSeconds(1));
             Assert.AreEqual(originalTitle, session.Title);
 
             // Navigate forward to the target folder
             session.Navigate().Forward();
+            Thread.Sleep(TimeSpan.FromSeconds(1));
             Assert.AreEqual(newTitle, session.Title);
         }
 

Tests/WebDriverAPI/TouchScroll.cs

@@ -107,8 +107,8 @@ public void TouchScrollOnElement_Vertical()
             Thread.Sleep(TimeSpan.FromSeconds(1));
             Assert.IsTrue(minute00.Displayed);
 
-            // Navigate back to the original view
-            session.Navigate().Back();
+            // Dismiss add alarm page
+            DismissAddAlarmPage();
         }
 
         [TestMethod]

Tests/WebDriverAPI/Window.cs

@@ -130,6 +130,9 @@ public void GetWindowHandles_ModernApp()
             List<string> previouslyOpenedEdgeWindows = new List<string>(windowHandlesBefore);
             previouslyOpenedEdgeWindows.Remove(session.CurrentWindowHandle);
 
+            // Set focus on itself
+            session.SwitchTo().Window(session.CurrentWindowHandle);
+
             // Open a new window
             session.Keyboard.SendKeys(Keys.Control + "n" + Keys.Control);
             Thread.Sleep(TimeSpan.FromSeconds(3));
@@ -161,6 +164,9 @@ public void SwitchWindows()
             List<string> previouslyOpenedEdgeWindows = new List<string>(session.WindowHandles);
             previouslyOpenedEdgeWindows.Remove(session.CurrentWindowHandle);
 
+            // Set focus on itself
+            session.SwitchTo().Window(session.CurrentWindowHandle);
+
             // Open a new window
             session.Keyboard.SendKeys(Keys.Control + "n" + Keys.Control);
             Thread.Sleep(TimeSpan.FromSeconds(3));