Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new WebView2 tests, add focus logging to WebView2 tests, avoid potential flicker when removing #6677

Merged
merged 8 commits into from
Feb 12, 2022
Merged

Add new WebView2 tests, add focus logging to WebView2 tests, avoid potential flicker when removing #6677

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b232dd
Fix flicker when closing WebView2
krschau Feb 3, 2022
51523b0
add tests, focus changes
krschau Feb 3, 2022
bee9cab
Change name to CreateWebView2OffTreeTest
krschau Feb 3, 2022
2a65e74
Add missing border name, change validation for HtmlDropdownTest
krschau Feb 4, 2022
6c69538
Fix tab that was supposed to be shif+tab, move dropdown so we don't h…
krschau Feb 7, 2022
65f8bc6
disable HtmlDropdownTest
krschau Feb 8, 2022
c93fb08
code review changes
krschau Feb 11, 2022
f08a8a3
remove accidentally added patch
krschau Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
387 changes: 177 additions & 210 deletions dev/WebView2/InteractionTests/WebView2Tests.cs
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 9 additions & 18 deletions dev/WebView2/TestUI/WebView2BasicPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<ComboBoxItem AutomationProperties.Name="CoreProcessFailedTest">CoreProcessFailedTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="CoreWebView2InitializedTest">CoreWebView2InitializedTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="CoreWebView2Initialized_FailedTest">CoreWebView2Initialized_FailedTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="CreateWebView2OffTreeTest">CreateWebView2OffTreeTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="CursorUpdateTest">CursorUpdateTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="ExecuteScriptTest">ExecuteScriptTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="Focus_BackAndForthTabTest">Focus_BackAndForthTabTest</ComboBoxItem>
Expand All @@ -43,6 +44,7 @@
<ComboBoxItem AutomationProperties.Name="Focus_ReverseTabTest">Focus_ReverseTabTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="GoBackAndForwardTest">GoBackAndForwardTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="HostNameToFolderMappingTest">HostNameToFolderMappingTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="HtmlDropdownTest">HtmlDropdownTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="MouseCaptureTest">MouseCaptureTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="MouseLeftClickTest">MouseLeftClickTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="MouseMiddleClickTest">MouseMiddleClickTest</ComboBoxItem>
Expand All @@ -59,6 +61,7 @@
<ComboBoxItem AutomationProperties.Name="NavigateToVideoTest">NavigateToVideoTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="NavigationErrorTest">NavigationErrorTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="NavigationStartingTest">NavigationStartingTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="NavigationStartingInvalidTest">NavigationStartingInvalidTest</ComboBoxItem>
krschau marked this conversation as resolved.
Show resolved Hide resolved
<ComboBoxItem AutomationProperties.Name="NonAsciiUriTest">NonAsciiUriTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="ParentVisibilityHiddenTest">ParentVisibilityHiddenTest</ComboBoxItem>
<ComboBoxItem AutomationProperties.Name="ParentVisibilityTurnedOnTest">ParentVisibilityTurnedOnTest</ComboBoxItem>
Expand Down Expand Up @@ -143,25 +146,11 @@
<TextBlock Text="Document Title:" FontWeight="Bold" Margin="0,0,5,0" VerticalAlignment="Center"/>
<Button x:Name="GetDocumentTitleButton" Content="Get" AutomationProperties.AutomationId="GetDocumentTitleButton" Margin="1,0,1,0" contract7Present:CornerRadius="25" Click="OnGetDocumentTitleButtonClicked"/>
<TextBlock x:Name="DocumentTitleTextBlock" AutomationProperties.AutomationId="DocumentTitleTextBlock" Width="1200" IsTextSelectionEnabled="True"/>
</StackPanel>


</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,5">
<TextBlock Text="Focus: " FontWeight="Bold" Margin="0,0,5,0" VerticalAlignment="Center"/>
<StackPanel Orientation="Horizontal" Margin="0,0,15,0">
<TextBlock x:Name="UpdateAnaheimFocusTextBlock" AutomationProperties.Name="UpdateAnaheimFocusTextBlock" contract7Present:HorizontalTextAlignment="Center" Margin="0,0,5,0">
<Run Text="Web "/><LineBreak/><Run Text="(Hover)" />
<ToolTipService.ToolTip>
<ToolTip x:Name="UpdatingAnaheimFocusToolTip" Content="Updating Anaheim Focus..." Opened="UpdatingAnaheimFocusToolTipOpened"/>
</ToolTipService.ToolTip>
</TextBlock>
<TextBlock x:Name="UpdateAnaheimFocusTextBlock2" AutomationProperties.Name="UpdateAnaheimFocusTextBlock2" contract7Present:HorizontalTextAlignment="Center" Margin="0,0,5,0">
<Run Text="Web2 "/><LineBreak/><Run Text="(Hover)" />
<ToolTipService.ToolTip>
<ToolTip x:Name="UpdatingAnaheimFocusToolTip2" Content="Updating Anaheim Focus..." Opened="UpdatingAnaheimFocusToolTipOpenedMultipleWebview"/>
</ToolTipService.ToolTip>
</TextBlock>
<TextBox x:Name="AnaheimFocusTextBox" AutomationProperties.AutomationId="AnaheimFocusTextBox" Width="80" TextAlignment="Left"/>
<TextBox x:Name="AnaheimFocusTextBox" AutomationProperties.AutomationId="AnaheimFocusTextBox" Width="120" TextAlignment="Left"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,15,0">
<TextBlock Text="Xaml Focus:" Margin="0,0,5,0" VerticalAlignment="Center"/>
Expand All @@ -187,8 +176,10 @@
</StackPanel>
<StackPanel Orientation="Vertical">
<TextBlock Text="RTB:" FontWeight="Bold" FontSize="11" Margin="0,2,0,2"/>
<Border Width="400" Height="320" BorderBrush="Blue" x:Name="RTBBorder" AutomationProperties.AutomationId="RTBBorder" BorderThickness="1" HorizontalAlignment="Left" Visibility="Visible">
<Image x:Name="ShowRtb1" AutomationProperties.AutomationId="ShowRtb1" Stretch="None" HorizontalAlignment="Left"/>
<Border Width="400" Height="320" BorderBrush="Blue" BorderThickness="1" HorizontalAlignment="Left" Visibility="Visible">
<ScrollViewer x:Name="focusScrollViewer" VerticalScrollBarVisibility="Visible">
<TextBlock x:Name="focusLog" ></TextBlock>
</ScrollViewer>
</Border>
</StackPanel>
</StackPanel>
Expand Down
Loading