[Testing] Resolved bunch of Android UI Test random failures in CI. (#27066)

anandhan-rajagopal · web-flow · commit 4b512438bb33 · 2025-01-11T10:32:06.000+01:00
* Resolved android bunch test failure cases in CI

* Addressed review concerns
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class BorderUITests : UITest
+	public class BorderUITests : CoreGalleryBasePageTest
 	{
 		const string BorderGallery = "Border Gallery";
 
@@ -13,9 +13,8 @@ public BorderUITests(TestDevice device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(BorderGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public abstract class CollectionViewUITests : UITest
+	public abstract class CollectionViewUITests : CoreGalleryBasePageTest
 	{
 		const string CollectionViewGallery = "CollectionView Gallery";
 
@@ -13,9 +13,8 @@ public CollectionViewUITests(TestDevice device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(CollectionViewGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs
@@ -1,4 +1,5 @@
 ﻿using NUnit.Framework;
+using UITest.Appium;
 using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests
@@ -23,6 +24,7 @@ protected override void FixtureSetup()
 					TestContext.Error.WriteLine($">>>>> {DateTime.Now} The FixtureSetup threw an exception. Attempt {retries}/{SetupMaxRetries}.{Environment.NewLine}Exception details: {e}");
 					if (retries++ < SetupMaxRetries)
 					{
+						App.Back();
 						Reset();
 					}
 					else
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs
@@ -6,17 +6,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class DragAndDropUITests : UITest
+	public class DragAndDropUITests : CoreGalleryBasePageTest
 	{
 		const string DragAndDropGallery = "Drag and Drop Gallery";
 		public DragAndDropUITests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(DragAndDropGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs
@@ -5,17 +5,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class GestureRecognizerUITests : UITest
+	public class GestureRecognizerUITests : CoreGalleryBasePageTest
 	{
 		const string GestureRecognizerGallery = "Gesture Recognizer Gallery";
 		public GestureRecognizerUITests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(GestureRecognizerGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs
@@ -35,6 +35,7 @@ protected override void FixtureSetup()
 					TestContext.Error.WriteLine($">>>>> {DateTime.Now} The FixtureSetup threw an exception. Attempt {retries}/{SetupMaxRetries}.{Environment.NewLine}Exception details: {e}");
 					if (retries++ < SetupMaxRetries)
 					{
+						App.Back();
 						Reset();
 					}
 					else
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class KeyboardScrollingGridTests : UITest
+	public class KeyboardScrollingGridTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Grid with Star Row";
 		
@@ -13,9 +13,8 @@ public KeyboardScrollingGridTests(TestDevice device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs
@@ -5,17 +5,16 @@
 namespace Microsoft.Maui.TestCases.Tests
 {
 	[Category(UITestCategories.Layout)]
-	public class KeyboardScrollingNonScrollingPageLargeTitlesTests : UITest
+	public class KeyboardScrollingNonScrollingPageLargeTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles";
 		public KeyboardScrollingNonScrollingPageLargeTitlesTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs
@@ -4,17 +4,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class KeyboardScrollingNonScrollingPageSmallTitlesTests : UITest
+	public class KeyboardScrollingNonScrollingPageSmallTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles";
 		public KeyboardScrollingNonScrollingPageSmallTitlesTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs
@@ -4,17 +4,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class KeyboardScrollingScrollingPageLargeTitlesTests : UITest
+	public class KeyboardScrollingScrollingPageLargeTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Large Titles";
 		public KeyboardScrollingScrollingPageLargeTitlesTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs
@@ -4,17 +4,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class KeyboardScrollingScrollingPageSmallTitlesTests : UITest
+	public class KeyboardScrollingScrollingPageSmallTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Small Titles";
 		public KeyboardScrollingScrollingPageSmallTitlesTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Maui.TestCases.Tests
 {
 	[Category(UITestCategories.ScrollView)]
-	public class ScrollToUITests : UITest
+	public class ScrollToUITests : CoreGalleryBasePageTest
 	{
 		const string LayoutGallery = "ScrollView Gallery";
 
@@ -14,9 +14,8 @@ public ScrollToUITests(TestDevice device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(LayoutGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class SliderUITests : UITest
+	public class SliderUITests : CoreGalleryBasePageTest
 	{
 		public const string SliderGallery = "Slider Gallery";
 
@@ -14,9 +14,8 @@ public SliderUITests(TestDevice device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(SliderGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/StepperUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/StepperUITests.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Maui.TestCases.Tests
 {
 	[Category(UITestCategories.Stepper)]
-	public class StepperUITests : UITest
+	public class StepperUITests : CoreGalleryBasePageTest
 	{
 		public const string StepperGallery = "Stepper Gallery";
 
@@ -16,9 +16,8 @@ public StepperUITests(TestDevice device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(StepperGallery);
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class SwipeViewUITests : UITest
+	public class SwipeViewUITests : CoreGalleryBasePageTest
 	{
 		const string ScrollViewGallery = "SwipeView Gallery";
 
@@ -20,9 +20,8 @@ public SwipeViewUITests(TestDevice device)
 		{
 		}
 
-		protected override void FixtureSetup()
+		protected override void NavigateToGallery()
 		{
-			base.FixtureSetup();
 			App.NavigateToGallery(ScrollViewGallery);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Maui.TestCases.Tests`
`6`	`6`	`{`
`7`		`- public class BorderUITests : UITest`
	`7`	`+ public class BorderUITests : CoreGalleryBasePageTest`
`8`	`8`	`{`
`9`	`9`	`const string BorderGallery = "Border Gallery";`
`10`	`10`
`@@ -13,9 +13,8 @@ public BorderUITests(TestDevice device)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override void FixtureSetup()`
	`16`	`+ protected override void NavigateToGallery()`
`17`	`17`	`{`
`18`		`- base.FixtureSetup();`
`19`	`18`	`App.NavigateToGallery(BorderGallery);`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Maui.TestCases.Tests`
`6`	`6`	`{`
`7`		`- public abstract class CollectionViewUITests : UITest`
	`7`	`+ public abstract class CollectionViewUITests : CoreGalleryBasePageTest`
`8`	`8`	`{`
`9`	`9`	`const string CollectionViewGallery = "CollectionView Gallery";`
`10`	`10`
`@@ -13,9 +13,8 @@ public CollectionViewUITests(TestDevice device)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override void FixtureSetup()`
	`16`	`+ protected override void NavigateToGallery()`
`17`	`17`	`{`
`18`		`- base.FixtureSetup();`
`19`	`18`	`App.NavigateToGallery(CollectionViewGallery);`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using NUnit.Framework;`
	`2`	`+using UITest.Appium;`
`2`	`3`	`using UITest.Core;`
`3`	`4`
`4`	`5`	`namespace Microsoft.Maui.TestCases.Tests`
`@@ -23,6 +24,7 @@ protected override void FixtureSetup()`
`23`	`24`	`TestContext.Error.WriteLine($">>>>> {DateTime.Now} The FixtureSetup threw an exception. Attempt {retries}/{SetupMaxRetries}.{Environment.NewLine}Exception details: {e}");`
`24`	`25`	`if (retries++ < SetupMaxRetries)`
`25`	`26`	`{`
	`27`	`+ App.Back();`
`26`	`28`	`Reset();`
`27`	`29`	`}`
`28`	`30`	`else`
Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,16 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.Maui.TestCases.Tests`
`8`	`8`	`{`
`9`		`- public class DragAndDropUITests : UITest`
	`9`	`+ public class DragAndDropUITests : CoreGalleryBasePageTest`
`10`	`10`	`{`
`11`	`11`	`const string DragAndDropGallery = "Drag and Drop Gallery";`
`12`	`12`	`public DragAndDropUITests(TestDevice device)`
`13`	`13`	`: base(device)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`- protected override void FixtureSetup()`
	`17`	`+ protected override void NavigateToGallery()`
`18`	`18`	`{`
`19`		`- base.FixtureSetup();`
`20`	`19`	`App.NavigateToGallery(DragAndDropGallery);`
`21`	`20`	`}`
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,16 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.Maui.TestCases.Tests`
`7`	`7`	`{`
`8`		`- public class GestureRecognizerUITests : UITest`
	`8`	`+ public class GestureRecognizerUITests : CoreGalleryBasePageTest`
`9`	`9`	`{`
`10`	`10`	`const string GestureRecognizerGallery = "Gesture Recognizer Gallery";`
`11`	`11`	`public GestureRecognizerUITests(TestDevice device)`
`12`	`12`	`: base(device)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override void FixtureSetup()`
	`16`	`+ protected override void NavigateToGallery()`
`17`	`17`	`{`
`18`		`- base.FixtureSetup();`
`19`	`18`	`App.NavigateToGallery(GestureRecognizerGallery);`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ protected override void FixtureSetup()`
`35`	`35`	`TestContext.Error.WriteLine($">>>>> {DateTime.Now} The FixtureSetup threw an exception. Attempt {retries}/{SetupMaxRetries}.{Environment.NewLine}Exception details: {e}");`
`36`	`36`	`if (retries++ < SetupMaxRetries)`
`37`	`37`	`{`
	`38`	`+ App.Back();`
`38`	`39`	`Reset();`
`39`	`40`	`}`
`40`	`41`	`else`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Maui.TestCases.Tests`
`6`	`6`	`{`
`7`		`- public class KeyboardScrollingGridTests : UITest`
	`7`	`+ public class KeyboardScrollingGridTests : CoreGalleryBasePageTest`
`8`	`8`	`{`
`9`	`9`	`const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Grid with Star Row";`
`10`	`10`
`@@ -13,9 +13,8 @@ public KeyboardScrollingGridTests(TestDevice device)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override void FixtureSetup()`
	`16`	`+ protected override void NavigateToGallery()`
`17`	`17`	`{`
`18`		`- base.FixtureSetup();`
`19`	`18`	`App.NavigateToGallery(KeyboardScrollingGallery);`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,16 @@`
`5`	`5`	`namespace Microsoft.Maui.TestCases.Tests`
`6`	`6`	`{`
`7`	`7`	`[Category(UITestCategories.Layout)]`
`8`		`- public class KeyboardScrollingNonScrollingPageLargeTitlesTests : UITest`
	`8`	`+ public class KeyboardScrollingNonScrollingPageLargeTitlesTests : CoreGalleryBasePageTest`
`9`	`9`	`{`
`10`	`10`	`const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles";`
`11`	`11`	`public KeyboardScrollingNonScrollingPageLargeTitlesTests(TestDevice device)`
`12`	`12`	`: base(device)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override void FixtureSetup()`
	`16`	`+ protected override void NavigateToGallery()`
`17`	`17`	`{`
`18`		`- base.FixtureSetup();`
`19`	`18`	`App.NavigateToGallery(KeyboardScrollingGallery);`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -4,17 +4,16 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Maui.TestCases.Tests`
`6`	`6`	`{`
`7`		`- public class KeyboardScrollingNonScrollingPageSmallTitlesTests : UITest`
	`7`	`+ public class KeyboardScrollingNonScrollingPageSmallTitlesTests : CoreGalleryBasePageTest`
`8`	`8`	`{`
`9`	`9`	`const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles";`
`10`	`10`	`public KeyboardScrollingNonScrollingPageSmallTitlesTests(TestDevice device)`
`11`	`11`	`: base(device)`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`- protected override void FixtureSetup()`
	`15`	`+ protected override void NavigateToGallery()`
`16`	`16`	`{`
`17`		`- base.FixtureSetup();`
`18`	`17`	`App.NavigateToGallery(KeyboardScrollingGallery);`
`19`	`18`	`}`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -4,17 +4,16 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Maui.TestCases.Tests`
`6`	`6`	`{`
`7`		`- public class KeyboardScrollingScrollingPageLargeTitlesTests : UITest`
	`7`	`+ public class KeyboardScrollingScrollingPageLargeTitlesTests : CoreGalleryBasePageTest`
`8`	`8`	`{`
`9`	`9`	`const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Large Titles";`
`10`	`10`	`public KeyboardScrollingScrollingPageLargeTitlesTests(TestDevice device)`
`11`	`11`	`: base(device)`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`- protected override void FixtureSetup()`
	`15`	`+ protected override void NavigateToGallery()`
`16`	`16`	`{`
`17`		`- base.FixtureSetup();`
`18`	`17`	`App.NavigateToGallery(KeyboardScrollingGallery);`
`19`	`18`	`}`
`20`	`19`