From 1e4e978fada65eae1a82291a512d368219d5aecd Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 15 Dec 2023 00:36:09 -0800
Subject: [PATCH] Fix tests

---
 .../XYFocusKeyboardNavigationMode.cs          |  2 +-
 .../Input/KeyboardNavigationTests_XY.cs       | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Input/Navigation/XYFocusKeyboardNavigationMode.cs b/src/Avalonia.Base/Input/Navigation/XYFocusKeyboardNavigationMode.cs
index a34d726524..267c7df0e2 100644
--- a/src/Avalonia.Base/Input/Navigation/XYFocusKeyboardNavigationMode.cs
+++ b/src/Avalonia.Base/Input/Navigation/XYFocusKeyboardNavigationMode.cs
@@ -9,7 +9,7 @@ public enum XYFocusKeyboardNavigationMode
     /// Arrow keys can be used for 2D directional navigation.
     /// </summary>
     Enabled = 1,
-        
+
     /// <summary>
     /// Arrow keys cannot be used for 2D directional navigation.
     /// </summary>
diff --git a/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_XY.cs b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_XY.cs
index c73ae230f2..d4a457df65 100644
--- a/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_XY.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/KeyboardNavigationTests_XY.cs
@@ -72,7 +72,11 @@ public class KeyboardNavigationTests_XY
         using var _ = UnitTestApplication.Start(TestServices.StyledWindow);
         
         var (canvas, buttons) = CreateXYTestLayout();
-        var window = new Window { Content = canvas };
+        var window = new Window
+        {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
+            Content = canvas
+        };
         window.Show();
 
         var fromButton = buttons[from - 1];
@@ -91,7 +95,7 @@ public class KeyboardNavigationTests_XY
     [InlineData(1, NavigationDirection.Up, -1)]
     [InlineData(1, NavigationDirection.Left, 3)]
     [InlineData(1, NavigationDirection.Right, 2)]
-    [InlineData(2, NavigationDirection.Down, 4)]
+    [InlineData(2, NavigationDirection.Down, 3)]
     [InlineData(2, NavigationDirection.Up, 1)]
     [InlineData(2, NavigationDirection.Left, 1)]
     [InlineData(2, NavigationDirection.Right, -1)]
@@ -108,7 +112,11 @@ public class KeyboardNavigationTests_XY
         using var _ = UnitTestApplication.Start(TestServices.StyledWindow);
         
         var (canvas, buttons) = CreateXYTestLayout();
-        var window = new Window { Content = canvas };
+        var window = new Window
+        {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
+            Content = canvas
+        };
         window.Show();
 
         var fromButton = buttons[from - 1];
@@ -144,7 +152,11 @@ public class KeyboardNavigationTests_XY
         using var _ = UnitTestApplication.Start(TestServices.StyledWindow);
         
         var (canvas, buttons) = CreateXYTestLayout();
-        var window = new Window { Content = canvas };
+        var window = new Window
+        {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
+            Content = canvas
+        };
         window.Show();
 
         var fromButton = buttons[from - 1];
@@ -176,6 +188,7 @@ public class KeyboardNavigationTests_XY
         };
         var window = new Window
         {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
             Content = new Canvas
             {
                 Children =
@@ -204,6 +217,7 @@ public class KeyboardNavigationTests_XY
         };
         var window = new Window
         {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
             Content = center
         };
         window.Show();
@@ -235,6 +249,7 @@ public class KeyboardNavigationTests_XY
         };
         var window = new Window
         {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
             Content = new StackPanel
             {
                 Orientation = Orientation.Horizontal,
@@ -261,6 +276,7 @@ public class KeyboardNavigationTests_XY
         };
         var window = new Window
         {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
             Content = parent,
             Height = 30
         };
@@ -284,6 +300,7 @@ public class KeyboardNavigationTests_XY
         };
         var window = new Window
         {
+            [XYFocus.KeyboardNavigationEnabledProperty] = XYFocusKeyboardNavigationMode.Enabled,
             Content = new ScrollViewer
             {
                 Content = parent