diff options
Diffstat (limited to 'Xamarin.Forms.Controls.Issues')
-rw-r--r-- | Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs | 12 | ||||
-rw-r--r-- | Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs | 8 |
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 0e97a33d..96aa5e8a 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 152d94ad..4427f390 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)] |