diff options
| author | Rui Marinho <me@ruimarinho.net> | 2017-01-27 12:52:38 +0000 |
|---|---|---|
| committer | Kangho Hur <kangho.hur@samsung.com> | 2017-03-24 13:15:53 +0900 |
| commit | 2c24be0fdcd062d351ea710ab564081b6cb7c702 (patch) | |
| tree | d1337d7b489ae5ddca79218ab296d3d2b13881c7 /Xamarin.Forms.Controls.Issues | |
| parent | 6dce55581a32c9a790e6421f83529e639f90eb87 (diff) | |
| download | xamarin-forms-2c24be0fdcd062d351ea710ab564081b6cb7c702.tar.gz xamarin-forms-2c24be0fdcd062d351ea710ab564081b6cb7c702.tar.bz2 xamarin-forms-2c24be0fdcd062d351ea710ab564081b6cb7c702.zip | |
Add MacOS gallery and UITest (#721)
* [MacOS] Cleanup
* [Controls] Add Header support to ListView
* [MacOS] NSView reuse on NSTableView
* [MacOS] Some fix on layour order
* [MacOS] Add CarouselPageRenderer
* [MacOS] Implement EventTracker on PageRenderer
* [MacOS] Cleanup CarouselPageRenderer
* [MacOS] Add MasterDetailPage renderer
* [MacOS] MDP renderer don't allow drag of splitter
* [MacOS] Add TabbedPage renderer
* [MacOS] Initial sketch of NavigationPageRenderer
* [MacOS] Send disappearing of CurrentPage on Dispose on NavigationPageRenderer
* [MacOS] Add Gallery page for Mac
* [MacOS] Add MacOSExpressionSearch
* [MacOS] Fix ColorExtension
* [MacOS] Fix MDP renderer layout
* [MacOS] Implement native selection on ListViewRenderer
* [MacOS] Deselect a item on NSTableView
* [MacOS] Remove previous SplitViewItems
* [MacOS] Fix navigationpage height
* [MacOS] Add toolbar for NavigationPageRenderer
* [MacOS] Don't remove selection for now (crashing)
* [MacOS] Refactor page and back button title on NavigationPageRenderer
* [MacOS] Fix bug when native navigate back
* [MacOS] Hide layer when transition
* [MacOS] ListviewRenderer fix BbackgroundColor
* [MacOS] Fix background on ScrollViewRenderer
* [MacOS] Fix header measure on ListViewRenderer
* [MacOS] Add Mac twitter demo
* [Controls] Spaces for easy reading
* [MacOS] More xaml cleanup
* [Core] Add Mac as aTargetPlatform
* [MacOS] Add alerts and actionsheets
* [MacOS] Add GestureRecognizers
* [MacOS] Fix Layout issues when adding children, enable transformations
* [MacOS] Fix title on tab item, move to tabbed navigation based on segmented control
* [MacOS] Hide toolbar when not needed, this allows to work with tabbed page, cleanup
* [MacOS] Add NativeBindings and NativeViewWrapper
* [MacOS] Fix AssemblyInfo
* [MacOS] FIX NRE on SetBackgroundColor BoxView
* [MacOS] Fix NavigationPageRenderer
* [MacOS] Fix build
* [MacOS] Also update page when it resizes
* [MacOS] Add LayoutRenderer for handle items position when the bounds change.
* [MacOS] Refactor/Cleanup
* [MacOS] Add toolbar items support to NavigationPage
* [MacOS] Resize images for TabViewITems
* [MacOS] Fix TabbedPage resize issues , allow users to override some features when creating TVI
* [MacOS] Fix hide/show Navigation toolbar
* [MacOS] Redo CarouselPageRenderer with NSPageController
* [MacOS] Add support for Modal pages
* [MacOS] Refactor navigation from platform
* [Nuget] Add nuget for MacOS
* [Nuget]Fix nuspec
* [Nuget] Add variables for CI
* [Controls] Remove MainMenu from MacOS
* [MacOS] Add TableView renderer (no headers yet)
* [MacOS] Refactoring, marking extensions as internal
* [MacOS] Add group headers for TableViewRenderer
* [MacOS] Workaround for updates on listview collection
* [MacOS] Handle updates of rows in the ListViewRenderer properly
* [MacOS] Fix navigation animation
* Fix navigation header issues with modal pages
* [MacOS] Fix MDP issues with resizing
* [MacOS] Fix general dispose
* [MacOS] Add a ViewControllerWrapper for NSSplitView
* [MacOS] MDP renderer fix animation
* [MacOS] Fix ListView selection bug
* [MacOS] Fix rendering MDP Layout inside wrappers
* [MacOS] Re write the MainToolbar handler
* [MacOS] Don't use Sierra new extensions so we can run in stable channel
* [MacOS] Another way to hide the toolbar (smarter i think)
* [MacOS] Fix MDP bug and remove debug color
* [Controls] Add HanselForms sample
* [MacOS] Fix NRE WebviewRenderer
* [MacOS] Fix uneven rows on ListView renderer
* [MacOS] Fix NRE on load (can+t find the reason this happens)
* [MacOS] Fix uneven rows
* [MacOS] Fix header sizing on ListViewRenderer
* [Controls] More stuff on HanselForms
* [MacOS] Remove warning from ListViewRenderer
* [MacOS] Fix PageRenderer bug double init
* [MacOS] Don't calculate height if RowHeight is provided
* [Controls] More Hanselforms stuff
* [MacOS] Once again a new implementation for the NavigationBar, this time using a custom view to support BackgroundColor
* [MacOS] Fix build
* [MacOS] Refactoring AwesomeBar related controls
* Fix build
* [MacOS] NavigationBar update background and t test colors
* [MacOS] Fix when we remove navigation so it works when the NavigationRenderer wasn't removed from the parent controller like in a TabbedPage
* [MacOS] Add support for ListView grouping
* [MacOS] Fix image extension method.
* [MacOS] Add base Maps project
* [MacOS] Export MapRenderer
* [MacOS] Add pin click and geocoderbacked for Maps
* [MacOS] Add extra binding project for API not in stable.
* [MacOS] Add MacOS Maps lib
* [MacOS]Fix build on alpha
* [MacOS] Remove MacOS Maps extra binding
* [UITest] Basic macOS setup
* [UITest] Add MacOSApp wrapper implementation
* [MacOS] Set AutomationID
* [UITests] Add ActionSheetUITests to MacOS UITest
* [MacOS] Fix bug on Picker
* [UITests] Link basic uitest basefixture and related files
* [MacOS] Fix pickers reuse
* [UItests] Fix MacOS app path
* [UITest] Ignore UItest for appearing on macOS for now
* [UITest] Update macOS for 2.0.3
* [UITest] Refactor EnterText MacOS app
* [UITest]Fix ViewQuery on MacOS
* [UITest]Fix IsEnabled UItest on macOS
* [UITest] Implement Enter, mark some tests inconclusive fix others
* [MacOS] Implement Entry Completed event
* [UITests] Fix UITest for IsVisible, ignore ToolbarItem test for now
* [UITests] Fix ISVisible again add extra category
* [Controls] Cleanup macOS gallery
* [MacOS] Fix Assembly info
* [Docs] Fix docs
* Fix build
* [Nuget] Fix nuspec
* [Controls] Link files on MacOS
* [Core] Update Forms stack before firing a event saying page was removed, possible breaking change
* [MacOS] Implement RemovePage on NavigationPAgeRenderer
* [UItest] Ignore some , implement back on MacOS UITest app
* [MacOS] Add default back button name (needs to be translated)
* [MacOS] Fix dispose
* [UITest] Make 29257 work on MacOS
* [MacOS] Rename stuff
* [MacOS] More renaming and cleanup
* [MacOS] Share implementations for iOS
* [MacOS] Reuse more IOS extensions
* [MacOS] Reuse FontExtensions
* [MacOS] Share NativeViewWrapper related stuff
* [MAcOS] Share event args and ExportRenderer
* [MacOS] Share platform effect
* [MacOS] Fix build
* [Docs]Fixing docs
* [MacOS] Fix ViewCell reuse
* [Core] Support ListView CachingStrategy on MacOS
* [MacOS] Fix issues with TextCell and ImageCell (we can’t set null to a NSControl value)
* [MacOS] Fix MDP child sizing bug
[UITest] Query marked by id and text
* [MacOS] Comment test related with context actions
* [MacOS] Implement missing stuff on ticker
* [MacOS] Make sure VisualElemenTracker calls the ticker update
* [UITests]Ignore context actions and not possible to test
* [MacOS] Fix Grouping bug on Listview
* [MacOS] Fix selection on Listview when using grouping
* [MacOS] Update navbar when page is popped
* [MacOS] Cleanup NavigationBar
* [Controls] More info on exceptions
* [MacOS] Fix bug animation pop modal
* [MacOS] Bring back BackgroundColor of NavigationBar
* [MacOS] Fix UITest animation delay
* [MacOS] Treat warnings as errors
* [MacOS] Center title on toolbar
* [Core] Add Platform configuration specific for MacOS
* [MacOS] Implement TabbedPage platform specific to handle TabItems on NavigationPage bar
* [MacOS] Fix warning
* [MacOS] Fix bug on SearchBar color
* [MacOS]Fix build
* [MacOS] remove extra dll from maps
* [Docs] Update docs
* [MacOS]Cleanup and refactoring
* Revert "[MacOS] remove extra dll from maps"
This reverts commit 73b948937001fea3f28449a963d0b94943e07aa0.
* [MacOS] Fix wrong refactoring
* [MacOS] dix formatting
* [MacOS] Fix build
* [MacOS] Fix bug on TabbedPageRenderer no title
* [MacOS,UITest] Update packages
* [MacOS ,UITest] Add delay when tapping something, and focus with double click
* [MacOS,UITest] Ignore UITest, not possible to test with current version
* [MacOS,UITest] Ignore test that uses Frame, UITest doesn’t return it
* [MacOS] Fix bug when no title on toolbar items
* [MacOS] Remove FormsNSView
* [MacOS] Cleanup on dispose on MDP renderer
* [MacOS] Different way to test leak of MDP, need to look at this again after
* [MacOS] Update current page when source changes
* [MacOS] More cleanup
* [MacOS,UITest] Implement ClearText
* [MacOS,UITest] ClearText doesn’t work for now on MacOS uitest
* [MacOS] Make sure we show the previous page when popping a Modal
* [MacOS] Fix issue with sizing the Header and visibility, remove for now header renderer reuse
* [MacOS] Clean CustomNSTableView
* [MacOS] Share LabelRenderer with iOS
* [MacOS,UITest] Don’t try to scroll for the element
* [MacOS] Share ResourcesProvider with iOS
* [MAcoS] Share VisualElementPackager with iOS
* [MacOS] Share ViewRenderer with iOS
* [MacOS] Merge with VisualElementTracker from iOS
* [MacOS] Merge with EventTracker from iOS
* [MacOS] Merge with VisualElementRenderer of iOS
* [MacOS] Make sure we always have a layer
* [MacOS] Fix Tracker merge with iOS version
* [MacOS] Fix bug with tabbed page on modal without navigation
* [Core] Rever change on core
* [Controls] Add missing image
* [MacOS] Clear renderers before setting them MDP
* [MacOS] Update tabbedPage ContainerArea
* [Controls] Add Custom renderers tests
* [MacOS] Fix ListViewRenderer
* [MacOS,UITest] Refactoring, implement index
* [MacOS] Make sure we don’t pass null to TextField string value
* [MacOS] Support for multiple clicks in same selected item on NSTableView
* [MacOS, UITest] Fix bug on Back because of refactoring
* [MacOS,UITest] Ignore UITest because we’d-not have ScrollDownTo yet
* [MacOS] Support Focus on EntryRenderer
* [MacOS,UITest] Ignore more a couple of tests that we can’t test on UITest Desktop
* [MacOS,UITest] MacOSApp looks for StaticText fields too
* [MacOS, UITest] Fix EnterText for marked Entry
* [MacOS] Fix index bug on TablevIewDataSource
* [MacOS] Fix SelectedItem TableViewDataSource
* [Nuget] Add Mac to Maps nuspec
* [Nuget]Fix path
* [Controls] Add basic FormsGallery sample
* [macOS] Fixed Tab NSImage crash in TabbedPageRenderer (#705)
* [macOS] Fixed Tab NSImage crash in TabbedPageRenderer
* Coding Style
* Coding Style
* [MacOS] Fix previous merge with master
* [MacOS] Possible simple fix for click on views overlapping
* [UItest] Ignore this part of the test we can’t click on NSViews yet
* [MacOS] Rename to IsOnViewCell
* fix docs
* [MacOS] Cleanup, Address feedback from Samantha’s review
* [MacOS] Add ContextActions
* [Controls] Remove FormsGalery for now
* [Docs] Update docs
* [MacOS] Implement ContextActions
* [MacOS,UITests] Enable and support UITests of ContextActions
Diffstat (limited to 'Xamarin.Forms.Controls.Issues')
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(); } } |