summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Controls.Issues
diff options
context:
space:
mode:
authorE.Z. Hart <hartez@users.noreply.github.com>2017-09-15 14:37:09 (GMT)
committerRui Marinho <me@ruimarinho.net>2017-09-15 14:38:49 (GMT)
commit813b953360c5dde98b0de0fc03fce849cd6c7edc (patch)
tree8bc2afb570245d6037cf6cb64fc7d6833cf4868d /Xamarin.Forms.Controls.Issues
parenta0252e5833b78c20ece85f530a8e0b383858789f (diff)
downloadxamarin-forms-813b953360c5dde98b0de0fc03fce849cd6c7edc.zip
xamarin-forms-813b953360c5dde98b0de0fc03fce849cd6c7edc.tar.gz
xamarin-forms-813b953360c5dde98b0de0fc03fce849cd6c7edc.tar.bz2
Fix failing UI tests for Android FormsApplicationActivity (#1141)
* Fix broken test for 57910 when using FormsApplicationActivity * Fix NRE when removing a page during OnAppearing using FormsApplicationActivity * Update 45926 test to work correctly with FormsApplicationActivity * Update 32830 test so it doesn't crash on FormsApplicationActivity * Longer wait before refreshing appearing messages (to work with FormsApplicationActivity) * Fix input transparency issue with old FrameRenderer * Remove extraneous using directive * Just ignore test 32830 on FormsApplicationActivity * [Controls] Add missing directive
Diffstat (limited to 'Xamarin.Forms.Controls.Issues')
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs12
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs8
2 files changed, 20 insertions, 0 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs
index 0e97a33..96aa5e8 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs
@@ -133,6 +133,8 @@ namespace Xamarin.Forms.Controls.Issues
[Test]
public void Bugzilla32830Test()
{
+ IgnoreFormsApplicationActivity();
+
RunningApp.WaitForElement(q => q.Marked(BottomLabel));
RunningApp.WaitForElement(q => q.Marked(Button1));
RunningApp.Tap(q => q.Marked(Button1));
@@ -140,6 +142,16 @@ namespace Xamarin.Forms.Controls.Issues
RunningApp.Tap(q => q.Marked(Button2));
RunningApp.WaitForElement(q => q.Marked(BottomLabel));
}
+
+ static void IgnoreFormsApplicationActivity()
+ {
+#if __ANDROID__
+ if (AppSetup.IsFormsApplicationActivity)
+ {
+ Assert.Ignore("This test only applies to FormsAppCompatActivity.");
+ }
+#endif
+ }
#endif
}
} \ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs
index 152d94a..4427f39 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading;
+using System.Threading.Tasks;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
@@ -66,9 +67,12 @@ namespace Xamarin.Forms.Controls.Issues
RunningApp.WaitForElement (q => q.Marked ("New Page"));
RunningApp.Tap (q => q.Marked ("New Page"));
+ RunningApp.WaitForElement (q => q.Marked ("Second Page #1"));
RunningApp.Back();
+ RunningApp.WaitForElement (q => q.Marked ("Intermediate Page"));
RunningApp.Back();
RunningApp.Tap(q => q.Marked("Do GC"));
+ RunningApp.Tap(q => q.Marked("Do GC"));
RunningApp.Tap(q => q.Marked("Send Message"));
RunningApp.Tap(q => q.Marked("Do GC"));
@@ -81,6 +85,10 @@ namespace Xamarin.Forms.Controls.Issues
[Preserve(AllMembers = true)]
public class _45926IntermediatePage : ContentPage
{
+ public _45926IntermediatePage()
+ {
+ Content = new Label { Text = "Intermediate Page" };
+ }
}
[Preserve(AllMembers = true)]