Cleanup NavView tests (microsoft/microsoft-ui-xaml#2771)

Kinnara · Jul 3, 2020 · 58198de · 58198de
1 parent 77abc41
commit 58198de
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/test/NavigationView_TestUI/NavigationViewItemTemplatePage.xaml b/test/NavigationView_TestUI/NavigationViewItemTemplatePage.xaml
@@ -9,14 +9,22 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="Plum">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
         <Grid.Resources>
             <local:Customers x:Key="customers"/>
         </Grid.Resources>
+        <Button AutomationProperties.Name="FocusAnchorButton">I'm just for grabbing focus</Button>
         <controls:NavigationView 
             x:Name="NavView" 
             PaneDisplayMode="Top"
-            MenuItemsSource="{StaticResource customers}">
+            SelectionChanged="NavView_SelectionChanged"
+            MenuItemsSource="{StaticResource customers}"
+            Grid.Row="1">
             <controls:NavigationView.MenuItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
@@ -28,6 +36,7 @@
 
             <StackPanel Orientation="Vertical" Margin="8,0,0,0">
                 <Button x:Name="FlipOrientation" AutomationProperties.Name="FlipOrientationButton" Content="Flip Orientation" Click="FlipOrientation_Click"/>
+                <TextBlock x:Name="SelectionEventResult" AutomationProperties.Name="SelectionEventResult"></TextBlock>
             </StackPanel>
         </controls:NavigationView>
     </Grid>

diff --git a/test/NavigationView_TestUI/NavigationViewItemTemplatePage.xaml.cs b/test/NavigationView_TestUI/NavigationViewItemTemplatePage.xaml.cs
@@ -55,5 +55,19 @@ private void FlipOrientation_Click(object sender, RoutedEventArgs e)
         {
             NavView.PaneDisplayMode = NavView.PaneDisplayMode == NavigationViewPaneDisplayMode.Top ? NavigationViewPaneDisplayMode.Auto : NavigationViewPaneDisplayMode.Top;
         }
+
+        private void NavView_SelectionChanged(ModernWpf.Controls.NavigationView sender, ModernWpf.Controls.NavigationViewSelectionChangedEventArgs args)
+        {
+            var children = (StackPanel)args.SelectedItemContainer.Content;
+            var customer = (Customer)args.SelectedItem;
+            if(children != null && customer != null)
+            {
+                SelectionEventResult.Text = "Passed";
+            }
+            else
+            {
+                SelectionEventResult.Text = "Failed";
+            }
+        }
     }
 }