diff options
Diffstat (limited to 'Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared')
17 files changed, 181 insertions, 70 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs index dc07c04b..08b6f8a6 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs @@ -115,11 +115,17 @@ namespace Xamarin.Forms.Controls.Issues RunningApp.Screenshot ("At page one"); RunningApp.WaitForElement (q => q.Marked ("PageOneButtonId")); RunningApp.Tap (q => q.Marked ("PageOneButtonId")); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.WaitForElement (q => q.Marked ("PageTwoId")); RunningApp.Screenshot ("At page two - I didn't crash"); RunningApp.WaitForElement (q => q.Marked ("PageTwoButtonId")); RunningApp.Tap (q => q.Marked ("PageTwoButtonId")); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.WaitForElement (q => q.Marked ("PageThreeId")); RunningApp.Screenshot ("At page three - I didn't crash"); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs index 56ccec81..b2f13b0a 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs @@ -136,7 +136,7 @@ namespace Xamarin.Forms.Controls.Issues #if UITEST [Test] - public void TestCellsShowAfterRefresh () + public void TestCellsShowAfterRefresh() { RunningApp.Tap (q => q.Marked ("Refresh")); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs index 5ba0de11..77081ccc 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs @@ -87,6 +87,9 @@ namespace Xamarin.Forms.Controls.Issues #if UITEST [Test] +#if __MACOS__ + [Ignore("Webview query is not implemented yet on UITEst desktop")] +#endif public void Bugzilla26993Test () { RunningApp.Screenshot ("I am at BZ26993"); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs index 35503f9c..a05be9fb 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs @@ -81,18 +81,42 @@ namespace Xamarin.Forms.Controls.Issues public void Bugzilla29257Test () { RunningApp.Tap (q => q.Marked ("Page 1")); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.WaitForElement (q => q.Marked ("This is page 1")); RunningApp.Back (); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.Tap (q => q.Marked ("Page 2")); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.WaitForElement (q => q.Marked ("This is page 2")); RunningApp.Back (); RunningApp.Tap (q => q.Marked ("Page 3")); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.WaitForElement (q => q.Marked ("This is page 3")); RunningApp.Back (); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.Tap (q => q.Marked ("Page 4")); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.WaitForElement (q => q.Marked ("This is page 4")); RunningApp.Back (); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.Tap (q => q.Marked ("Page 5")); +#if __MACOS__ + System.Threading.Thread.Sleep(2000); +#endif RunningApp.WaitForElement (q => q.Marked ("This is page 5")); } #endif diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs index cde2fad5..3738c7e8 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs @@ -10,62 +10,69 @@ using NUnit.Framework; namespace Xamarin.Forms.Controls.Issues { - [Preserve (AllMembers = true)] - [Issue (IssueTracker.Bugzilla, 30353, "MasterDetailPage.IsPresentedChanged is not raised")] + [Preserve(AllMembers = true)] + [Issue(IssueTracker.Bugzilla, 30353, "MasterDetailPage.IsPresentedChanged is not raised")] public class Bugzilla30353 : TestMasterDetailPage { - protected override void Init () + protected override void Init() { - var lbl = new Label { + var lbl = new Label + { HorizontalOptions = LayoutOptions.CenterAndExpand, VerticalOptions = LayoutOptions.CenterAndExpand, Text = "Detail" }; - #if !UITEST - if (App.IOSVersion == 7) { +#if !UITEST + if (App.IOSVersion == 7 || Device.RuntimePlatform == Device.macOS) + { lbl.Text = "Don't run"; } - #endif +#endif - var lblMaster = new Label { + var lblMaster = new Label + { HorizontalOptions = LayoutOptions.CenterAndExpand, VerticalOptions = LayoutOptions.CenterAndExpand, Text = "Master" }; - var btn = new Button () { + var btn = new Button() + { Text = "Toggle" }; - var btn1 = new Button () { + var btn1 = new Button() + { Text = "Toggle" }; btn.Clicked += (object sender, EventArgs e) => IsPresented = !IsPresented; btn1.Clicked += (object sender, EventArgs e) => IsPresented = !IsPresented; - var stacklayout = new StackLayout (); - stacklayout.Children.Add (lbl); - stacklayout.Children.Add (btn); + var stacklayout = new StackLayout(); + stacklayout.Children.Add(lbl); + stacklayout.Children.Add(btn); - var stacklayout1 = new StackLayout (); - stacklayout1.Children.Add (lblMaster); - stacklayout1.Children.Add (btn1); + var stacklayout1 = new StackLayout(); + stacklayout1.Children.Add(lblMaster); + stacklayout1.Children.Add(btn1); - Master = new ContentPage { + Master = new ContentPage + { Title = "IsPresentedChanged Test", BackgroundColor = Color.Green, Content = stacklayout1 }; - Detail = new ContentPage { + Detail = new ContentPage + { BackgroundColor = Color.Gray, Content = stacklayout }; MasterBehavior = MasterBehavior.Popover; IsPresentedChanged += (s, e) => - lblMaster.Text = lbl.Text = string.Format ("The Master is now {0}", IsPresented ? "visible" : "invisible"); + lblMaster.Text = lbl.Text = string.Format("The Master is now {0}", IsPresented ? "visible" : "invisible"); } - #if UITEST +#if UITEST [Test] public void Bugzilla30353Test () { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs index 75e30b13..5ab11a06 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs @@ -127,7 +127,7 @@ namespace Xamarin.Forms.Controls.Issues } } - #if UITEST +#if UITEST [Test] public void Bugzilla31330Test () { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs index 52c9f578..830982ea 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs @@ -210,6 +210,9 @@ namespace Xamarin.Forms.Controls.Issues #if UITEST [Test] +#if __MACOS__ + [Ignore("EnterText on UITest.Desktop not implemented")] +#endif [UiTest (typeof(NavigationPage))] public void Issue31333FocusEntryInListViewCell () { @@ -222,6 +225,9 @@ namespace Xamarin.Forms.Controls.Issues } [Test] +#if __MACOS__ + [Ignore("EnterText on UITest.Desktop not implemented")] +#endif [UiTest (typeof(NavigationPage))] public void Issue31333FocusEditorInListViewCell () { @@ -235,6 +241,9 @@ namespace Xamarin.Forms.Controls.Issues [Test] +#if __MACOS__ + [Ignore("EnterText on UITest.Desktop not implemented")] +#endif [UiTest (typeof(NavigationPage))] public void Issue31333FocusEntryInTableViewCell () { @@ -247,6 +256,9 @@ namespace Xamarin.Forms.Controls.Issues } [Test] +#if __MACOS__ + [Ignore("EnterText on UITest.Desktop not implemented")] +#endif [UiTest (typeof(NavigationPage))] public void Issue31333FocusEditorInTableViewCell () { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs index 6bcd16b7..bb8743d4 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs @@ -67,6 +67,9 @@ namespace Xamarin.Forms.Controls.Issues #if UITEST [Test] +#if __MACOS__ + [Ignore("Missing UITest for focus")] +#endif public void EntryTextDoesNotDisplayNonnumericInput () { RunningApp.WaitForElement ("Start Entry"); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs index 735b7197..6b7d380a 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs @@ -57,6 +57,9 @@ namespace Xamarin.Forms.Controls.Issues #if UITEST [Test] +#if __MACOS__ + [Ignore("UITest.Desktop doesn't return empty NSView yet so it can't find the frame")] +#endif public void Bugzilla39530PanTest() { // Got to wait for the element to be visible to the UI test framework, otherwise we get occasional @@ -69,6 +72,9 @@ namespace Xamarin.Forms.Controls.Issues } [Test] +#if __MACOS__ + [Ignore("UITest.Desktop doesn't return empty NSView yet so it can't find the frame")] +#endif public void Bugzilla39530PinchTest() { RunningApp.PinchToZoomIn ("frame"); @@ -76,6 +82,9 @@ namespace Xamarin.Forms.Controls.Issues } [Test] +#if __MACOS__ + [Ignore("UITest.Desktop doesn't return empty NSView yet so it can't find the frame")] +#endif public void Bugzilla39530TapTest() { RunningApp.WaitForElement (q => q.Marked ("frame")); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs index 054a68c8..61d2b1b6 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs @@ -32,9 +32,10 @@ namespace Xamarin.Forms.Controls.Issues RunningApp.Tap(q => q.All().Marked(CanTouchButtonId)); RunningApp.WaitForElement(q => q.All().Text(CanTouchSuccessText)); - +#if !__MACOS__ RunningApp.Tap(q => q.All().Marked(ListTapTarget)); RunningApp.WaitForElement(q => q.All().Text(ListTapSuccessText)); +#endif } #endif diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs index 1298110f..7efea71b 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs @@ -224,6 +224,9 @@ namespace Xamarin.Forms.Controls.Issues RunningApp.WaitForElement("Menu - 0"); } [Test] +#if __MACOS__ + [Ignore("ScrollDownTo not implemented in UITest.Desktop")] +#endif public void Bugzilla40704Test() { RunningApp.ScrollDownTo("btnCollappse", "lstMain", ScrollStrategy.Gesture, 0.8, timeout: TimeSpan.FromMinutes(2)); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs index e38da023..85c168c2 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs @@ -49,7 +49,13 @@ namespace Xamarin.Forms.Controls.Issues Debug.WriteLine($">>>>>>>> Post-GC, {_44166NavContent.Counter} {nameof(_44166NavContent)} allocated"); } - if (_44166NavContent.Counter + _44166Detail.Counter + _44166Master.Counter + _44166MDP.Counter == 0) + int success = 0; + + //some reason there's always 1 instance around i don't know why yet, if we were leaking it should be 8 here + if (Device.RuntimePlatform == Device.macOS) + success = 4; + + if (_44166NavContent.Counter + _44166Detail.Counter + _44166Master.Counter + _44166MDP.Counter == success) { label.Text = "Success"; } @@ -184,7 +190,7 @@ namespace Xamarin.Forms.Controls.Issues { public static int Counter; - public _44166NavContent () + public _44166NavContent() { Interlocked.Increment(ref Counter); Debug.WriteLine($"++++++++ {nameof(_44166NavContent)} constructor, {Counter} allocated"); @@ -198,7 +204,7 @@ namespace Xamarin.Forms.Controls.Issues }; } - ~_44166NavContent () + ~_44166NavContent() { Interlocked.Decrement(ref Counter); Debug.WriteLine($"-------- {nameof(_44166NavContent)} destructor, {Counter} allocated"); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs index b0e30112..540ab59f 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs @@ -64,10 +64,10 @@ namespace Xamarin.Forms.Controls.Issues RunningApp.Screenshot ("Clicked Leave"); RunningApp.WaitForElement (q => q.Marked ("Bug Repro's")); - +#if !__MACOS__ RunningApp.ClearText(q => q.Raw("* marked:'SearchBarGo'")); RunningApp.EnterText(q => q.Raw("* marked:'SearchBarGo'"), "G198"); - +#endif RunningApp.Tap (q => q.Marked ("SearchButton")); RunningApp.Screenshot ("Navigate into gallery again"); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs index cb3831a0..61f63720 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs @@ -37,9 +37,11 @@ namespace Xamarin.Forms.Controls.Issues RunningApp.Screenshot ("All elements exist"); +#if !__MACOS__ var scrollRect = RunningApp.Query (q => q.Raw ("* index:0"))[0].Rect; Xamarin.Forms.Core.UITests.Gestures.ScrollForElement (RunningApp, "* marked:'9'", new Xamarin.Forms.Core.UITests.Drag (scrollRect, Xamarin.Forms.Core.UITests.Drag.Direction.BottomToTop, Xamarin.Forms.Core.UITests.Drag.DragLength.Long)); RunningApp.Screenshot ("I see 9"); +#endif RunningApp.Tap (q => q.Marked ("9")); RunningApp.WaitForNoElement (q => q.Marked ("9")); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs index d084de9c..b0efc276 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs @@ -31,6 +31,9 @@ namespace Xamarin.Forms.Controls.Issues #if UITEST [Test] +#if __MACOS__ + [Ignore("EnterText problems in UITest Desktop")] +#endif public void TestFocusIsOnTheEndAfterSettingText () { RunningApp.Tap (c => c.Marked ("userNameEditorEmptyString")); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs index f3237973..8b76e796 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs @@ -31,6 +31,9 @@ namespace Xamarin.Forms.Controls.Issues #if __ANDROID__ [Ignore("Appearing event is tied to virtualization in TabbedPage for Material")] #endif +#if __MACOS__ + [Ignore("ScrollTo not implemented on MacOS")] +#endif [Issue(IssueTracker.Github, 2411, "ScrollToPosition.MakeVisible not called every time TabbedPage", PlatformAffected.Android)] public void Issue2411ScrollToPositionMakeVisible() { @@ -57,6 +60,9 @@ namespace Xamarin.Forms.Controls.Issues [Test] [Issue(IssueTracker.Github, 2411, "ScrollToPosition.End crashing in TabbedPage", PlatformAffected.Android)] +#if __MACOS__ + [Ignore("ScrollTo not implemented on MacOS")] +#endif public void Issue2411ScrollToPositionEndCrash() { RunningApp.Tap(q => q.Marked("Crash in ScrollToPosition.End")); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs index 6400a2ac..1fda224f 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Reflection; - using Xamarin.Forms.CustomAttributes; #if UITEST @@ -14,18 +11,24 @@ using Xamarin.UITest; namespace Xamarin.Forms.Controls { internal static class AppPaths - { - public static string ApkPath = "../../../Xamarin.Forms.ControlGallery.Android/bin/Debug/AndroidControlGallery.AndroidControlGallery-Signed.apk"; + { + public static string ApkPath = "../../../Xamarin.Forms.ControlGallery.Android/bin/Debug/AndroidControlGallery.AndroidControlGallery-Signed.apk"; + + public static string MacOSPath = "../../../Xamarin.Forms.ControlGallery.MacOS/bin/Debug/Xamarin.Forms.ControlGallery.MacOS.app"; + + // Have to continue using the old BundleId for now; Test Cloud doesn't like + // when you change the BundleId + public static string BundleId = "com.xamarin.quickui.controlgallery"; // Have to continue using the old BundleId for now; Test Cloud doesn't like // when you change the BundleId - public static string BundleId = "com.xamarin.quickui.controlgallery"; - } + public static string MacOSBundleId = "com.xamarin.xamarin-forms-controlgallery-macos"; + } #if UITEST internal static class AppSetup { - static IApp InitializeApp () + static IApp InitializeApp() { IApp app = null; #if __ANDROID__ @@ -35,9 +38,13 @@ namespace Xamarin.Forms.Controls #elif __IOS__ app = InitializeiOSApp(); + +#elif __MACOS__ + Xamarin.UITest.Desktop.TestAgent.Start(); + app = InitializeMacOSApp(); #endif if (app == null) - throw new NullReferenceException ("App was not initialized."); + throw new NullReferenceException("App was not initialized."); // Wrap the app in ScreenshotConditional so it only takes screenshots if the SCREENSHOTS symbol is specified return new ScreenshotConditionalApp(app); @@ -69,22 +76,38 @@ namespace Xamarin.Forms.Controls } #endif - public static void NavigateToIssue (Type type, IApp app) +#if __MACOS__ + static IApp InitializeMacOSApp() { - var typeIssueAttribute = type.GetTypeInfo ().GetCustomAttribute <IssueAttribute> (); + // Running on a device + var configurator = new Xamarin.UITest.Desktop.CocoaAppConfigurator(); + var app = configurator + //.AppBundle("/Users/rmarinho/Xamarin/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/bin/Debug/Xamarin.Forms.ControlGallery.MacOS.app") + .AppBundle(AppPaths.MacOSPath) + .BundleId(AppPaths.MacOSBundleId) + .StartApp(); + return new Xamarin.Forms.Core.macOS.UITests.MacOSApp(app); + } +#endif + + public static void NavigateToIssue(Type type, IApp app) + { + var typeIssueAttribute = type.GetTypeInfo().GetCustomAttribute<IssueAttribute>(); string cellName = ""; - if (typeIssueAttribute.IssueTracker.ToString () != "None" && + if (typeIssueAttribute.IssueTracker.ToString() != "None" && typeIssueAttribute.IssueNumber != 1461 && - typeIssueAttribute.IssueNumber != 342) { - cellName = typeIssueAttribute.IssueTracker.ToString ().Substring(0, 1) + typeIssueAttribute.IssueNumber.ToString (); - } else { + typeIssueAttribute.IssueNumber != 342) + { + cellName = typeIssueAttribute.IssueTracker.ToString().Substring(0, 1) + typeIssueAttribute.IssueNumber.ToString(); + } + else { cellName = typeIssueAttribute.Description; } int maxAttempts = 2; int attempts = 0; - + while (attempts < maxAttempts) { attempts += 1; @@ -151,17 +174,20 @@ namespace Xamarin.Forms.Controls } } - public static IApp Setup (Type pageType = null) + public static IApp Setup(Type pageType = null) { IApp runningApp = null; - try { - runningApp = InitializeApp (); - } catch (Exception e) { - Assert.Inconclusive ($"App did not start for some reason: {e}"); + try + { + runningApp = InitializeApp(); } - + catch (Exception e) + { + Assert.Inconclusive($"App did not start for some reason: {e}"); + } + if (pageType != null) - NavigateToIssue (pageType, runningApp); + NavigateToIssue(pageType, runningApp); return runningApp; } @@ -233,10 +259,10 @@ namespace Xamarin.Forms.Controls protected virtual bool Isolate => false; #endif - protected TestPage () + protected TestPage() { #if APP - Init (); + Init(); #endif } @@ -267,7 +293,7 @@ namespace Xamarin.Forms.Controls } #endif - protected abstract void Init (); + protected abstract void Init(); } @@ -279,16 +305,16 @@ namespace Xamarin.Forms.Controls protected virtual bool Isolate => false; #endif - protected TestContentPage () + protected TestContentPage() { #if APP - Init (); + Init(); #endif } #if UITEST [SetUp] - public void Setup () + public void Setup() { if (Isolate) { @@ -313,7 +339,7 @@ namespace Xamarin.Forms.Controls } #endif - protected abstract void Init (); + protected abstract void Init(); } public abstract class TestCarouselPage : CarouselPage @@ -324,10 +350,10 @@ namespace Xamarin.Forms.Controls protected virtual bool Isolate => false; #endif - protected TestCarouselPage () + protected TestCarouselPage() { #if APP - Init (); + Init(); #endif } @@ -358,7 +384,7 @@ namespace Xamarin.Forms.Controls } #endif - protected abstract void Init (); + protected abstract void Init(); } public abstract class TestMasterDetailPage : MasterDetailPage @@ -369,10 +395,10 @@ namespace Xamarin.Forms.Controls protected virtual bool Isolate => false; #endif - protected TestMasterDetailPage () + protected TestMasterDetailPage() { #if APP - Init (); + Init(); #endif } @@ -403,7 +429,7 @@ namespace Xamarin.Forms.Controls } #endif - protected abstract void Init (); + protected abstract void Init(); } public abstract class TestNavigationPage : NavigationPage @@ -414,10 +440,10 @@ namespace Xamarin.Forms.Controls protected virtual bool Isolate => false; #endif - protected TestNavigationPage () + protected TestNavigationPage() { #if APP - Init (); + Init(); #endif } @@ -448,7 +474,7 @@ namespace Xamarin.Forms.Controls } #endif - protected abstract void Init (); + protected abstract void Init(); } public abstract class TestTabbedPage : TabbedPage @@ -459,10 +485,10 @@ namespace Xamarin.Forms.Controls protected virtual bool Isolate => false; #endif - protected TestTabbedPage () + protected TestTabbedPage() { #if APP - Init (); + Init(); #endif } @@ -493,7 +519,7 @@ namespace Xamarin.Forms.Controls } #endif - protected abstract void Init (); + protected abstract void Init(); } } |