[Testing] Fix for WebView flaky tests in CI which fails due to networ…

…k connectivity. (dotnet#27178) * Added connectivity functionality using NetworkAccess property * Modified Internet Connectivity functionality in CoreGallery * format corrected in Issue3262 * Update changes * Updated changes * Update commit * Provided internet support for GalleryPages also. * removed CorePageview * Update src/Controls/tests/TestCases.HostApp/CoreViews/NoInternetConnectionPage.cs Addressed review correction Co-authored-by: MartyIX <[email protected]> --------- Co-authored-by: NafeelaNazhir <[email protected]> Co-authored-by: MartyIX <[email protected]>
Tamilarasan-Paranthaman · Jan 21, 2025 · 5ceff42 · 5ceff42
1 parent 1807a6c
commit 5ceff42
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 5 deletions.
diff --git a/src/Controls/tests/CustomAttributes/TestAttributes.cs b/src/Controls/tests/CustomAttributes/TestAttributes.cs
@@ -48,49 +48,53 @@ public class IssueAttribute : Attribute
 	{
 
 		public IssueAttribute(IssueTracker issueTracker, int issueNumber, string description,
-			NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0)
+			NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0, bool isInternetRequired = false)
 		{
 			IssueTracker = issueTracker;
 			IssueNumber = issueNumber.ToString();
 			Description = description;
 			PlatformsAffected = PlatformAffected.Default;
 			NavigationBehavior = navigationBehavior;
 			IssueTestNumber = issueTestNumber;
+			IsInternetRequired = isInternetRequired;
 		}
 
 		public IssueAttribute(IssueTracker issueTracker, string issueNumber, string description,
-			NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0)
+			NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0, bool isInternetRequired = false)
 		{
 			IssueTracker = issueTracker;
 			IssueNumber = issueNumber;
 			Description = description;
 			PlatformsAffected = PlatformAffected.Default;
 			NavigationBehavior = navigationBehavior;
 			IssueTestNumber = issueTestNumber;
+			IsInternetRequired = isInternetRequired;
 		}
 
 		public IssueAttribute(IssueTracker issueTracker, int issueNumber, string description,
 			PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default,
-			int issueTestNumber = 0)
+			int issueTestNumber = 0, bool isInternetRequired = false)
 		{
 			IssueTracker = issueTracker;
 			IssueNumber = issueNumber.ToString();
 			Description = description;
 			PlatformsAffected = platformsAffected;
 			NavigationBehavior = navigationBehavior;
 			IssueTestNumber = issueTestNumber;
+			IsInternetRequired = isInternetRequired;
 		}
 
 		public IssueAttribute(IssueTracker issueTracker, string issueNumber, string description,
 			PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default,
-			int issueTestNumber = 0)
+			int issueTestNumber = 0, bool isInternetRequired = false)
 		{
 			IssueTracker = issueTracker;
 			IssueNumber = issueNumber;
 			Description = description;
 			PlatformsAffected = platformsAffected;
 			NavigationBehavior = navigationBehavior;
 			IssueTestNumber = issueTestNumber;
+			IsInternetRequired = isInternetRequired;
 		}
 
 		public IssueTracker IssueTracker { get; }
@@ -105,6 +109,8 @@ public IssueAttribute(IssueTracker issueTracker, string issueNumber, string desc
 
 		public NavigationBehavior NavigationBehavior { get; }
 
+		public bool IsInternetRequired { get; }
+
 		public string DisplayName => IssueTestNumber == 0
 			? $"{IssueTracker.ToString().Substring(0, 1)}{IssueNumber}"
 			: $"{IssueTracker.ToString().Substring(0, 1)}{IssueNumber} ({IssueTestNumber})";

diff --git a/src/Controls/tests/TestCases.HostApp/CoreViews/NoInternetConnectionPage.cs b/src/Controls/tests/TestCases.HostApp/CoreViews/NoInternetConnectionPage.cs
@@ -0,0 +1,16 @@
+namespace Maui.Controls.Sample
+{
+	internal class NoInternetConnectionPage : ContentPage
+	{
+		public NoInternetConnectionPage()
+		{
+			Content = new Label()
+			{
+				Text = "This device doesn't have Internet access",
+				AutomationId = "NoInternetAccessLabel",
+				HorizontalOptions = LayoutOptions.Center,
+				VerticalOptions = LayoutOptions.Center
+			};
+		}
+	}
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue3262.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue3262.cs
@@ -7,7 +7,7 @@
 
 namespace Maui.Controls.Sample.Issues
 {
-	[Issue(IssueTracker.Github, 3262, "Adding Cookies ability to a WebView...")]
+	[Issue(IssueTracker.Github, 3262, "Adding Cookies ability to a WebView...", isInternetRequired: true)]
 	public class Issue3262 : TestContentPage // or TestFlyoutPage, etc ...
 	{
 		string _currentCookieValue;

diff --git a/src/Controls/tests/TestCases.HostApp/TestCases.cs b/src/Controls/tests/TestCases.HostApp/TestCases.cs
@@ -28,6 +28,20 @@ static TextCell MakeIssueCell(string text, string detail, Action tapped)
 			Action ActivatePageAndNavigate(IssueAttribute issueAttribute, Type type)
 			{
 				Action navigationAction = null;
+
+				if(issueAttribute.IsInternetRequired)
+				{
+					NetworkAccess accessType = Connectivity.Current.NetworkAccess;
+
+					if (accessType != NetworkAccess.Internet)
+					{
+						return () =>
+						{
+							var noInternetConnectionPage = ActivatePage(typeof(NoInternetConnectionPage));
+							Application.Current.Windows[0].Page = noInternetConnectionPage;
+						};
+					}
+				}
 
 				if (issueAttribute.NavigationBehavior == NavigationBehavior.PushAsync)
 				{
@@ -77,6 +91,7 @@ class IssueModel
 				public int IssueTestNumber { get; set; }
 				public string Name { get; set; }
 				public string Description { get; set; }
+				public bool IsInternetRequired { get; set; }
 				public Action Action { get; set; }
 
 				public bool Matches(string filter)
@@ -149,6 +164,7 @@ public TestCaseScreen()
 						 IssueTestNumber = attribute.IssueTestNumber,
 						 Name = attribute.DisplayName,
 						 Description = attribute.Description,
+						 IsInternetRequired = attribute.IsInternetRequired,
 						 Action = ActivatePageAndNavigate(attribute, type)
 					 }).ToList();
 #endif

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3262.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3262.cs
@@ -102,5 +102,21 @@ void ValidateSuccess()
 				throw;
 			}
 		}
+
+		public override void TestSetup()
+		{
+			base.TestSetup();
+
+			try
+			{
+				App.WaitForElement("NoInternetAccessLabel", timeout: TimeSpan.FromSeconds(1));
+				Assert.Inconclusive("This device doesn't have internet access");
+			}
+			catch (TimeoutException)
+			{
+				// Element not found within timeout, assume internet is available
+				// Continue with the test
+			}
+		}
 	}
 }