Writer: add AutomationIds

Author: jbe2277

src/System.Waf/Samples/Writer/Writer.Presentation/Views/MainView.xaml

@@ -57,28 +57,23 @@
                         <Setter.Value>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock VerticalAlignment="Center">
-                                    <TextBlock.Text>
-                                        <MultiBinding Converter="{StaticResource TabFileNameConverter}">
-                                            <Binding Path="Document.FileName"/>
-                                            <Binding Path="Document.Modified"/>
-                                        </MultiBinding>
-                                    </TextBlock.Text>
+                                    <TextBlock VerticalAlignment="Center" AutomationProperties.AutomationId="TabName">
+                                        <TextBlock.Text>
+                                            <MultiBinding Converter="{StaticResource TabFileNameConverter}">
+                                                <Binding Path="Document.FileName"/>
+                                                <Binding Path="Document.Modified"/>
+                                            </MultiBinding>
+                                        </TextBlock.Text>
                                     </TextBlock>
                                     <Button Command="{Binding DataContext.FileService.CloseCommand, ElementName=rootContainer}" Content="{StaticResource CloseSmallImage}"
-                                        Visibility="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabItem}},
-                                            Converter={StaticResource BoolToVisibilityConverter}}"
-                                        Width="16" Height="16" BorderThickness="0"
-                                        MinWidth="0" MinHeight="0" Padding="0" Margin="7,0,0,0">
+                                        Visibility="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabItem}}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                        Width="16" Height="16" BorderThickness="0" MinWidth="0" MinHeight="0" Padding="0" Margin="7,0,0,0" AutomationProperties.AutomationId="CloseButton">
                                         <Button.Template>
                                             <ControlTemplate TargetType="{x:Type Button}">
                                                 <ContentPresenter Margin="{TemplateBinding Control.Padding}" 
-                                                                HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                                                                VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
-                                                                SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"
-                                                                ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
-                                                                RecognizesAccessKey="True"
-                                                                Content="{TemplateBinding ContentControl.Content}"/>
+                                                        HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
+                                                        SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                                                        RecognizesAccessKey="True" Content="{TemplateBinding ContentControl.Content}"/>
                                             </ControlTemplate>
                                         </Button.Template>
                                     </Button>

src/System.Waf/Samples/Writer/Writer.Presentation/Views/SaveChangesWindow.xaml

@@ -7,7 +7,7 @@
     xmlns:dd="clr-namespace:Waf.Writer.Presentation.DesignData"
     mc:Ignorable="d" d:DataContext="{d:DesignInstance dd:SampleSaveChangesViewModel, IsDesignTimeCreatable=True}"
     Title="{Binding Title}" MinWidth="440" MinHeight="300" SizeToContent="WidthAndHeight" ShowInTaskbar="False" 
-    Icon="{StaticResource WriterImageSource}">
+    Icon="{StaticResource WriterImageSource}" AutomationProperties.AutomationId="SaveChangesWindow">
 
     <Grid Margin="0,0,11,11">
         <Grid.ColumnDefinitions>
@@ -26,13 +26,13 @@
 
         <Border BorderBrush="#828790" BorderThickness="1" Grid.ColumnSpan="4" Grid.Row="1" Margin="11,11,0,11">
             <ScrollViewer Padding="4">
-                <ItemsControl ItemsSource="{Binding Documents}" DisplayMemberPath="FileName"/>
+                <ItemsControl ItemsSource="{Binding Documents}" DisplayMemberPath="FileName" AutomationProperties.AutomationId="FilesToSaveList"/>
             </ScrollViewer>
         </Border>
-        
-        <Button Command="{Binding YesCommand}" Content="{x:Static p:Resources.YesMenu}" IsDefault="True" Grid.Column="1" Grid.Row="2"/>
-        <Button Command="{Binding NoCommand}" Content="{x:Static p:Resources.NoMenu}" Grid.Column="2" Grid.Row="2"/>
-        <Button Content="{x:Static p:Resources.CancelMenu}" IsCancel="True" Grid.Column="3" Grid.Row="2"/>
+
+        <Button Command="{Binding YesCommand}" Content="{x:Static p:Resources.YesMenu}" IsDefault="True" Grid.Column="1" Grid.Row="2" AutomationProperties.AutomationId="YesButton"/>
+        <Button Command="{Binding NoCommand}" Content="{x:Static p:Resources.NoMenu}" Grid.Column="2" Grid.Row="2" AutomationProperties.AutomationId="NoButton"/>
+        <Button Content="{x:Static p:Resources.CancelMenu}" IsCancel="True" Grid.Column="3" Grid.Row="2" AutomationProperties.AutomationId="CancelButton"/>
     </Grid>
 
 </Window>