Run multiple UI tests without restarting ControlGallery (xamarin#539)

* Allow UI tests to bypass "manual" navigation to isses pages * Add missing Preserve attribute * Make Issue198 test work with direct navigation * Remove empty UI tests * Fix error handling for iOS * Use navigation which works for subsequent TestNavigationPages on iOS * Fix race condition in 39530 test Remove master page nesting when doing direct nav for UI tests * Set up and run a single instance of Control Gallery for UI tests * Force NavigateToIssue to wait for main page appearing to deal with iOS timing * Move remaining UI tests into Issues namespace * Change the connection check URL so it'll work on iOS * Make Appearing Gallery tests work without restarting app * Prevent ContextActions tests from stepping on each other * Make context menu test more robust * Move ButtonExtensions back to Controls namespace * Have test 774 dismiss the action sheet before ending * Update UITest package to 2.0.0 stable * Make 2948 restore orientation when it's done * Null check on PageController before calling SendDisappearing * Adding a wait for the root page in the core tests * Add consecutive tests reset to prevent memory slog on older iOS devices
knasher · Nov 16, 2016 · 122f0e3 · 122f0e3
1 parent acc6efb
commit 122f0e3
Show file tree

Hide file tree

Showing 176 changed files with 781 additions and 331 deletions.
diff --git a/Xamarin.Forms.ControlGallery.Android/Activity1.cs b/Xamarin.Forms.ControlGallery.Android/Activity1.cs
@@ -21,7 +21,8 @@
 
 using Droid = Android;
 using System.Globalization;
-
+using Java.Interop;
+using Xamarin.Forms.Controls.Issues;
 
 [assembly: Dependency (typeof (CacheService))]
 [assembly: Dependency (typeof (TestCloudService))]
@@ -274,6 +275,12 @@ protected override void OnDestroy()
 		{
 			base.OnDestroy();
 		}
+
+		[Export("NavigateToTest")]
+		public bool NavigateToTest(string test)
+		{
+			return _app.NavigateToTestPage(test);
+		}
 	}
 #else
 
@@ -297,6 +304,8 @@ protected override void OnDestroy()
 	]
 	public class Activity1 : FormsAppCompatActivity
 	{
+		App _app;
+
 		protected override void OnCreate (Bundle bundle)
 		{
 			ToolbarResource = Resource.Layout.Toolbar;
@@ -319,6 +328,7 @@ protected override void OnCreate (Bundle bundle)
 			//Forms.SetTitleBarVisibility (AndroidTitleBarVisibility.Never);
 
 			var app = new App();
+			_app = app;
 
 			// When the native control gallery loads up, it'll let us know so we can add the nested native controls
 			MessagingCenter.Subscribe<NestedNativeControlGalleryPage>(this, NestedNativeControlGalleryPage.ReadyForNativeControlsMessage, AddNativeControls);
@@ -446,6 +456,18 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
 				return null;
 			}
 		}
+
+		[Export("NavigateToTest")]
+		public bool NavigateToTest(string test)
+		{
+			return _app.NavigateToTestPage(test);
+		}
+
+		[Export("Reset")]
+		public void Reset()
+		{
+			_app.Reset();
+		}
 	}
 #endif
 }

diff --git a/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
@@ -19,6 +19,7 @@
 using AView = Android.Views.View;
 using Android.OS;
 using System.Reflection;
+using Xamarin.Forms.Controls.Issues;
 
 [assembly: ExportRenderer(typeof(Bugzilla31395.CustomContentView), typeof(CustomContentRenderer))]
 [assembly: ExportRenderer(typeof(NativeListView), typeof(NativeListViewRenderer))]

diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
@@ -114,6 +114,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android.Export" />
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
@@ -9,6 +9,7 @@
 using Xamarin.Forms;
 using Xamarin.Forms.ControlGallery.iOS;
 using Xamarin.Forms.Controls;
+using Xamarin.Forms.Controls.Issues;
 using Xamarin.Forms.Platform.iOS;
 
 [assembly: Dependency(typeof(TestCloudService))]
@@ -132,6 +133,7 @@ public override bool FinishedLaunching (UIApplication app, NSDictionary options)
 	[Register("AppDelegate")]
 	public partial class AppDelegate : FormsApplicationDelegate
 	{
+		App _app;
 
 		public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)
 		{
@@ -150,6 +152,7 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
 			};
 
 			var app = new App();
+			_app = app;
 
 			// When the native control gallery loads up, it'll let us know so we can add the nested native controls
 			MessagingCenter.Subscribe<NestedNativeControlGalleryPage>(this, NestedNativeControlGalleryPage.ReadyForNativeControlsMessage, AddNativeControls);
@@ -352,6 +355,21 @@ public void StartPressed40911()
 		}
 
 		#endregion
+
+		[Export("navigateToTest:")]
+		public string NavigateToTest(string test)
+		{
+			// According to https://developer.xamarin.com/guides/testcloud/uitest/working-with/backdoors/
+			// this method has to return a string
+			return _app.NavigateToTestPage(test).ToString();
+		}
+
+		[Export("reset:")]
+		public string Reset(string str)
+		{
+			_app.Reset();
+			return String.Empty;
+		}
 	}
 
 	[Register("KVOUISlider")]

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
@@ -7,6 +7,7 @@
 using Xamarin.Forms;
 using Xamarin.Forms.ControlGallery.iOS;
 using Xamarin.Forms.Controls;
+using Xamarin.Forms.Controls.Issues;
 using Xamarin.Forms.Platform.iOS;
 using RectangleF = CoreGraphics.CGRect;
 

diff --git a/...Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs b/...Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs
@@ -16,7 +16,6 @@
 
 namespace Xamarin.Forms.Controls
 {
-
 	public class PropertyChangedBase : INotifyPropertyChanged
 	{
 		Dictionary<string, object> _properties = new Dictionary<string, object>();
@@ -312,11 +311,16 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
 		}
 	}
 
-	[Preserve (AllMembers = true)]
-	[Issue (IssueTracker.None, 0, "Adding Multiple Items to a ListView", PlatformAffected.All)]
+
+}
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.None, 0, "Adding Multiple Items to a ListView", PlatformAffected.All)]
 	public class AddingMultipleItemsListView : TestContentPage
 	{
-		protected override void Init ()
+		protected override void Init()
 		{
 			Title = "Hours";
 			var exampleViewModel = new ExampleViewModel();
@@ -351,36 +355,39 @@ protected override void Init ()
 				Children = {
 					listView,
 					addOneJobButton,
-					addTwoJobsButton 
+					addTwoJobsButton
 				}
 			};
 			Content = layout;
 		}
 
-		[Preserve (AllMembers = true)]
+		[Preserve(AllMembers = true)]
 		public class CustomViewCell : ViewCell
 		{
-			public CustomViewCell ()
+			public CustomViewCell()
 			{
-				var jobId = new Label {
+				var jobId = new Label
+				{
 #pragma warning disable 618
 					Font = Font.SystemFontOfSize(20),
 #pragma warning restore 618
 					WidthRequest = 105,
 					VerticalOptions = LayoutOptions.Center,
 
 					HorizontalOptions = LayoutOptions.StartAndExpand
-				};                    
+				};
 				jobId.SetBinding(Label.TextProperty, "JobId");
 
-				var jobName = new Label {
+				var jobName = new Label
+				{
 					VerticalOptions = LayoutOptions.Center,
 					WidthRequest = 175,
 					HorizontalOptions = LayoutOptions.CenterAndExpand,
 				};
 				jobName.SetBinding(Label.TextProperty, "JobName");
 
-				var hours = new Label {
+				var hours = new Label
+				{
 					WidthRequest = 45,
 					VerticalOptions = LayoutOptions.Center,
 #pragma warning disable 618
@@ -391,8 +398,9 @@ public CustomViewCell ()
 				};
 				hours.SetBinding(Label.TextProperty, new Binding("Hours", BindingMode.OneWay, new DoubleStringConverter()));
 
-				var hlayout = new StackLayout {
-					Children  = {
+				var hlayout = new StackLayout
+				{
+					Children = {
 						jobId,
 						jobName,
 						hours
@@ -403,45 +411,45 @@ public CustomViewCell ()
 				View = hlayout;
 			}
 		}
-	
+
 #if UITEST
 		[Test]
-		public void AddingMultipleListViewTests1AllElementsPresent ()
+		public void AddingMultipleListViewTests1AllElementsPresent()
 		{
-			RunningApp.WaitForElement (q => q.Marked ("Big Job"));
-			RunningApp.WaitForElement (q => q.Marked ("Smaller Job"));
-			RunningApp.WaitForElement (q => q.Marked ("Add On Job"));
-			RunningApp.WaitForElement (q => q.Marked ("Add One"));
-			RunningApp.WaitForElement (q => q.Marked ("Add Two"));
-			RunningApp.WaitForElement (q => q.Marked ("3672"));
-			RunningApp.WaitForElement (q => q.Marked ("6289"));
-			RunningApp.WaitForElement (q => q.Marked ("3672-41"));
-			RunningApp.WaitForElement (q => q.Marked ("2"));
-			RunningApp.WaitForElement (q => q.Marked ("2"));
-			RunningApp.WaitForElement (q => q.Marked ("23"));
-
-			RunningApp.Screenshot ("All elements are present");
+			RunningApp.WaitForElement(q => q.Marked("Big Job"));
+			RunningApp.WaitForElement(q => q.Marked("Smaller Job"));
+			RunningApp.WaitForElement(q => q.Marked("Add On Job"));
+			RunningApp.WaitForElement(q => q.Marked("Add One"));
+			RunningApp.WaitForElement(q => q.Marked("Add Two"));
+			RunningApp.WaitForElement(q => q.Marked("3672"));
+			RunningApp.WaitForElement(q => q.Marked("6289"));
+			RunningApp.WaitForElement(q => q.Marked("3672-41"));
+			RunningApp.WaitForElement(q => q.Marked("2"));
+			RunningApp.WaitForElement(q => q.Marked("2"));
+			RunningApp.WaitForElement(q => q.Marked("23"));
+
+			RunningApp.Screenshot("All elements are present");
 		}
 
 		[Test]
-		public void AddingMultipleListViewTests2AddOneElementToList ()
+		public void AddingMultipleListViewTests2AddOneElementToList()
 		{
-			RunningApp.Tap (q => q.Marked ("Add One"));
+			RunningApp.Tap(q => q.Marked("Add One"));
 
-			RunningApp.WaitForElement (q => q.Marked ("1234"), timeout: TimeSpan.FromSeconds (2));
-			RunningApp.Screenshot ("One more element exists");
+			RunningApp.WaitForElement(q => q.Marked("1234"), timeout: TimeSpan.FromSeconds(2));
+			RunningApp.Screenshot("One more element exists");
 		}
 
 		[Test]
-		public void AddingMultipleListViewTests3AddTwoElementToList ()
+		public void AddingMultipleListViewTests3AddTwoElementToList()
 		{
-			RunningApp.Screenshot ("Click 'Add Two'");
-			RunningApp.Tap (q => q.Marked ("Add Two"));
+			RunningApp.Screenshot("Click 'Add Two'");
+			RunningApp.Tap(q => q.Marked("Add Two"));
 
-			RunningApp.WaitForElement (q => q.Marked ("9999"), timeout: TimeSpan.FromSeconds (2));
-			RunningApp.WaitForElement (q => q.Marked ("8888"), timeout: TimeSpan.FromSeconds (2));
-			RunningApp.Screenshot ("Two more element exist");
+			RunningApp.WaitForElement(q => q.Marked("9999"), timeout: TimeSpan.FromSeconds(2));
+			RunningApp.WaitForElement(q => q.Marked("8888"), timeout: TimeSpan.FromSeconds(2));
+			RunningApp.Screenshot("Two more element exist");
 		}
 #endif
 	}
-}
+}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21177.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21177.cs
@@ -11,7 +11,7 @@
 using NUnit.Framework;
 #endif
 
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 21177, "Using a UICollectionView in a ViewRenderer results in issues with selection")]

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22401.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22401.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-
+using Xamarin.Forms.Controls.Issues;
 using Xamarin.Forms.CustomAttributes;
 using Xamarin.Forms.Internals;
 

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24574.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24574.cs
@@ -7,7 +7,7 @@
 using NUnit.Framework;
 #endif
 
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve (AllMembers = true)]
 	[Issue (IssueTracker.Bugzilla, 24574, "Tap Double Tap")]

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
@@ -7,7 +7,7 @@
 using NUnit.Framework;
 #endif
 
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve (AllMembers = true)]
 	[Issue (IssueTracker.Bugzilla, 25979, "https://bugzilla.xamarin.com/show_bug.cgi?id=25979")]

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml
@@ -2,7 +2,7 @@
 <local:TestContentPage xmlns="http://xamarin.com/schemas/2014/forms"
 				 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
  				 xmlns:local="clr-namespace:Xamarin.Forms.Controls"
-				 x:Class="Xamarin.Forms.Controls.Bugzilla26032">
+				 x:Class="Xamarin.Forms.Controls.Issues.Bugzilla26032">
 	<RelativeLayout>
 		<ListView x:Name="List1"
 				  RelativeLayout.XConstraint="{ConstraintExpression Type=Constant, Constant=0}"

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
@@ -10,7 +10,7 @@
 using NUnit.Framework;
 #endif
 
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
 {
 #if UITEST
 	[Category(UITestCategories.ListView)]

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26171.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26171.cs
@@ -9,7 +9,7 @@
 using NUnit.Framework;
 #endif
 
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve (AllMembers = true)]
 	[Issue (IssueTracker.Bugzilla, 26171, "Xamarin.Forms.Maps is not updating VisibleRegion property when layout is changed")]

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
@@ -8,7 +8,7 @@
 using Xamarin.Forms.Core.UITests;
 #endif
 
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
 {
 #if UITEST
 	[Category(UITestCategories.ListView)]

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
@@ -7,7 +7,7 @@
 using Xamarin.UITest;
 #endif
 
-namespace Xamarin.Forms.Controls.TestCasesPages
+namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve (AllMembers = true)]
 	public class FamilyViewModel

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
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 #endif
 
-namespace Xamarin.Forms.Controls
+namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve (AllMembers = true)]
 	[Issue (IssueTracker.Bugzilla, 26993, "https://bugzilla.xamarin.com/show_bug.cgi?id=26993")]
@@ -17,7 +17,7 @@ public class Bugzilla26993 : TestContentPage // or TestMasterDetailPage, etc ...
 		[Preserve (AllMembers = true)]
 		public class Bz26993ViewCell : ViewCell 
 		{
-			static int s_id = 0;
+			public static int s_id = 0;
 
 			public Bz26993ViewCell ()
 			{
@@ -33,6 +33,8 @@ public Bz26993ViewCell ()
 
 		protected override void Init ()
 		{
+			Bz26993ViewCell.s_id = 0;
+
 			var itemSource = new List<string> {
 				"",
 				"",