Fixed the 18751 and 18896 flaky tests

src/Controls/tests/TestCases.HostApp/Issues/Issue18751.xaml.cs

@@ -4,7 +4,7 @@
 
 namespace Maui.Controls.Sample.Issues
 {
-	[Issue(IssueTracker.ManualTest, "C2", "Can scroll CollectionView inside RefreshView", PlatformAffected.All, isInternetRequired: true)]
+	[Issue(IssueTracker.ManualTest, "C2", "Can scroll CollectionView inside RefreshView", PlatformAffected.All)]
 	public partial class Issue18751 : ContentPage
 	{
 		public Issue18751()
@@ -41,135 +41,135 @@ public MonkeysViewModel()
 				Name = "Baboon",
 				Location = "Africa & Asia",
 				Details = "Baboons are African and Arabian Old World monkeys belonging to the genus Papio, part of the subfamily Cercopithecinae.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Papio_anubis_%28Serengeti%2C_2009%29.jpg/200px-Papio_anubis_%28Serengeti%2C_2009%29.jpg"
+				ImageUrl = "papio.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Capuchin Monkey",
 				Location = "Central & South America",
 				Details = "The capuchin monkeys are New World monkeys of the subfamily Cebinae. Prior to 2011, the subfamily contained only a single genus, Cebus.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/4/40/Capuchin_Costa_Rica.jpg/200px-Capuchin_Costa_Rica.jpg"
+				ImageUrl = "capuchin.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Blue Monkey",
 				Location = "Central and East Africa",
 				Details = "The blue monkey or diademed monkey is a species of Old World monkey native to Central and East Africa, ranging from the upper Congo River basin east to the East African Rift and south to northern Angola and Zambia",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/8/83/BlueMonkey.jpg/220px-BlueMonkey.jpg"
+				ImageUrl = "bluemonkey.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Squirrel Monkey",
 				Location = "Central & South America",
 				Details = "The squirrel monkeys are the New World monkeys of the genus Saimiri. They are the only genus in the subfamily Saimirinae. The name of the genus Saimiri is of Tupi origin, and was also used as an English name by early researchers.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/2/20/Saimiri_sciureus-1_Luc_Viatour.jpg/220px-Saimiri_sciureus-1_Luc_Viatour.jpg"
+				ImageUrl = "saimiri.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Golden Lion Tamarin",
 				Location = "Brazil",
 				Details = "The golden lion tamarin also known as the golden marmoset, is a small New World monkey of the family Callitrichidae.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/8/87/Golden_lion_tamarin_portrait3.jpg/220px-Golden_lion_tamarin_portrait3.jpg"
+				ImageUrl = "golden.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Howler Monkey",
 				Location = "South America",
 				Details = "Howler monkeys are among the largest of the New World monkeys. Fifteen species are currently recognised. Previously classified in the family Cebidae, they are now placed in the family Atelidae.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Alouatta_guariba.jpg/200px-Alouatta_guariba.jpg"
+				ImageUrl = "alouatta.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Japanese Macaque",
 				Location = "Japan",
 				Details = "The Japanese macaque, is a terrestrial Old World monkey species native to Japan. They are also sometimes known as the snow monkey because they live in areas where snow covers the ground for months each",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c1/Macaca_fuscata_fuscata1.jpg/220px-Macaca_fuscata_fuscata1.jpg"
+				ImageUrl = "papio.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Mandrill",
 				Location = "Southern Cameroon, Gabon, Equatorial Guinea, and Congo",
 				Details = "The mandrill is a primate of the Old World monkey family, closely related to the baboons and even more closely to the drill. It is found in southern Cameroon, Gabon, Equatorial Guinea, and Congo.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/Mandrill_at_san_francisco_zoo.jpg/220px-Mandrill_at_san_francisco_zoo.jpg"
+				ImageUrl = "capuchin.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Proboscis Monkey",
 				Location = "Borneo",
 				Details = "The proboscis monkey or long-nosed monkey, known as the bekantan in Malay, is a reddish-brown arboreal Old World monkey that is endemic to the south-east Asian island of Borneo.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e5/Proboscis_Monkey_in_Borneo.jpg/250px-Proboscis_Monkey_in_Borneo.jpg"
+				ImageUrl = "bluemonkey.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Red-shanked Douc",
 				Location = "Vietnam, Laos",
 				Details = "The red-shanked douc is a species of Old World monkey, among the most colourful of all primates. This monkey is sometimes called the \"costumed ape\" for its extravagant appearance. From its knees to its ankles it sports maroon-red \"stockings\", and it appears to wear white forearm length gloves. Its attire is finished with black hands and feet. The golden face is framed by a white ruff, which is considerably fluffier in males. The eyelids are a soft powder blue. The tail is white with a triangle of white hair at the base. Males of all ages have a white spot on both sides of the corners of the rump patch, and red and white genitals.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/Portrait_of_a_Douc.jpg/159px-Portrait_of_a_Douc.jpg"
+				ImageUrl = "saimiri.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Gray-shanked Douc",
 				Location = "Vietnam",
 				Details = "The gray-shanked douc langur is a douc species native to the Vietnamese provinces of Quảng Nam, Quảng Ngãi, Bình Định, Kon Tum, and Gia Lai. The total population is estimated at 550 to 700 individuals. In 2016, Dr Benjamin Rawson, Country Director of Fauna & Flora International - Vietnam Programme, announced a discovery of an additional population of more than 500 individuals found in Central Vietnam, bringing the total population up to approximately 1000 individuals.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/0/0b/Cuc.Phuong.Primate.Rehab.center.jpg/320px-Cuc.Phuong.Primate.Rehab.center.jpg"
+				ImageUrl = "golden.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Golden Snub-nosed Monkey",
 				Location = "China",
 				Details = "The golden snub-nosed monkey is an Old World monkey in the Colobinae subfamily. It is endemic to a small area in temperate, mountainous forests of central and Southwest China. They inhabit these mountainous forests of Southwestern China at elevations of 1,500-3,400 m above sea level. The Chinese name is Sichuan golden hair monkey. It is also widely referred to as the Sichuan snub-nosed monkey. Of the three species of snub-nosed monkeys in China, the golden snub-nosed monkey is the most widely distributed throughout China.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Golden_Snub-nosed_Monkeys%2C_Qinling_Mountains_-_China.jpg/165px-Golden_Snub-nosed_Monkeys%2C_Qinling_Mountains_-_China.jpg"
+				ImageUrl = "alouatta.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Black Snub-nosed Monkey",
 				Location = "China",
 				Details = "The black snub-nosed monkey, also known as the Yunnan snub-nosed monkey, is an endangered species of primate in the family Cercopithecidae. It is endemic to China, where it is known to the locals as the Yunnan golden hair monkey and the black golden hair monkey. It is threatened by habitat loss. It was named after Bishop Félix Biet.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/5/59/RhinopitecusBieti.jpg/320px-RhinopitecusBieti.jpg"
+				ImageUrl = "papio.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Tonkin Snub-nosed Monkey",
 				Location = "Vietnam",
 				Details = "The Tonkin snub-nosed monkey or Dollman's snub-nosed monkey is a slender-bodied arboreal Old World monkey, endemic to northern Vietnam. It is a black and white monkey with a pink nose and lips and blue patches round the eyes. It is found at altitudes of 200 to 1,200 m (700 to 3,900 ft) on fragmentary patches of forest on craggy limestone areas. First described in 1912, the monkey was rediscovered in 1990 but is exceedingly rare. In 2008, fewer than 250 individuals were thought to exist, and the species was the subject of intense conservation effort. The main threats faced by these monkeys is habitat loss and hunting, and the International Union for Conservation of Nature has rated the species as \"critically endangered\".",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/Tonkin_snub-nosed_monkeys_%28Rhinopithecus_avunculus%29.jpg/320px-Tonkin_snub-nosed_monkeys_%28Rhinopithecus_avunculus%29.jpg"
+				ImageUrl = "capuchin.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Thomas's Langur",
 				Location = "Indonesia",
 				Details = "Thomas's langur is a species of primate in the family Cercopithecidae. It is endemic to North Sumatra, Indonesia. Its natural habitat is subtropical or tropical dry forests. It is threatened by habitat loss. Its native names are reungkah in Acehnese and kedih in Alas.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/3/31/Thomas%27s_langur_Presbytis_thomasi.jpg/142px-Thomas%27s_langur_Presbytis_thomasi.jpg"
+				ImageUrl = "bluemonkey.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Purple-faced Langur",
 				Location = "Sri Lanka",
 				Details = "The purple-faced langur, also known as the purple-faced leaf monkey, is a species of Old World monkey that is endemic to Sri Lanka. The animal is a long-tailed arboreal species, identified by a mostly brown appearance, dark face (with paler lower face) and a very shy nature. The species was once highly prevalent, found in suburban Colombo and the \"wet zone\" villages (areas with high temperatures and high humidity throughout the year, whilst rain deluges occur during the monsoon seasons), but rapid urbanization has led to a significant decrease in the population level of the monkeys.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/Semnopithèque_blanchâtre_mâle.JPG/192px-Semnopithèque_blanchâtre_mâle.JPG"
+				ImageUrl = "saimiri.jpg"
 			},
 
 			new Monkey
 			{
 				Name = "Gelada",
 				Location = "Ethiopia",
 				Details = "The gelada, sometimes called the bleeding-heart monkey or the gelada baboon, is a species of Old World monkey found only in the Ethiopian Highlands, with large populations in the Semien Mountains. Theropithecus is derived from the Greek root words for \"beast-ape.\" Like its close relatives the baboons, it is largely terrestrial, spending much of its time foraging in grasslands.",
-				ImageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/13/Gelada-Pavian.jpg/320px-Gelada-Pavian.jpg"
+				ImageUrl = "golden.jpg"
 			}
 		};
 		}

src/Controls/tests/TestCases.HostApp/Issues/Issue18896.xaml

@@ -2,50 +2,51 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue18896">
-    <Grid 
+    <Grid
         RowDefinitions="Auto, Auto, 500">
-        <Label 
-            Grid.Row="0" 
+        <Label
+            Grid.Row="0"
             AutomationId="WaitForStubControl"
-            Text="1. Confirm that the ListView below is populated with monkeys and can be scrolled." />
-        <Label 
-            Grid.Row="1"            
-            Text="2. The test passes if you are able to see the image, name, and location of each monkey." />
-        <RefreshView 
+            Text="1. Confirm that the ListView below is populated with monkeys and can be scrolled."/>
+        <Label
+            Grid.Row="1"
+            Text="2. The test passes if you are able to see the image, name, and location of each monkey."/>
+        <RefreshView
             Grid.Row="2">
-            <ListView 
+            <ListView
                 AutomationId="TestListView"
-                ItemsSource="{Binding Monkeys}"   
+                ItemsSource="{Binding Monkeys}"
+                HasUnevenRows="True"
                 VerticalScrollBarVisibility="Always">
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <ViewCell>
-                            <Grid 
+                            <Grid
                                 Padding="10">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <Image 
+                                <Image
                                     Grid.RowSpan="2"
                                     Aspect="AspectFill"
                                     HeightRequest="60"
                                     Source="{Binding ImageUrl}"
-                                    WidthRequest="60" />
+                                    WidthRequest="60"/>
                                 <Label
                                     Grid.Column="1"
                                     FontAttributes="Bold"
-                                    Text="{Binding Name}" />
-                                <Label 
+                                    Text="{Binding Name}"/>
+                                <Label
                                     Grid.Row="1"
                                     Grid.Column="1"
                                     FontAttributes="Italic"
                                     Text="{Binding Location}"
-                                    VerticalOptions="End" />
+                                    VerticalOptions="End"/>
                             </Grid>
                         </ViewCell>
                     </DataTemplate>

src/Controls/tests/TestCases.HostApp/Issues/Issue18896.xaml.cs

@@ -1,6 +1,6 @@
 namespace Maui.Controls.Sample.Issues
 {
-	[Issue(IssueTracker.ManualTest, "C3", "Can scroll ListView inside RefreshView", PlatformAffected.All, isInternetRequired: true)]
+	[Issue(IssueTracker.ManualTest, "C3", "Can scroll ListView inside RefreshView", PlatformAffected.All)]
 	public partial class Issue18896 : ContentPage
 	{
 		public Issue18896()

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18751.cs

@@ -1,32 +1,24 @@
-#if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_ANDROID //related issues: https://github.com/dotnet/maui/issues/33507, https://github.com/dotnet/maui/issues/15994
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests.Issues
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue18751 : _IssuesUITest
 {
-	public class Issue18751 : _IssuesUITest
+	public Issue18751(TestDevice device) : base(device)
 	{
-		public Issue18751(TestDevice device) : base(device)
-		{
-		}
-
-		public override string Issue => "Can scroll CollectionView inside RefreshView";
-
-		[Test]
-		[Category(UITestCategories.CollectionView)]
-		public async Task Issue18751Test()
-		{
-			VerifyInternetConnectivity();
-
-			App.WaitForElement("WaitForStubControl");
+	}
 
-			// Load images.
-			await Task.Delay(1000);
+	public override string Issue => "Can scroll CollectionView inside RefreshView";
 
-			// The test passes if you are able to see the image, name, and location of each monkey.
-			VerifyScreenshot();
-		}
+	[Test]
+	[Category(UITestCategories.CollectionView)]
+	public void Issue18751Test()
+	{
+		App.WaitForElement("WaitForStubControl");
+		// Load images and hide scrollbar.
+		// The test passes if you are able to see the image, name, and location of each monkey.
+		VerifyScreenshot(retryDelay: TimeSpan.FromSeconds(2));
 	}
-}
-#endif
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18896.cs

@@ -1,40 +1,31 @@
-#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS//Related issues : https://github.com/dotnet/maui/issues/33507, https://github.com/dotnet/maui/issues/18811, https://github.com/dotnet/maui/issues/15994
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests.Issues
-{
-	public class Issue18896 : _IssuesUITest
-	{
-		const string ListView = "TestListView";
+namespace Microsoft.Maui.TestCases.Tests.Issues;
 
-		public Issue18896(TestDevice device) : base(device)
-		{
-		}
+public class Issue18896 : _IssuesUITest
+{
+	const string ListView = "TestListView";
 
-		public override string Issue => "Can scroll ListView inside RefreshView";
+	public Issue18896(TestDevice device) : base(device)
+	{
+	}
 
-		[Test]
-		[Category(UITestCategories.ListView)]
-		[FailsOnIOSWhenRunningOnXamarinUITest("Currently fails on iOS; see https://github.com/dotnet/maui/issues/18811")]
-		[FailsOnMacWhenRunningOnXamarinUITest("Currently fails on Catalyst; see https://github.com/dotnet/maui/issues/18811")]
-		[FailsOnWindowsWhenRunningOnXamarinUITest("Currently fails on Windows; see https://github.com/dotnet/maui/issues/15994")]
-		public void Issue18896Test()
-		{
-			VerifyInternetConnectivity();
-			App.WaitForElement("WaitForStubControl");
+	public override string Issue => "Can scroll ListView inside RefreshView";
 
-			App.ScrollDown(ListView);
+	[Test]
+	[Category(UITestCategories.ListView)]
+	public void Issue18896Test()
+	{
+		App.WaitForElement("WaitForStubControl");
 
-			App.ScrollUp(ListView);
+		App.ScrollDown(ListView);
 
-			// Load images and hide scrollbar.
-			Thread.Sleep(2000);
+		App.ScrollUp(ListView);
 
-			// The test passes if you are able to see the image, name, and location of each monkey.
-			VerifyScreenshot(retryDelay: TimeSpan.FromSeconds(2));
-		}
+		// Load images and hide scrollbar.
+		// The test passes if you are able to see the image, name, and location of each monkey.
+		VerifyScreenshot(retryDelay: TimeSpan.FromSeconds(2));
 	}
-}
-#endif
+}