fix: try to fix broken initial nav

unoplatform · May 10, 2022 · 22d69aa · 22d69aa
1 parent 2fd14bc
commit 22d69aa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/src/SamplesApp/SamplesApp.UITests/Microsoft_UI_Xaml_Controls/ExpanderTests/Expander_Tests.cs b/src/SamplesApp/SamplesApp.UITests/Microsoft_UI_Xaml_Controls/ExpanderTests/Expander_Tests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Drawing;
 using NUnit.Framework;
 using SamplesApp.UITests.TestFramework;
 using Uno.UITest.Helpers;
@@ -16,7 +11,8 @@ public partial class Expander_Tests : SampleControlUITestBase
 		[AutoRetry]
 		public void ToggleCollapsedStateToVerifyClipping()
 		{
-			Run("SamplesApp.Samples.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage", skipInitialScreenshot: true);
+			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage");
+
 			var expanderResult = _app.WaitForElement("ExpanderWithColor");
 			var expander = _app.Marked("ExpanderWithColor");
 			var expanderAppRect = ToPhysicalRect(expanderResult[0].Rect);

diff --git a/.../UITests.Shared/Microsoft_UI_Xaml_Controls/ExpanderTests/ExpanderColorValidationPage.xaml b/.../UITests.Shared/Microsoft_UI_Xaml_Controls/ExpanderTests/ExpanderColorValidationPage.xaml
@@ -1,6 +1,7 @@
-<UserControl
-    x:Class="UITests.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<utilities:MUXTestPage
+    x:Class="UITests.Shared.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage"
+	xmlns:utilities="using:MUXControlsTestApp.Utilities"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:UITests.Microsoft_UI_Xaml_Controls.ExpanderTests"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -36,4 +37,4 @@
 				AutomationProperties.AutomationId="ColorfulExpanderContent">Content</TextBlock>
 		</controls:Expander>
     </Grid>
-</UserControl>
+</utilities:MUXTestPage>
diff --git a/...Tests.Shared/Microsoft_UI_Xaml_Controls/ExpanderTests/ExpanderColorValidationPage.xaml.cs b/...Tests.Shared/Microsoft_UI_Xaml_Controls/ExpanderTests/ExpanderColorValidationPage.xaml.cs
@@ -1,10 +1,10 @@
-using Uno.UI.Samples.Controls;
-using Windows.UI.Xaml.Controls;
+using MUXControlsTestApp.Utilities;
+using Uno.UI.Samples.Controls;
 
-namespace UITests.Microsoft_UI_Xaml_Controls.ExpanderTests
+namespace UITests.Shared.Microsoft_UI_Xaml_Controls.ExpanderTests
 {
-	[SampleControlInfo("Expander", "WinUI", Name = "ExpanderClippingSample")]
-	public sealed partial class ExpanderColorValidationPage : UserControl
+	[SampleControlInfo("Expander", "WinUI")]
+	public sealed partial class ExpanderColorValidationPage : MUXTestPage
 	{
 		public ExpanderColorValidationPage()
 		{