Skip to content

Commit 22d69aa

Browse files
committed
fix: try to fix broken initial nav
1 parent 2fd14bc commit 22d69aa

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

src/SamplesApp/SamplesApp.UITests/Microsoft_UI_Xaml_Controls/ExpanderTests/Expander_Tests.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Drawing;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Threading.Tasks;
1+
using System.Drawing;
72
using NUnit.Framework;
83
using SamplesApp.UITests.TestFramework;
94
using Uno.UITest.Helpers;
@@ -16,7 +11,8 @@ public partial class Expander_Tests : SampleControlUITestBase
1611
[AutoRetry]
1712
public void ToggleCollapsedStateToVerifyClipping()
1813
{
19-
Run("SamplesApp.Samples.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage", skipInitialScreenshot: true);
14+
Run("UITests.Shared.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage");
15+
2016
var expanderResult = _app.WaitForElement("ExpanderWithColor");
2117
var expander = _app.Marked("ExpanderWithColor");
2218
var expanderAppRect = ToPhysicalRect(expanderResult[0].Rect);

src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ExpanderTests/ExpanderColorValidationPage.xaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<UserControl
2-
x:Class="UITests.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage"
3-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<utilities:MUXTestPage
2+
x:Class="UITests.Shared.Microsoft_UI_Xaml_Controls.ExpanderTests.ExpanderColorValidationPage"
3+
xmlns:utilities="using:MUXControlsTestApp.Utilities"
4+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
45
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
56
xmlns:local="using:UITests.Microsoft_UI_Xaml_Controls.ExpanderTests"
67
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -36,4 +37,4 @@
3637
AutomationProperties.AutomationId="ColorfulExpanderContent">Content</TextBlock>
3738
</controls:Expander>
3839
</Grid>
39-
</UserControl>
40+
</utilities:MUXTestPage>

src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ExpanderTests/ExpanderColorValidationPage.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using Uno.UI.Samples.Controls;
2-
using Windows.UI.Xaml.Controls;
1+
using MUXControlsTestApp.Utilities;
2+
using Uno.UI.Samples.Controls;
33

4-
namespace UITests.Microsoft_UI_Xaml_Controls.ExpanderTests
4+
namespace UITests.Shared.Microsoft_UI_Xaml_Controls.ExpanderTests
55
{
6-
[SampleControlInfo("Expander", "WinUI", Name = "ExpanderClippingSample")]
7-
public sealed partial class ExpanderColorValidationPage : UserControl
6+
[SampleControlInfo("Expander", "WinUI")]
7+
public sealed partial class ExpanderColorValidationPage : MUXTestPage
88
{
99
public ExpanderColorValidationPage()
1010
{

0 commit comments

Comments
 (0)