fix: flaky test (#1225)

unoplatform · Aug 18, 2024 · a5f5bbd · a5f5bbd
1 parent dc760b8
commit a5f5bbd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/....Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage2.WinUI.xaml b/....Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage2.WinUI.xaml
@@ -9,9 +9,8 @@
 	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
 	<StackPanel x:Name="sp">
-		<Button x:Name="loadButton" Click="OnLoadButtonClick">Load</Button>
-		<Button x:Name="unloadButton" Click="OnUnloadButtonClick">Unload</Button>
-
+		<Button x:Name="reloadButton" Click="OnReload">Reload</Button>
+		<TextBlock x:Name="testStatus" Text="Not Run" />
 		<utu:ShadowContainer x:Name="shadowContainer">
 			<utu:ShadowContainer.Shadows>
 				<utu:ShadowCollection>

diff --git a/...mples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage2.WinUI.xaml.cs b/...mples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage2.WinUI.xaml.cs
@@ -16,6 +16,7 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using System.Threading.Tasks;
 
 namespace Uno.Toolkit.Samples.Content.TestPages
 {
@@ -31,14 +32,21 @@ public ShadowContainerTestPage2()
 			this.InitializeComponent();
 		}
 
-		private void OnLoadButtonClick(object sender, RoutedEventArgs e)
+		private void OnReload(object sender, RoutedEventArgs e)
 		{
-			sp.Children.Add(shadowContainer);
-		}
+			testStatus.Text = "Running test...";
 
-		private void OnUnloadButtonClick(object sender, RoutedEventArgs e)
-		{
-			sp.Children.Remove(shadowContainer);
+			try
+			{
+				sp.Children.Remove(shadowContainer);
+				sp.Children.Add(shadowContainer);
+				sp.Children.Remove(shadowContainer);
+				sp.Children.Add(shadowContainer);
+			}
+			finally
+			{
+				testStatus.Text = "Completed";
+			}
 		}
 	}
 }

diff --git a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer2.cs b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer2.cs
@@ -21,17 +21,10 @@ public void When_Unloaded_Then_Loaded()
 		{
 			using var screenshot1 = TakeScreenshot("initial");
 
-			var loadButton = App.MarkedAnywhere("loadButton");
-			var unloadButton = App.MarkedAnywhere("unloadButton");
+			var testStatus = App.MarkedAnywhere("testStatus");
+			var loadButton = App.MarkedAnywhere("reloadButton").FastTap();
 
-			unloadButton.FastTap();
-			App.Wait(TimeSpan.FromSeconds(0.25));
-			loadButton.FastTap();
-			App.Wait(TimeSpan.FromSeconds(0.25));
-			unloadButton.FastTap();
-			App.Wait(TimeSpan.FromSeconds(0.25));
-			loadButton.FastTap();
-			App.Wait(TimeSpan.FromSeconds(0.25));
+			App.WaitForDependencyPropertyValue(testStatus, "Text", "Completed");
 
 			using var screenshot2 = TakeScreenshot("reloaded");