Apply internet check to additional tests (#12804)

Author: PureWeen

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/UITestHelper.cs

@@ -6,6 +6,8 @@
 using Xamarin.UITest;
 using NUnit.Framework;
 using Xamarin.UITest.Queries;
+using System.Linq;
+using Xamarin.Forms.Core.UITests;
 
 namespace Xamarin.Forms.Controls.Issues
 {
@@ -35,6 +37,39 @@ public static void AssertHasText(this AppResult result, string text)
 
 			Assert.Fail();
 		}
+
+		public static string[] GetTestCategories(Type testType)
+		{
+			var testClassName = TestContext.CurrentContext.Test.ClassName;
+
+			// TestContext.CurrentContext.Test.Properties["Category"]
+			// Only gives you the categories on the test itself
+			// There isn't a property I could find that gives you the Categories
+			// on the Test Class
+			return testType
+						.Assembly
+						.GetType(testClassName)
+						.GetCustomAttributes(typeof(NUnit.Framework.CategoryAttribute), true)
+						.OfType<NUnit.Framework.CategoryAttribute>()
+						.Select(x => x.Name)
+						.Union(TestContext.CurrentContext.Test.Properties["Category"].OfType<string>())
+						.ToArray();
+		}
+
+		public static void MarkTestInconclusiveIfNoInternetConnectionIsPresent(Type testType, IApp app)
+		{
+			if (GetTestCategories(testType).Contains(UITestCategories.RequiresInternetConnection))
+			{
+				var hasInternetAccess = $"{app.Invoke("hasInternetAccess")}";
+				bool checkInternet;
+
+				if (bool.TryParse(hasInternetAccess, out checkInternet))
+				{
+					if (!checkInternet)
+						Assert.Inconclusive("Device Has No Internet Connection");
+				}
+			}
+		}
 	}
 }
 

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/ScreenshotConditionalApp.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using NUnit.Framework;
 using NUnit.Framework.Interfaces;
+using Xamarin.Forms.Controls.Issues;
 using Xamarin.Forms.Core.UITests;
 using Xamarin.UITest;
 using Xamarin.UITest.Queries;
@@ -473,37 +474,10 @@ public void Restart()
 		}
 #endif
 
-		string[] GetTestCategories()
-		{
-			var testClassName = TestContext.CurrentContext.Test.ClassName;
-
-			// TestContext.CurrentContext.Test.Properties["Category"]
-			// Only gives you the categories on the test itself
-			// There isn't a property I could find that gives you the Categories
-			// on the Test Class
-			return GetType()
-						.Assembly
-						.GetType(testClassName)
-						.GetCustomAttributes(typeof(NUnit.Framework.CategoryAttribute), true)
-						.OfType<NUnit.Framework.CategoryAttribute>()
-						.Select(x => x.Name)
-						.Union(TestContext.CurrentContext.Test.Properties["Category"].OfType<string>())
-						.ToArray();
-		}
-
 		public void TestSetup(Type testType, bool isolate)
 		{
-			if (GetTestCategories().Contains(UITestCategories.RequiresInternetConnection))
-			{
-				var hasInternetAccess = $"{_app.Invoke("hasInternetAccess")}";
-				bool checkInternet;
 
-				if (bool.TryParse(hasInternetAccess, out checkInternet))
-				{
-					if (!checkInternet)
-						Assert.Inconclusive("Device Has No Internet Connection");
-				}
-			}
+			UITestHelper.MarkTestInconclusiveIfNoInternetConnectionIsPresent(testType, _app);
 
 #if __WINDOWS__
 			RestartIfAppIsClosed();

Xamarin.Forms.Core.UITests.Shared/BaseTestFixture.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using NUnit.Framework;
 using Xamarin.Forms.Controls;
+using Xamarin.Forms.Controls.Issues;
 using Xamarin.UITest;
 using Xamarin.UITest.Queries;
 
@@ -46,6 +47,7 @@ public void EnsureMemory()
 		protected virtual void TestSetup()
 		{
 			//EnsureMemory();
+			UITestHelper.MarkTestInconclusiveIfNoInternetConnectionIsPresent(GetType(), App);
 		}
 
 		[TearDown]