summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Controls.Issues
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2017-09-08 10:26:52 (GMT)
committerKangho Hur <kangho.hur@samsung.com>2017-10-23 04:30:39 (GMT)
commit9edcb20b3e3b638d9cb83d482bbfb6d744538f02 (patch)
tree6b81c6a2a2e753c49320a9b5d3fb8a6f6b7a4717 /Xamarin.Forms.Controls.Issues
parent443a9720ee641a972816da50adeb5fddb57670cf (diff)
downloadxamarin-forms-9edcb20b3e3b638d9cb83d482bbfb6d744538f02.zip
xamarin-forms-9edcb20b3e3b638d9cb83d482bbfb6d744538f02.tar.gz
xamarin-forms-9edcb20b3e3b638d9cb83d482bbfb6d744538f02.tar.bz2
[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
Diffstat (limited to 'Xamarin.Forms.Controls.Issues')
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs9
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs6
4 files changed, 13 insertions, 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
index f8f48ae..a88bc50 100644
--- 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 @@ namespace Xamarin.Forms.Controls.Issues
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
index 04bcdf8..5f1a0ef 100644
--- 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 @@ namespace Xamarin.Forms.Controls.Issues
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
index 3873621..c23d3db 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs
@@ -72,13 +72,15 @@ namespace Xamarin.Forms.Controls.Issues
// 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
index 1d23f14..080acfb 100644
--- 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 @@ namespace Xamarin.Forms.Controls.Issues
// 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