[Tests] Fix UITests that are failing on API 19 android (#1129)

* [Tests] use back for picker tests on Android * [Tests] See if waiting fixes issues with failing uitest
xamarin · Sep 8, 2017 · 15fbdc8 · 15fbdc8
1 parent c1bab7c
commit 15fbdc8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs
@@ -44,15 +44,12 @@ protected override void Init()
 		public void DatePickerCancelShouldUnfocus()
 		{
 			RunningApp.Tap(q => q.Marked(DatePicker));
-			RunningApp.WaitForElement(q => q.Marked("Cancel"));
-
-			RunningApp.Tap(q => q.Marked("Cancel"));
+
+			RunningApp.Back();
 			RunningApp.WaitForElement(q => q.Marked("Click to focus DatePicker"));
 
 			RunningApp.Tap(q => q.Marked("Click to focus DatePicker"));
-			RunningApp.WaitForElement(q => q.Marked("Cancel"));
-
-			RunningApp.Tap(q => q.Marked("Cancel"));
+			RunningApp.Back();
 		}
 #endif
 

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs
@@ -44,15 +44,12 @@ protected override void Init()
         public void TimePickerCancelShouldUnfocus()
         {
             RunningApp.Tap(q => q.Marked(TimePicker));
-            RunningApp.WaitForElement(q => q.Marked("Cancel"));
 
-            RunningApp.Tap(q => q.Marked("Cancel"));
+			RunningApp.Back();
             RunningApp.WaitForElement(q => q.Marked("Click to focus TimePicker"));
 
             RunningApp.Tap(q => q.Marked("Click to focus TimePicker"));
-            RunningApp.WaitForElement(q => q.Marked("Cancel"));
-
-            RunningApp.Tap(q => q.Marked("Cancel"));
+			RunningApp.Back();
         }
 #endif
 

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs
@@ -67,13 +67,15 @@ public void VerifyTapBubbling(string menuItem, bool frameShouldRegisterTap)
 				// These controls show a pop-up which we have to cancel/done out of before we can continue
 #if __ANDROID__
 				var cancelButtonText = "Cancel";
+				RunningApp.Back();
 #elif __IOS__
 				var cancelButtonText = "Done";
+				RunningApp.WaitForElement(q => q.Marked(cancelButtonText));
+				RunningApp.Tap(q => q.Marked(cancelButtonText));
 #else
 				var cancelButtonText = "X";
 #endif
-				RunningApp.WaitForElement(q => q.Marked(cancelButtonText));
-				RunningApp.Tap(q => q.Marked(cancelButtonText));
+
 			}
 
 			if (frameShouldRegisterTap)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs
@@ -65,13 +65,15 @@ public void VerifyInputTransparent(string menuItem)
 				// These controls show a pop-up which we have to cancel/done out of before we can continue
 #if __ANDROID__
 				var cancelButtonText = "Cancel";
+				System.Threading.Tasks.Task.Delay(1000).Wait();
+				RunningApp.Back();
 #elif __IOS__
 				var cancelButtonText = "Done";
+				RunningApp.WaitForElement(q => q.Marked(cancelButtonText));
+				RunningApp.Tap(q => q.Marked(cancelButtonText));
 #else
 				var cancelButtonText = "Cancel";
 #endif
-				RunningApp.WaitForElement(q => q.Marked(cancelButtonText));
-				RunningApp.Tap(q => q.Marked(cancelButtonText));
 			}
 
 			// Since InputTransparent is set to false, the start label should not have changed