Skip to content

Commit 9911727

Browse files
committed
chore: fix tests
1 parent e9d964c commit 9911727

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/xLoad_Back_And_Forth.xaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
44
xmlns:local="using:Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml.Controls"
5+
xmlns:muxcontrols="using:Microsoft.UI.Xaml.Controls"
56
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
67
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
78
mc:Ignorable="d">
89

9-
<NavigationView x:Name="NavView" x:FieldModifier="public" PaneDisplayMode="Left">
10-
<NavigationView.MenuItemTemplate>
10+
<muxcontrols:NavigationView x:Name="NavView" x:FieldModifier="public" PaneDisplayMode="Left">
11+
<muxcontrols:NavigationView.MenuItemTemplate>
1112
<DataTemplate
1213
x:DataType="local:xLoadBackAndForthVM">
13-
<NavigationViewItem x:Name="nvi" IsSelected="{x:Bind IsSelected, Mode=TwoWay}">
14+
<muxcontrols:NavigationViewItem x:Name="nvi" IsSelected="{x:Bind IsSelected, Mode=TwoWay}">
1415
<TextBlock
1516
x:Name="tb"
1617
x:Load="{x:Bind IsSelected, Mode=OneWay}"
1718
Text="visible" />
18-
</NavigationViewItem>
19+
</muxcontrols:NavigationViewItem>
1920
</DataTemplate>
20-
</NavigationView.MenuItemTemplate>
21-
</NavigationView>
21+
</muxcontrols:NavigationView.MenuItemTemplate>
22+
</muxcontrols:NavigationView>
2223
</Page>

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_xLoad.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -495,20 +495,20 @@ public async Task When_xLoad_Set_Back_And_Forth()
495495
var SUT = new xLoad_Back_And_Forth();
496496
await UITestHelper.Load(SUT);
497497

498-
Assert.AreEqual("tb", SUT.FindFirstChild<NavigationViewItem>().FindFirstChild<ElementStub>().Name);
499-
Assert.IsNull(SUT.FindFirstChild<NavigationViewItem>().FindFirstChild<TextBlock>());
498+
Assert.AreEqual("tb", SUT.FindFirstChild<NavigationViewItem>()?.FindFirstChild<ElementStub>()?.Name);
499+
Assert.IsNull(SUT.FindFirstChild<NavigationViewItem>()?.FindFirstChild<TextBlock>());
500500

501501
((List<xLoadBackAndForthVM>)SUT.NavView.MenuItemsSource)[0].IsSelected = true;
502502
await UITestHelper.WaitForIdle();
503503

504-
Assert.AreNotEqual("tb", SUT.FindFirstChild<NavigationViewItem>().FindFirstChild<ElementStub>().Name);
505-
Assert.AreEqual("visible", SUT.FindFirstChild<NavigationViewItem>().FindFirstChild<TextBlock>().Text);
504+
Assert.AreNotEqual("tb", SUT.FindFirstChild<NavigationViewItem>()?.FindFirstChild<ElementStub>()?.Name);
505+
Assert.AreEqual("visible", SUT.FindFirstChild<NavigationViewItem>()?.FindFirstChild<TextBlock>()?.Text);
506506

507507
((List<xLoadBackAndForthVM>)SUT.NavView.MenuItemsSource)[0].IsSelected = false;
508508
await UITestHelper.WaitForIdle();
509509

510-
Assert.AreEqual("tb", SUT.FindFirstChild<NavigationViewItem>().FindFirstChild<ElementStub>().Name);
511-
Assert.IsNull(SUT.FindFirstChild<NavigationViewItem>().FindFirstChild<TextBlock>());
510+
Assert.AreEqual("tb", SUT.FindFirstChild<NavigationViewItem>()?.FindFirstChild<ElementStub>()?.Name);
511+
Assert.IsNull(SUT.FindFirstChild<NavigationViewItem>()?.FindFirstChild<TextBlock>());
512512
}
513513
}
514514
}

0 commit comments

Comments
 (0)