From 52075d6cd98527d7eb75c890c3d1f0a91fe6e203 Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Wed, 23 Sep 2020 16:16:54 -0500
Subject: [PATCH] Fix Test

---
 .../Primitives/PopupTests.cs                  | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index e5dcba9912..53a8db2176 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -400,11 +400,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
         {
             using (CreateServicesWithFocus())
             {
+                var window = PreparedWindow();
+
                 var tb = new TextBox();
                 var b = new Button();
                 var p = new Popup
                 {
-                    PlacementTarget = PreparedWindow(),
+                    PlacementTarget = window,
                     Child = new StackPanel
                     {
                         Children =
@@ -415,15 +417,28 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     }
                 };
                 ((ISetLogicalParent)p).SetParent(p.PlacementTarget);
+                window.Show();
 
-                p.Opened += (s, e) =>
+                p.Open();
+
+                if(p.Host is OverlayPopupHost host)
                 {
-                    tb.Focus();
-                };
+                    //Need to measure/arrange for visual children to show up
+                    //in OverlayPopupHost
+                    host.Measure(Size.Infinity);
+                    host.Arrange(new Rect(host.DesiredSize));
+                }
 
-                p.Open();
+                tb.Focus();
 
                 Assert.True(FocusManager.Instance?.Current == tb);
+
+                //Ensure focus remains in the popup
+                var nextFocus = KeyboardNavigationHandler.GetNext(FocusManager.Instance.Current, NavigationDirection.Next);
+
+                Assert.True(nextFocus == b);
+
+                p.Close();
             }
         }