From 827692fa272aaa841d352d5aef3d5b5f9c5614dd Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 2 Jun 2022 22:36:22 +0100
Subject: [PATCH] add test for osx modal dialog window order when clicking
 resize grip of parent.

---
 .../WindowTests.cs                            | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index b027c17ff3..59e705bd9b 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -3,9 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
 using SeleniumExtras.PageObjects;
 using Xunit;
 using Xunit.Sdk;
@@ -50,7 +52,7 @@ namespace Avalonia.IntegrationTests.Appium
                 {
                     SwitchToNewWindowHack(mainWindow);
                     var closeButton = _session.FindElementByAccessibilityId("CloseWindow");
-                    closeButton.SendClick();
+                    closeButton.Click();
                 }
                 catch { }
             });
@@ -85,6 +87,43 @@ namespace Avalonia.IntegrationTests.Appium
             }
         }
         
+        [PlatformFact(SkipOnWindows = true)]
+        public void OSX_WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent_When_Clicking_Resize_Grip()
+        {
+            var mainWindowHandle = GetCurrentWindowHandleHack();
+            
+            var mainWindow =
+                _session.FindWindowOuter("MainWindow");
+
+            try
+            {
+                using (OpenWindow(ShowWindowMode.Modal, WindowStartupLocation.CenterOwner))
+                {
+                    new Actions(_session)
+                        .MoveToElement(mainWindow, 100, 1)
+                        .ClickAndHold()
+                        .Perform();
+
+                    var windows = _session.FindElements(By.XPath("XCUIElementTypeWindow"));
+
+                    int mainWindowIndex = windows.GetWindowOrder("MainWindow");
+                    int secondaryWindowIndex = windows.GetWindowOrder("SecondaryWindow");
+                    
+                    new Actions(_session)
+                        .MoveToElement(mainWindow, 100, 1)
+                        .Release()
+                        .Perform();
+
+                    Assert.Equal(0, secondaryWindowIndex);
+                    Assert.Equal(1, mainWindowIndex);
+                }
+            }
+            finally
+            {
+                SwitchToMainWindowHack(mainWindowHandle);
+            }
+        }
+        
         [PlatformFact(SkipOnWindows = true)]
         public void OSX_WindowOrder_Owned_Dialog_Stays_InFront_Of_Parent()
         {