summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs5
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs6
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs5
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs8
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs10
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs7
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs8
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs10
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs3
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs4
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs3
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs4
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs6
-rw-r--r--Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs2
-rw-r--r--Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj3
-rw-r--r--Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj3
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ActivityIndicatorUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/AppearingUITests.cs3
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/AutomationIDUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/BoxViewUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ButtonUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ContextActionsUITests.cs4
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/DatePickerUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/DisplayAlertUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/EditorUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/EntryUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/FrameUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ImageUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/LabelUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/Legacy-CellsUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/PickerUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ProgressBarUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/RootGalleryUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ScrollViewUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/SearchBarUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/SliderUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/StepperUITests.cs3
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/SwitchUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/TimePickerUITests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ToolbarItemTests.cs2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ViewUITests.cs4
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/WebViewUITests.cs22
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/UITestCategories.cs35
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj1
-rw-r--r--Xamarin.Forms.sln.DotSettings1
61 files changed, 232 insertions, 69 deletions
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index b8e3c8d..3d672cd 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -237,13 +237,13 @@
<BundleResource Include="test.jpg" />
</ItemGroup>
<ItemGroup>
+ <Reference Include="AdvancedColorPicker">
+ <HintPath>..\Components\advancedcolorpicker-2.0\lib\ios-unified\AdvancedColorPicker.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
- <Reference Include="AdvancedColorPicker">
- <HintPath>..\Components\advancedcolorpicker-2.0\lib\ios-unified\AdvancedColorPicker.dll</HintPath>
- </Reference>
<Reference Include="PLCrashReporterUnifiedBinding">
<HintPath>..\packages\Xamarin.Insights.1.12.3\lib\Xamarin.iOS10\PLCrashReporterUnifiedBinding.dll</HintPath>
</Reference>
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs
index 0ec8540..d878731 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs
@@ -1,12 +1,18 @@
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
+
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls.Issues
{
+#if UITEST
+ [Category(UITestCategories.Cells)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 25662, "Setting IsEnabled does not disable SwitchCell")]
public class Bugzilla25662 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs
index bf553c9..abfbf26 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs
@@ -1,16 +1,21 @@
using System;
using System.Collections.Generic;
-
using Xamarin.Forms;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
+
#if UITEST
using Xamarin.UITest;
+using Xamarin.Forms.Core.UITests;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 26032, " ListView ItemTapped doesn't get called for the selected item ", PlatformAffected.iOS)]
public partial class Bugzilla26032 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs
index 999214c..4b4d859 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs
@@ -1,14 +1,19 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
+
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 26233, "Windows phone crashing when going back to page containing listview with Frame inside ViewCell")]
public class Bugzilla26233 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs
index 3739a10..dd3f645 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs
@@ -3,13 +3,19 @@ using System.Collections.Generic;
using System.Text;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
+
#if UITEST
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.LifeCycle)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 29363, "PushModal followed immediate by PopModal crashes")]
public class Bugzilla29363 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs
index 68082c8..3170a76 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs
@@ -1,14 +1,18 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.LifeCycle)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 29453, "Navigation.PopAsync(false) in Entry.Completed handler => System.ArgumentException", PlatformAffected.Android)]
public class Bugzilla29453 : TestContentPage // or TestMasterDetailPage, etc ...
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs
index b02fa21..6aa0031 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs
@@ -1,9 +1,10 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using System.Collections.ObjectModel;
using Xamarin.Forms.Internals;
+
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest.iOS;
using Xamarin.UITest;
using NUnit.Framework;
@@ -11,6 +12,10 @@ using NUnit.Framework;
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 31114, "iOS ContextAction leaves blank line after swiping in ListView")]
public class Bugzilla31114 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs
index d1b2b76..c2a2346 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs
@@ -1,5 +1,4 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using System.ComponentModel;
using System.Runtime.CompilerServices;
@@ -7,13 +6,17 @@ using System.Windows.Input;
using Xamarin.Forms.Internals;
#if UITEST
-using Xamarin.UITest;
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest.iOS;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [NUnit.Framework.Category(UITestCategories.MasterDetailPage)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 31602, "not possible to programmatically open master page after iPad landscape -> portrait rotation, also tests 31664")]
public class Bugzilla31602 : TestMasterDetailPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs
index 64730f2..b92a8d1 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs
@@ -1,15 +1,19 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.Cells)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 32040, "EntryCell.Tapped or SwitchCell.Tapped does not fire when within a TableView ")]
public class Bugzilla32040 : TestContentPage // or TestMasterDetailPage, etc ...
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs
index 102525b..6121a2c 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs
@@ -1,19 +1,24 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using System.Linq.Expressions;
using System.Threading.Tasks;
using System.Collections.ObjectModel;
using System.Linq;
using System.Collections.Generic;
+
using Xamarin.Forms.Internals;
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 32148, " Pull to refresh hides the first item on a list view")]
public class Bugzilla32148 : TestContentPage // or TestMasterDetailPage, etc ...
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs
index 29a302d..9a29fac 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs
@@ -1,16 +1,20 @@
using System;
using System.Linq;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 32462, "Crash after a page disappeared if a ScrollView is in the HeaderTemplate property of a ListView", PlatformAffected.Android)]
public class Bugzilla32462 : TestContentPage // or TestMasterDetailPage, etc ...
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs
index 8798fad..0b14c12 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs
@@ -1,17 +1,21 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using System.Collections.ObjectModel;
using System.Linq;
using Xamarin.Forms.Internals;
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 34912, "ListView.IsEnabled has no effect on iOS")]
public class Bugzilla34912 : TestContentPage // or TestMasterDetailPage, etc ...
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs
index 70e2160..b4af008 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs
@@ -1,15 +1,19 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.BoxView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 39331, "[Android] BoxView Is InputTransparent Even When Set to False")]
public class Bugzilla39331 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs
index e23023d..585c533 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs
@@ -1,15 +1,20 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using System.Linq;
+
using Xamarin.Forms.Internals;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 39668, "Overriding ListView.CreateDefault Does Not Work on Windows", PlatformAffected.WinRT)]
public class Bugzilla39668 : TestContentPage
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 e9f8347..9d8f9fb 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
@@ -3,13 +3,18 @@ using Xamarin.Forms.Internals;
#if UITEST
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.BoxView)]
+#endif
+
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 40173, "Android BoxView/Frame not clickthrough in ListView")]
- public class Bugzilla40173 : TestContentPage // or TestMasterDetailPage, etc ...
+ public class Bugzilla40173 : TestContentPage // or TestMasterDetailPage, etc ...
{
const string CantTouchButtonId = "CantTouchButtonId";
const string CanTouchButtonId = "CanTouchButtonId";
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 e53429e..46123df 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
@@ -7,12 +7,17 @@ using Xamarin.Forms.Internals;
using System.Text;
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 40704, "Strange duplication of listview headers when collapsing/expanding sections")]
public class Bugzilla40704 : TestContentPage // or TestMasterDetailPage, etc ...
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs
index 0bb024c..876a10f 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs
@@ -1,15 +1,19 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls.Issues
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 40858, "Long clicking a text entry in a ListView header/footer cause a crash", PlatformAffected.Android)]
public class Bugzilla40858 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs
index 16cd308..4757594 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs
@@ -6,12 +6,17 @@ using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
+using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 42329, "ListView in Frame and FormsAppCompatActivity Memory Leak")]
public class Bugzilla42329 : TestMasterDetailPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs
index 2d85e31..6a540db 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs
@@ -1,18 +1,22 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
using System.Collections.Generic;
#if UITEST
using Xamarin.UITest;
+using Xamarin.Forms.Core.UITests;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls.Issues
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve(AllMembers = true)]
- [Issue(IssueTracker.Bugzilla, 42364, "ListView item's contextual action menu not being closed upon swiping a TabbedPage in AppCompat")]
+ [Issue(IssueTracker.Bugzilla, 42364, "ListView item's contextual action menu not being closed upon swiping a TabbedPage in AppCompat")]
public class Bugzilla42354 : TestTabbedPage
{
protected override void Init()
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs
index 05e4101..aaedcd0 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs
@@ -1,10 +1,18 @@
using System;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
+#if UITEST
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.BoxView)]
+#endif
+
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 42602, "[Win] Custom BoxView Renderer Does Not Render All Its Children Elements", PlatformAffected.WinRT)]
public class Bugzilla42602 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs
index 8902d99..7196f3c 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs
@@ -6,12 +6,17 @@ using Xamarin.Forms.CustomAttributes;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls.Issues
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve(AllMembers = true)]
- [Issue(IssueTracker.Bugzilla, 42832, "Scrolling a ListView with active ContextAction Items causes NRE", PlatformAffected.Android)]
+ [Issue(IssueTracker.Bugzilla, 42832, "Scrolling a ListView with active ContextAction Items causes NRE", PlatformAffected.Android)]
public class Bugzilla42832 : TestContentPage
{
ListView listview;
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs
index 0480bf5..358c3a6 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs
@@ -3,9 +3,17 @@ using System.Threading.Tasks;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
+#if UITEST
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.ListView)]
+#endif
+
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 43214, "Setting Listview.IsRefreshing to false does not work on second \"pull\"")]
public class Bugzilla43214 : TestContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs
index ecc1980..ff1b86d 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs
@@ -1,11 +1,19 @@
using System.Diagnostics;
using System.Reflection;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
+#if UITEST
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
namespace Xamarin.Forms.Controls
{
+#if UITEST
+ [Category(UITestCategories.BoxView)]
+#endif
+
[Preserve (AllMembers=true)]
[Issue (IssueTracker.Github, 1075, "Does not update Color", PlatformAffected.Android | PlatformAffected.WinPhone)]
public class Issue1075 : ContentPage
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs
index b2b56c0..e55c093 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs
@@ -4,6 +4,7 @@ using Xamarin.Forms.Internals;
#if UITEST
using NUnit.Framework;
using Xamarin.UITest;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
@@ -35,7 +36,7 @@ namespace Xamarin.Forms.Controls
#if UITEST
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[UiTest (typeof(Label), "TextColor")]
public void Issue181TestsLabelShouldHaveRedText ()
{
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs
index d7d475b..6bac963 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs
@@ -1,12 +1,12 @@
using System;
using System.Linq;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using NUnit.Framework;
using Xamarin.UITest;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
@@ -75,7 +75,7 @@ namespace Xamarin.Forms.Controls
#if UITEST
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
public void Issue342DelayedLoadTestsImageLoads ()
{
RunningApp.Screenshot ("Should not crash");
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs
index 0225636..a01a1e8 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs
@@ -4,6 +4,7 @@ using Xamarin.Forms.Internals;
#if UITEST
using NUnit.Framework;
using Xamarin.UITest;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
@@ -29,7 +30,7 @@ namespace Xamarin.Forms.Controls
#if UITEST
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
public void Issue488TestsLongTextRotation ()
{
RunningApp.WaitForElement (q => q.Marked ("I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text."));
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs
index db9d1d4..5bad4e4 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs
@@ -1,12 +1,12 @@
using System;
using System.Linq;
-
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using NUnit.Framework;
using Xamarin.UITest;
+using Xamarin.Forms.Core.UITests;
#endif
namespace Xamarin.Forms.Controls
@@ -45,7 +45,7 @@ namespace Xamarin.Forms.Controls
#if UITEST
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
public void Issue764TestsKeyboardDismissedForEnter ()
{
Assert.Inconclusive ("Needs test");
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs
index cde56ec..a38e9f4 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs
@@ -6,6 +6,12 @@ using Xamarin.UITest;
using NUnit.Framework;
#endif
+// Apply the default category of "Issues" to all of the tests in this assembly
+// We use this as a catch-all for tests which haven't been individually categorized
+#if UITEST
+[assembly: NUnit.Framework.Category("Issues")]
+#endif
+
namespace Xamarin.Forms.Controls
{
[Preserve(AllMembers = true)]
diff --git a/Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs b/Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs
index f007557..d5acb5c 100644
--- a/Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs
+++ b/Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs
@@ -4,7 +4,7 @@ using NUnit.Framework;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("DisplayAlert")]
+ [Category(UITestCategories.DisplayAlert)]
internal class DisplayAlertUITestsAndroid : BaseTestFixture
{
diff --git a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
index 6dfa1cc..a92c085 100644
--- a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
+++ b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
@@ -143,6 +143,9 @@
<Compile Include="..\Xamarin.Forms.Core.iOS.UITests\Tests\WebViewUITests.cs">
<Link>Tests\WebViewUITests.cs</Link>
</Compile>
+ <Compile Include="..\Xamarin.Forms.Core.iOS.UITests\UITestCategories.cs">
+ <Link>UITestCategories.cs</Link>
+ </Compile>
<Compile Include="PlatformQueries.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Xamarin.Forms.Core.iOS.UITests\Remotes\RemoteFactory.cs">
diff --git a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
index 515e211..76eb2d1 100644
--- a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
+++ b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
@@ -156,6 +156,9 @@
<Compile Include="..\Xamarin.Forms.Core.iOS.UITests\Tests\WebViewUITests.cs">
<Link>Tests\WebViewUITests.cs</Link>
</Compile>
+ <Compile Include="..\Xamarin.Forms.Core.iOS.UITests\UITestCategories.cs">
+ <Link>UITestCategories.cs</Link>
+ </Compile>
<Compile Include="..\Xamarin.Forms.Core.iOS.UITests\Utilities\AppExtensions.cs">
<Link>Utilities\AppExtensions.cs</Link>
</Compile>
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs
index cf03b70..0f74d6d 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs
@@ -7,7 +7,7 @@ using Xamarin.UITest.Queries;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("ActionSheet")]
+ [Category(UITestCategories.ActionSheet)]
internal class ActionSheetUITests : BaseTestFixture
{
AppRect screenSize;
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ActivityIndicatorUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ActivityIndicatorUITests.cs
index a2de9d5..36dd3a1 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ActivityIndicatorUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ActivityIndicatorUITests.cs
@@ -10,7 +10,7 @@ using Xamarin.UITest.Queries;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("ActivityIndicator")]
+ [Category(UITestCategories.ActivityIndicator)]
internal class ActivityIndicatorUITests : _ViewUITests
{
public ActivityIndicatorUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/AppearingUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/AppearingUITests.cs
index c346b4f..4b37ea9 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/AppearingUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/AppearingUITests.cs
@@ -3,10 +3,9 @@ using NUnit.Framework;
namespace Xamarin.Forms.Core.UITests
{
- [Category ("Lifecycle")]
+ [Category(UITestCategories.LifeCycle)]
internal class AppearingUITests : BaseTestFixture
{
-
public AppearingUITests ()
{
ShouldResetPerFixture = false;
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/AutomationIDUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/AutomationIDUITests.cs
index d397900..4aeb5cc 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/AutomationIDUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/AutomationIDUITests.cs
@@ -7,7 +7,7 @@ using Xamarin.UITest.Queries;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("AutomationID")]
+ [Category(UITestCategories.AutomationId)]
internal class AutomationIDUITests : BaseTestFixture
{
protected override void NavigateToGallery ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/BoxViewUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/BoxViewUITests.cs
index cf542c3..fa9cdc2 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/BoxViewUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/BoxViewUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("BoxView")]
+ [Category(UITestCategories.BoxView)]
internal class BoxViewUITests : _ViewUITests
{
public BoxViewUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ButtonUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ButtonUITests.cs
index 47bb45c..83c9ccc 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ButtonUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ButtonUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Button")]
+ [Category(UITestCategories.Button)]
internal class ButtonUITests : _ViewUITests
{
public ButtonUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ContextActionsUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ContextActionsUITests.cs
index fc80937..a3ae106 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ContextActionsUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ContextActionsUITests.cs
@@ -10,7 +10,7 @@ using Xamarin.UITest.Queries;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Cells")]
+ [Category(UITestCategories.Cells)]
internal class ContextActionsListUITests : BaseTestFixture
{
@@ -84,7 +84,7 @@ namespace Xamarin.Forms.Core.UITests
}
[TestFixture]
- [Category ("Cells")]
+ [Category(UITestCategories.Cells)]
internal class ContextActionsTableUITests : BaseTestFixture
{
public ContextActionsTableUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/DatePickerUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/DatePickerUITests.cs
index 5769f71..7245288 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/DatePickerUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/DatePickerUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("DatePicker")]
+ [Category(UITestCategories.DatePicker)]
internal class DatePickerUITests : _ViewUITests
{
public DatePickerUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/DisplayAlertUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/DisplayAlertUITests.cs
index 74bd895..afefdeb 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/DisplayAlertUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/DisplayAlertUITests.cs
@@ -6,7 +6,7 @@ using System.Threading;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("DisplayAlert")]
+ [Category(UITestCategories.DisplayAlert)]
internal class DisplayAlertUITests : BaseTestFixture
{
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/EditorUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/EditorUITests.cs
index 6701faa..e407ad2 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/EditorUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/EditorUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Editor")]
+ [Category(UITestCategories.Editor)]
internal class EditorUITests : _ViewUITests
{
public EditorUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/EntryUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/EntryUITests.cs
index 6d498b5..82ee605 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/EntryUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/EntryUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Entry")]
+ [Category(UITestCategories.Entry)]
internal class EntryUITests : _ViewUITests
{
public EntryUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/FrameUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/FrameUITests.cs
index f7a59ed..035e3f7 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/FrameUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/FrameUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Frame")]
+ [Category(UITestCategories.Frame)]
internal class FrameUITests : _ViewUITests
{
public FrameUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ImageUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ImageUITests.cs
index 5c19d1c..cdf9af6 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ImageUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ImageUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Image")]
+ [Category(UITestCategories.Image)]
internal class ImageUITests : _ViewUITests
{
public ImageUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/LabelUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/LabelUITests.cs
index 423774f..2a01187 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/LabelUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/LabelUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Label")]
+ [Category(UITestCategories.Label)]
internal class LabelUITests : _ViewUITests
{
public LabelUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/Legacy-CellsUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/Legacy-CellsUITests.cs
index 4710c33..4d7ec9d 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/Legacy-CellsUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/Legacy-CellsUITests.cs
@@ -13,7 +13,7 @@ using Xamarin.UITest.Queries;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category("Cells")]
+ [Category(UITestCategories.Cells)]
internal class CellsGalleryTests : BaseTestFixture
{
// TODO find a way to test individula elements of cells
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/PickerUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/PickerUITests.cs
index 19357fa..f0bd20a 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/PickerUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/PickerUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Picker")]
+ [Category(UITestCategories.Picker)]
internal class PickerUITests : _ViewUITests
{
public PickerUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ProgressBarUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ProgressBarUITests.cs
index 5d95145..aa0b713 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ProgressBarUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ProgressBarUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("ProgressBar")]
+ [Category(UITestCategories.ProgressBar)]
internal class ProgressBarUITests : _ViewUITests
{
public ProgressBarUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/RootGalleryUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/RootGalleryUITests.cs
index e597809..1089b33 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/RootGalleryUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/RootGalleryUITests.cs
@@ -25,7 +25,7 @@ namespace Xamarin.Forms.Core.UITests
}
[TestFixture]
- [Category ("RootGallery")]
+ [Category(UITestCategories.RootGallery)]
internal class RootGalleryUITests : BaseTestFixture
{
IEnumerable<RootPageModel> rootPages;
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ScrollViewUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ScrollViewUITests.cs
index 2266c26..3319834 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ScrollViewUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ScrollViewUITests.cs
@@ -4,7 +4,7 @@ using Xamarin.UITest;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("ScrollView")]
+ [Category(UITestCategories.ScrollView)]
internal class ScrollViewGalleryTests : BaseTestFixture
{
public ScrollViewGalleryTests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/SearchBarUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/SearchBarUITests.cs
index e45ba38..9f9f3e9 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/SearchBarUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/SearchBarUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("SearchBar")]
+ [Category(UITestCategories.SearchBar)]
internal class SearchBarUITests : _ViewUITests
{
public SearchBarUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/SliderUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/SliderUITests.cs
index 6f8eb77..c726903 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/SliderUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/SliderUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Slider")]
+ [Category(UITestCategories.Slider)]
internal class SliderUITests : _ViewUITests
{
public SliderUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/StepperUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/StepperUITests.cs
index bec1e22..3afd1e6 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/StepperUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/StepperUITests.cs
@@ -17,7 +17,8 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Stepper")]
+
+ [Category(UITestCategories.Stepper)]
internal class StepperUITests : _ViewUITests
{
public StepperUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/SwitchUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/SwitchUITests.cs
index 344aae4..d7896d4 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/SwitchUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/SwitchUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("Switch")]
+ [Category(UITestCategories.Switch)]
internal class SwitchUITests : _ViewUITests
{
public SwitchUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/TimePickerUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/TimePickerUITests.cs
index 63e6a29..954e824 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/TimePickerUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/TimePickerUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("TimePicker")]
+ [Category(UITestCategories.TimePicker)]
internal class TimePickerUITests : _ViewUITests
{
public TimePickerUITests ()
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ToolbarItemTests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ToolbarItemTests.cs
index eddc20c..30cabff 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ToolbarItemTests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ToolbarItemTests.cs
@@ -7,7 +7,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("ToolbarItem")]
+ [Category(UITestCategories.ToolbarItem)]
internal class ToolbarItemTests : BaseTestFixture
{
string btn1Id = "tb1";
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ViewUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ViewUITests.cs
index 7cfbe55..a7a1301 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ViewUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ViewUITests.cs
@@ -213,7 +213,7 @@ namespace Xamarin.Forms.Core.UITests
[Test]
[UiTest (typeof (VisualElement), "TranslationX")]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
public virtual void _TranslationX ()
{
var remote = new ViewContainerRemote (App, Test.VisualElement.TranslationX, PlatformViewType);
@@ -222,7 +222,7 @@ namespace Xamarin.Forms.Core.UITests
[Test]
[UiTest (typeof (VisualElement), "TranslationY")]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
public virtual void _TranslationY ()
{
var remote = new ViewContainerRemote (App, Test.VisualElement.TranslationY, PlatformViewType);
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/WebViewUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/WebViewUITests.cs
index c52693a..e056b32 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/WebViewUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/WebViewUITests.cs
@@ -17,7 +17,7 @@ using Xamarin.UITest.iOS;
namespace Xamarin.Forms.Core.UITests
{
[TestFixture]
- [Category ("WebView")]
+ [Category(UITestCategories.WebView)]
internal class WebViewUITests : _ViewUITests
{
public WebViewUITests ()
@@ -29,15 +29,15 @@ namespace Xamarin.Forms.Core.UITests
{
App.NavigateToGallery (GalleryQueries.WebViewGallery);
}
-
- [Category ("ManualReview")]
+
+ [Category(UITestCategories.ManualReview)]
public override void _IsEnabled ()
{
Assert.Inconclusive ("Does not make sense for WebView");
}
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _IsVisible () {}
@@ -51,38 +51,38 @@ namespace Xamarin.Forms.Core.UITests
public override void _IsFocused () {}
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _Opacity () {}
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _Rotation () {}
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _RotationX () {}
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _RotationY () {}
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _TranslationX () {}
[Test]
- [Category ("ManualReview")]
+ [Category(UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _TranslationY () {}
[Test]
- [Category ("ManualReview")]
+ [Category (UITestCategories.ManualReview)]
[Ignore("Keep empty test from failing in Test Cloud")]
public override void _Scale () {}
diff --git a/Xamarin.Forms.Core.iOS.UITests/UITestCategories.cs b/Xamarin.Forms.Core.iOS.UITests/UITestCategories.cs
new file mode 100644
index 0000000..dbc298f
--- /dev/null
+++ b/Xamarin.Forms.Core.iOS.UITests/UITestCategories.cs
@@ -0,0 +1,35 @@
+namespace Xamarin.Forms.Core.UITests
+{
+ internal static class UITestCategories
+ {
+ public const string ActionSheet = "ActionSheet";
+ public const string ActivityIndicator = "ActivityIndicator";
+ public const string AutomationId = "AutomationID";
+ public const string BoxView = "BoxView";
+ public const string Button = "Button";
+ public const string Cells = "Cells";
+ public const string DatePicker = "DatePicker";
+ public const string DisplayAlert = "DisplayAlert";
+ public const string Editor = "Editor";
+ public const string Entry = "Entry";
+ public const string Frame = "Frame";
+ public const string Image = "Image";
+ public const string Label = "Label";
+ public const string ListView = "ListView";
+ public const string LifeCycle = "Lifecycle";
+ public const string MasterDetailPage = "MasterDetailPage";
+ public const string Picker = "Picker";
+ public const string ProgressBar = "ProgressBar";
+ public const string RootGallery = "RootGallery";
+ public const string ScrollView = "ScrollView";
+ public const string SearchBar = "SearchBar";
+ public const string Slider = "Slider";
+ public const string Stepper = "Stepper";
+ public const string Switch = "Switch";
+ public const string TimePicker = "TimePicker";
+ public const string ToolbarItem = "ToolbarItem";
+ public const string WebView = "WebView";
+
+ public const string ManualReview = "ManualReview";
+ }
+} \ No newline at end of file
diff --git a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
index 6d49ae6..42ac29e 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
+++ b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
@@ -64,6 +64,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="BaseTestFixture.cs" />
+ <Compile Include="UITestCategories.cs" />
<Compile Include="PlatformQueries.cs" />
<Compile Include="Remotes\BaseViewContainerRemote.cs" />
<Compile Include="Remotes\EventViewContainerRemote.cs" />
diff --git a/Xamarin.Forms.sln.DotSettings b/Xamarin.Forms.sln.DotSettings
index 597fd71..79e46ba 100644
--- a/Xamarin.Forms.sln.DotSettings
+++ b/Xamarin.Forms.sln.DotSettings
@@ -655,6 +655,7 @@
&lt;Entry DisplayName="Other Members" /&gt;&#xD;
&lt;/TypePattern&gt;&#xD;
&lt;/Patterns&gt;</s:String>
+ <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WP8/@EntryIndexedValue">WP8</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>