[Testing] Fix flaky UITests failing sometimes 2 (#27154)

jsuarezruiz · web-flow · commit ffca324af8bd · 2025-01-19T14:00:30.000+01:00
* Fixed Issue2354 UITest

* Avoiding locale-dependent query issues

* Disabled test

* Ignore HeaderFooterStringWorks

* Wait back button before tap it

* Revert change
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue2354.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue2354.cs
@@ -8,16 +8,16 @@ protected override void Init()
 		{
 			var presidents = new List<President>();
 
-			presidents.Add(new President($"Presidente 44", 1, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/Fruits.jpg?raw=true"));
-			presidents.Add(new President($"Presidente 43", 2, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/person.png?raw=true"));
-			presidents.Add(new President($"Presidente 42", 3, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/photo.jpg?raw=true"));
-			presidents.Add(new President($"Presidente 41", 4, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/FlowerBuds.jpg?raw=true"));
-			presidents.Add(new President($"Presidente 40", 5, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/games.png?raw=true"));
-			presidents.Add(new President($"Presidente 39", 6, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/gear.png?raw=true"));
-			presidents.Add(new President($"Presidente 38", 7, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/coffee.png?raw=true"));
-			presidents.Add(new President($"Presidente 37", 8, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/xamarinstore.jpg?raw=true"));
-			presidents.Add(new President($"Presidente 36", 9, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/oasis.jpg?raw=true"));
-			presidents.Add(new President($"Presidente 35", 10, $"https://github.com/dotnet/maui/blob/main/src/Compatibility/ControlGallery/src/Android/Resources/drawable/Vegetables.jpg?raw=true"));
+			presidents.Add(new President($"Presidente 44", 1, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/avatar.png?raw=true"));
+			presidents.Add(new President($"Presidente 43", 2, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/oasis.jpg?raw=true"));
+			presidents.Add(new President($"Presidente 42", 3, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/photo21314.jpg?raw=true"));
+			presidents.Add(new President($"Presidente 41", 4, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/groceries.png?raw=true"));
+			presidents.Add(new President($"Presidente 40", 5, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/avatar.png?raw=true"));
+			presidents.Add(new President($"Presidente 39", 6, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/oasis.jpg?raw=true"));
+			presidents.Add(new President($"Presidente 38", 7, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/photo21314.jpg?raw=true"));
+			presidents.Add(new President($"Presidente 37", 8, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/groceries.png?raw=true"));
+			presidents.Add(new President($"Presidente 36", 9, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/avatar.png?raw=true"));
+			presidents.Add(new President($"Presidente 35", 10, $"https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases.HostApp/Resources/Images/oasis.jpg?raw=true"));
 
 			var header = new Label
 			{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.HeaderAndFooter.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.HeaderAndFooter.cs
@@ -15,7 +15,8 @@ public CollectionViewHeaderAndFooterTests(TestDevice device)
         {
         }
 
-        [Test]
+#if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST // Header not rendering issue: https://github.com/dotnet/maui/issues/27177
+		[Test]
         [Category(UITestCategories.CollectionView)]
         public void HeaderFooterStringWorks()
         {
@@ -28,8 +29,9 @@ public void HeaderFooterStringWorks()
             App.WaitForElement("Just a string as a header");
             App.WaitForElement("This footer is also a string");
         }
+#endif
 
-        [Test]
+		[Test]
         [Category(UITestCategories.CollectionView)]
         public void HeaderFooterViewWorks()
         {
@@ -72,7 +74,7 @@ public void HeaderFooterGridWorks()
             VerifyScreenshot();
         }
 
-        #if TEST_FAILS_ON_IOS
+#if TEST_FAILS_ON_IOS
         // The screenshot that's currently generated for this test is wrong
         // So, we're ignoring this test due to it causing confusion when other changes
         // cause this test to fail.
@@ -93,7 +95,7 @@ public void HeaderFooterGridHorizontalWorks()
 
             VerifyScreenshot();
         }
-        #endif
+#endif
     }
 #endif
-}
+	}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8761.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8761.cs
@@ -1,4 +1,5 @@
-﻿using NUnit.Framework;
+﻿#if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST // Header not rendering issue: https://github.com/dotnet/maui/issues/27177
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -23,4 +24,5 @@ public void CollectionViewHeaderTemplateAndFooterTemplateDontWork()
 			App.WaitForElement("FooterLabel");
 		}
 	}
-}
+}
+#endif
diff --git a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
@@ -1859,7 +1859,7 @@ public static void TapBackArrow(this IApp app, string customBackButtonIdentifier
 		/// <param name="query">The custom IQuery for the back button.</param>
 		public static void TapBackArrow(this IApp app, IQuery query)
 		{
-			app.Tap(query);
+			app.WaitForElement(query).Tap();
 		}
 
 		/// <summary>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ public CollectionViewHeaderAndFooterTests(TestDevice device)`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`- [Test]`
	`18`	`+#if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST // Header not rendering issue: https://github.com/dotnet/maui/issues/27177`
	`19`	`+ [Test]`
`19`	`20`	`[Category(UITestCategories.CollectionView)]`
`20`	`21`	`public void HeaderFooterStringWorks()`
`21`	`22`	`{`
`@@ -28,8 +29,9 @@ public void HeaderFooterStringWorks()`
`28`	`29`	`App.WaitForElement("Just a string as a header");`
`29`	`30`	`App.WaitForElement("This footer is also a string");`
`30`	`31`	`}`
	`32`	`+#endif`
`31`	`33`
`32`		`- [Test]`
	`34`	`+ [Test]`
`33`	`35`	`[Category(UITestCategories.CollectionView)]`
`34`	`36`	`public void HeaderFooterViewWorks()`
`35`	`37`	`{`
`@@ -72,7 +74,7 @@ public void HeaderFooterGridWorks()`
`72`	`74`	`VerifyScreenshot();`
`73`	`75`	`}`
`74`	`76`
`75`		`- #if TEST_FAILS_ON_IOS`
	`77`	`+#if TEST_FAILS_ON_IOS`
`76`	`78`	`// The screenshot that's currently generated for this test is wrong`
`77`	`79`	`// So, we're ignoring this test due to it causing confusion when other changes`
`78`	`80`	`// cause this test to fail.`
`@@ -93,7 +95,7 @@ public void HeaderFooterGridHorizontalWorks()`
`93`	`95`
`94`	`96`	`VerifyScreenshot();`
`95`	`97`	`}`
`96`		`- #endif`
	`98`	`+#endif`
`97`	`99`	`}`
`98`	`100`	`#endif`
`99`		`-}`
	`101`	`+ }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using NUnit.Framework;`
	`1`	`+#if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST // Header not rendering issue: https://github.com/dotnet/maui/issues/27177`
	`2`	`+using NUnit.Framework;`
`2`	`3`	`using UITest.Appium;`
`3`	`4`	`using UITest.Core;`
`4`	`5`
`@@ -23,4 +24,5 @@ public void CollectionViewHeaderTemplateAndFooterTemplateDontWork()`
`23`	`24`	`App.WaitForElement("FooterLabel");`
`24`	`25`	`}`
`25`	`26`	`}`
`26`		`-}`
	`27`	`+}`
	`28`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1859,7 +1859,7 @@ public static void TapBackArrow(this IApp app, string customBackButtonIdentifier`
`1859`	`1859`	`/// <param name="query">The custom IQuery for the back button.</param>`
`1860`	`1860`	`public static void TapBackArrow(this IApp app, IQuery query)`
`1861`	`1861`	`{`
`1862`		`- app.Tap(query);`
	`1862`	`+ app.WaitForElement(query).Tap();`
`1863`	`1863`	`}`
`1864`	`1864`
`1865`	`1865`	`/// <summary>`