feat: Enhance support for focus management

Co-authored-by: Martin Zikmund <[email protected]>

src/Directory.Build.targets

@@ -23,8 +23,8 @@
 	<PackageReference Update="Uno.Core" Version="2.4.0" />
 	<PackageReference Update="Uno.Core.Build" Version="2.4.0" />
 	<PackageReference Update="Uno.Diagnostics.Eventing" Version="1.0.4" />
-	<PackageReference Update="Uno.Wasm.Bootstrap" Version="2.0.0-dev.180" />
-	<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.180" />
+	<PackageReference Update="Uno.Wasm.Bootstrap" Version="2.1.0" />
+	<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="2.1.0" />
 	<PackageReference Update="xamarin.build.download" Version="0.10.0" PrivateAssets="all" />
 	<PackageReference Update="MSTest.TestAdapter" Version="2.2.5-preview-20210605-01" />
 	<PackageReference Update="MSTest.TestFramework" Version="2.2.5-preview-20210605-01" />
@@ -34,10 +34,10 @@
 	<PackageReference Update="Microsoft.TypeScript.MSBuild" Version="4.3.2" />
 	<PackageReference Update="NUnit" Version="3.13.2" />
 	<PackageReference Update="NUnit3TestAdapter" Version="4.0.0" />
-	<PackageReference Update="Uno.UITest" Version="1.1.0-dev.11" />
-	<PackageReference Update="Uno.UITest.Selenium" Version="1.1.0-dev.11" />
-	<PackageReference Update="Uno.UITest.Xamarin" Version="1.1.0-dev.11" />
-	<PackageReference Update="Uno.UITest.Helpers" Version="1.1.0-dev.11" />
+	<PackageReference Update="Uno.UITest" Version="1.1.0-dev.24" />
+	<PackageReference Update="Uno.UITest.Selenium" Version="1.1.0-dev.24" />
+	<PackageReference Update="Uno.UITest.Xamarin" Version="1.1.0-dev.24" />
+	<PackageReference Update="Uno.UITest.Helpers" Version="1.1.0-dev.24" />
 	<PackageReference Update="System.ValueTuple" Version="4.5.0" />
 	<PackageReference Update="Xamarin.DuoSdk" Version="0.0.3.4" />
 	<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />

src/SamplesApp/SamplesApp.UITests/SamplesApp.UITests.csproj

@@ -9,7 +9,7 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
 		<PackageReference Include="NUnit" />
 		<PackageReference Include="NUnit3TestAdapter" /> 
-		<PackageReference Include="Xamarin.UITest" Version="3.0.15" />
+		<PackageReference Include="Xamarin.UITest" Version="3.0.19" />
 		<PackageReference Include="Uno.UITest" />
 		<PackageReference Include="Uno.UITest.Selenium" />
 		<PackageReference Include="Uno.UITest.Xamarin" />

src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/FocusManagerDirectionTests/UnoSamples_Tests.FocusManagerDirection.cs

@@ -35,7 +35,7 @@ private void ChangeFocusAndAssertBeforeAfter(IApp app, Action<IApp> changeFocus,
 		[ActivePlatforms(Platform.Android)] // Wasm and Ios is disabled https://github.com/unoplatform/uno/issues/2476
 		public void FocusManager_FocusDirection_Next_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_FocusDirection");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_FocusDirection");
 
 			var firstTextBox = _app.Marked("FirstTextBox");
 			var secondTextBox = _app.Marked("SecondTextBox");
@@ -54,7 +54,7 @@ public void FocusManager_FocusDirection_Next_Validation()
 		[ActivePlatforms(Platform.Android)] // Wasm and Ios is disabled https://github.com/unoplatform/uno/issues/2476
 		public void FocusManager_FocusDirection_Previous_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_FocusDirection");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_FocusDirection");
 
 			var fourthTextBox = _app.Marked("FourthTextBox");
 			var fifthTextBox = _app.Marked("FifthTextBox");
@@ -72,7 +72,7 @@ public void FocusManager_FocusDirection_Previous_Validation()
 		[ActivePlatforms(Platform.iOS, Platform.Android)] // Wasm is disabled https://github.com/unoplatform/uno/issues/2476
 		public void FocusManager_FocusDirection_Up_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_FocusDirection");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_FocusDirection");
 
 			var secondTextBox = _app.Marked("SecondTextBox");
 			var fifthTextBox = _app.Marked("FifthTextBox");
@@ -90,7 +90,7 @@ public void FocusManager_FocusDirection_Up_Validation()
 		[ActivePlatforms(Platform.iOS, Platform.Android)] // Wasm is disabled https://github.com/unoplatform/uno/issues/2476
 		public void FocusManager_FocusDirection_Down_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_FocusDirection");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_FocusDirection");
 
 			var secondTextBox = _app.Marked("SecondTextBox");
 			var fifthTextBox = _app.Marked("FifthTextBox");
@@ -108,7 +108,7 @@ public void FocusManager_FocusDirection_Down_Validation()
 		[ActivePlatforms(Platform.Android)] // Wasm and Ios is disabled https://github.com/unoplatform/uno/issues/2476
 		public void FocusManager_FocusDirection_Left_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_FocusDirection");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_FocusDirection");
 
 			var fourthTextBox = _app.Marked("FourthTextBox");
 			var fifthTextBox = _app.Marked("FifthTextBox");
@@ -126,7 +126,7 @@ public void FocusManager_FocusDirection_Left_Validation()
 		[ActivePlatforms(Platform.Android)] // Wasm and Ios is disabled https://github.com/unoplatform/uno/issues/2476
 		public void FocusManager_FocusDirection_Right_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_FocusDirection");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_FocusDirection");
 
 			var firstTextBox = _app.Marked("FirstTextBox");
 			var secondTextBox = _app.Marked("SecondTextBox");

src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/FocusManagerTests/UnoSamples_Tests.FocusManager.cs

@@ -19,7 +19,7 @@ public partial class FocusManagerTests_Tests : SampleControlUITestBase
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_Border_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -43,7 +43,7 @@ public void FocusManager_GetFocusedElement_Border_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_Button_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -67,7 +67,7 @@ public void FocusManager_GetFocusedElement_Button_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_Button_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -94,7 +94,7 @@ public void FocusManager_GetFocusedElement_Button_LostFocus_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_CheckBox_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -118,7 +118,7 @@ public void FocusManager_GetFocusedElement_CheckBox_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_CheckBox_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -145,7 +145,7 @@ public void FocusManager_GetFocusedElement_CheckBox_LostFocus_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_Grid_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -169,7 +169,7 @@ public void FocusManager_GetFocusedElement_Grid_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_HyperlinkButton_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -196,7 +196,7 @@ public void FocusManager_GetFocusedElement_HyperlinkButton_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_HyperlinkButton_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -223,7 +223,7 @@ public void FocusManager_GetFocusedElement_HyperlinkButton_LostFocus_Validation(
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_Image_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -247,7 +247,7 @@ public void FocusManager_GetFocusedElement_Image_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_Rectangle_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -271,7 +271,7 @@ public void FocusManager_GetFocusedElement_Rectangle_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_TextBlock_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -295,7 +295,7 @@ public void FocusManager_GetFocusedElement_TextBlock_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_TextBoxMultiLine_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -320,7 +320,7 @@ public void FocusManager_GetFocusedElement_TextBoxMultiLine_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_TextBoxMultiLine_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -347,7 +347,7 @@ public void FocusManager_GetFocusedElement_TextBoxMultiLine_LostFocus_Validation
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_TextBoxSingleLine_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -371,7 +371,7 @@ public void FocusManager_GetFocusedElement_TextBoxSingleLine_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_TextBoxSingleLine_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -398,7 +398,7 @@ public void FocusManager_GetFocusedElement_TextBoxSingleLine_LostFocus_Validatio
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ToggleButton_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -422,7 +422,7 @@ public void FocusManager_GetFocusedElement_ToggleButton_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ToggleButton_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -449,7 +449,7 @@ public void FocusManager_GetFocusedElement_ToggleButton_LostFocus_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ComboBox_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -476,7 +476,7 @@ public void FocusManager_GetFocusedElement_ComboBox_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ComboBox_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -505,7 +505,7 @@ public void FocusManager_GetFocusedElement_ComboBox_LostFocus_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ComboBoxItem_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -533,7 +533,7 @@ public void FocusManager_GetFocusedElement_ComboBoxItem_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ComboBoxItem_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -564,7 +564,7 @@ public void FocusManager_GetFocusedElement_ComboBoxItem_LostFocus_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ScrollViewer_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -589,7 +589,7 @@ public void FocusManager_GetFocusedElement_ScrollViewer_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ListViewItem_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 
@@ -614,7 +614,7 @@ public void FocusManager_GetFocusedElement_ListViewItem_Validation()
 		[AutoRetry]
 		public void FocusManager_GetFocusedElement_ListViewItem_LostFocus_Validation()
 		{
-			Run("Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated");
+			Run("Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated");
 
 			_app.WaitForElement(_app.Marked("TxtCurrentFocused"));
 

src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/Focus_Tests.cs

@@ -14,7 +14,7 @@ public partial class Focus_Tests : SampleControlUITestBase
 		[AutoRetry]
 		public void Test_FocusState_Interactive()
 		{
-			Run("UITests.Windows_UI_Xaml.FocusManager.Focus_FocusState");
+			Run("UITests.Windows_UI_Xaml.FocusTests.Focus_FocusState");
 
 			_app.WaitForElement("YeButton");
 

src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/RadioButtonsTests/RadioButtonsFocusPage.xaml.cs

@@ -28,7 +28,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
 		private void ChangeTestFrameVisibility(Visibility visibility)
 		{
-			//TODO: MZ: Do we need this?
+			//TODO Uno: Add support for TestFrame in MUX test pages
 			//var testFrame = Window.Current.Content as TestFrame;
 			//testFrame.ChangeBarVisibility(visibility);
 		}

src/SamplesApp/UITests.Shared/UITests.Shared.projitems

@@ -741,6 +741,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml\FocusManager\Focus_FocusCycle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml\FocusManager\Focus_FocusState.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -4668,6 +4672,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml\FocusManager\FocusManager_GetFocus_Automated.xaml.cs">
       <DependentUpon>FocusManager_GetFocus_Automated.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml\FocusManager\Focus_FocusCycle.xaml.cs">
+      <DependentUpon>Focus_FocusCycle.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml\FocusManager\Focus_FocusState.xaml.cs">
       <DependentUpon>Focus_FocusState.xaml</DependentUpon>
     </Compile>

src/SamplesApp/UITests.Shared/Windows_UI_Xaml/FocusManager/FocusManagerTest.xaml

@@ -1,9 +1,8 @@
 <UserControl
-    x:Class="Uno.UI.Samples.Content.UITests.FocusManager.FocusManagerTest"
+    x:Class="Uno.UI.Samples.Content.UITests.FocusTests.FocusManagerTest"
     xmlns:controls="using:Uno.UI.Samples.Controls"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="GenericApp.Views.Content.UITests.FocusManager"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:u="using:Uno.UI.Samples.Controls"

src/SamplesApp/UITests.Shared/Windows_UI_Xaml/FocusManager/FocusManagerTest.xaml.cs

@@ -7,9 +7,9 @@
 using Uno.UI.Samples.Presentation.SamplePages;
 using Windows.UI.Xaml.Controls;
 
-namespace Uno.UI.Samples.Content.UITests.FocusManager
+namespace Uno.UI.Samples.Content.UITests.FocusTests
 {
-	[SampleControlInfo("FocusManager", "FocusManagerTest")]
+	[SampleControlInfo("Focus", "FocusManagerTest")]
 	public sealed partial class FocusManagerTest : UserControl
     {
 		public FocusManagerTest()

src/SamplesApp/UITests.Shared/Windows_UI_Xaml/FocusManager/FocusManager_FocusDirection.xaml

@@ -1,9 +1,8 @@
 <UserControl
-	x:Class="Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_FocusDirection" 
+	x:Class="Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_FocusDirection" 
 	xmlns:controls="using:Uno.UI.Samples.Controls"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="Uno.UI.Samples.Content.UITests.FocusManager"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:u="using:Uno.UI.Samples.Controls"

src/SamplesApp/UITests.Shared/Windows_UI_Xaml/FocusManager/FocusManager_FocusDirection.xaml.cs

@@ -16,9 +16,9 @@
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
-namespace Uno.UI.Samples.Content.UITests.FocusManager
+namespace Uno.UI.Samples.Content.UITests.FocusTests
 {
-	[SampleControlInfo("FocusManager", "FocusManager_FocusDirection")]
+	[SampleControlInfo("Focus", "FocusManager_FocusDirection")]
 	public sealed partial class FocusManager_FocusDirection : UserControl
 	{
 		public FocusManager_FocusDirection()

src/SamplesApp/UITests.Shared/Windows_UI_Xaml/FocusManager/FocusManager_GetFocus_Automated.xaml

@@ -1,7 +1,6 @@
-<UserControl x:Class="Uno.UI.Samples.Content.UITests.FocusManager.FocusManager_GetFocus_Automated"
+<UserControl x:Class="Uno.UI.Samples.Content.UITests.FocusTests.FocusManager_GetFocus_Automated"
 						 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 						 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-						 xmlns:local="using:Uno.UI.Samples.Content.UITests.FocusManager"
 						 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 						 mc:Ignorable="">