Log UI data for failure (#20888)

* Log UI data for failure * - add sleep * - change appium tests to be single task
dotnet · Feb 28, 2024 · 4c699ce · 4c699ce
1 parent b11b845
commit 4c699ce
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Android/MainActivity.cs b/src/Controls/samples/Controls.Sample.UITests/Platforms/Android/MainActivity.cs
@@ -8,6 +8,7 @@ namespace Maui.Controls.Sample.Platform
 	[Activity(
 		Theme = "@style/Maui.SplashTheme",
 		MainLauncher = true,
+		LaunchMode = LaunchMode.SingleTask,
 		ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode)]
 	[IntentFilter(
 		new[] { Microsoft.Maui.ApplicationModel.Platform.Intent.ActionAppAction },

diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue11501.cs b/src/Controls/tests/UITests/Tests/Issues/Issue11501.cs
@@ -16,25 +16,25 @@ public Issue11501(TestDevice device) : base(device)
 		[TestCase("SwapFlyoutPage")]
 		[TestCase("SwapTabbedPage")]
 		[TestCase("RemoveAddTabs")]
-		public async Task MakingFragmentRelatedChangesWhileAppIsBackgroundedFails(string scenario)
+		public void MakingFragmentRelatedChangesWhileAppIsBackgroundedFails(string scenario)
 		{
 			this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows });
 
 			try
 			{
 				App.WaitForElement(scenario);
 				App.Click(scenario);
+				App.WaitForElement("BackgroundMe");
 				App.BackgroundApp();
-
-				// Wait for app to finish backgrounding
-				await Task.Yield();
 				App.WaitForNoElement("BackgroundMe");
 				App.ForegroundApp();
 				App.WaitForElement("Restore");
 				App.Click("Restore");
 			}
 			catch
 			{
+				SaveUIDiagnosticInfo();
+
 				// Just in case these tests leave the app in an unreliable state
 				App.ResetApp();
 				FixtureSetup();

diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
@@ -74,6 +74,8 @@ CommandResponse BackgroundApp(IDictionary<string, object> parameters)
 				return CommandResponse.FailedEmptyResponse;
 
 			_app.Driver.BackgroundApp();
+			if (_app.GetTestDevice() == TestDevice.Android)
+				Thread.Sleep(500);
 
 			return CommandResponse.SuccessEmptyResponse;
 		}

diff --git a/src/TestUtils/src/UITest.NUnit/UITestBase.cs b/src/TestUtils/src/UITest.NUnit/UITestBase.cs
@@ -131,7 +131,7 @@ void SaveDeviceDiagnosticInfo([CallerMemberName] string? note = null)
 			}
 		}
 
-		void SaveUIDiagnosticInfo([CallerMemberName] string? note = null)
+		protected void SaveUIDiagnosticInfo([CallerMemberName] string? note = null)
 		{
 			var screenshotPath = GetGeneratedFilePath("ScreenShot.png", note);
 			if (screenshotPath is not null)