From 9311d88a263dd9b1a9bc78776c996b6272e07d18 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 10 Nov 2022 14:49:48 +0000 Subject: [PATCH 1/2] fix gesture tests on macos --- tests/Avalonia.IntegrationTests.Appium/GestureTests.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs index 205ad6b8cf..86a8c65fcc 100644 --- a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs @@ -82,7 +82,7 @@ namespace Avalonia.IntegrationTests.Appium new Actions(_session).ClickAndHold(border).Release().Perform(); - Thread.Sleep(100); + Thread.Sleep(50); // DoubleTapped is raised on second pointer press, not release. new Actions(_session).ClickAndHold(border).Perform(); @@ -93,7 +93,8 @@ namespace Avalonia.IntegrationTests.Appium } finally { - new Actions(_session).Release(border).Perform(); + + new Actions(_session).MoveToElement(lastGesture).Release().Perform(); } } From 07f6a431286fa633567205519ef768adb967da3a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 10 Nov 2022 15:37:48 +0000 Subject: [PATCH 2/2] fix integration tests. --- .../GestureTests.cs | 11 +++++++---- .../WindowTests_MacOS.cs | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs index 86a8c65fcc..9745f993cb 100644 --- a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs @@ -119,12 +119,15 @@ namespace Avalonia.IntegrationTests.Appium // #8733 var border = _session.FindElementByAccessibilityId("GestureBorder"); var lastGesture = _session.FindElementByAccessibilityId("LastGesture"); - + new Actions(_session) .MoveToElement(border) .DoubleClick() - .DoubleClick() .Perform(); + + Thread.Sleep(100); + + new Actions(_session).MoveToElement(lastGesture, 200, 200).DoubleClick().Perform(); Assert.Equal("DoubleTapped2", lastGesture.Text); } @@ -148,9 +151,9 @@ namespace Avalonia.IntegrationTests.Appium var device = new PointerInputDevice(PointerKind.Mouse); var b = new ActionBuilder(); - b.AddAction(device.CreatePointerMove(border, 50, 50, TimeSpan.FromMilliseconds(100))); + b.AddAction(device.CreatePointerMove(border, 50, 50, TimeSpan.FromMilliseconds(50))); b.AddAction(device.CreatePointerDown(MouseButton.Right)); - b.AddAction(device.CreatePointerMove(border, 2, 2, TimeSpan.FromMilliseconds(100))); + b.AddAction(device.CreatePointerMove(border, 52, 52, TimeSpan.FromMilliseconds(50))); b.AddAction(device.CreatePointerUp(MouseButton.Right)); _session.PerformActions(b.ToActionSequenceList()); diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs index 2dd849bee1..05ed0616a8 100644 --- a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs +++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs @@ -180,10 +180,23 @@ namespace Avalonia.IntegrationTests.Appium Assert.False(miniaturizeButton.Enabled); } } + + [PlatformTheory(TestPlatforms.MacOS)] + [InlineData(ShowWindowMode.Owned)] + public void Minimize_Button_Disabled_Owned_Window(ShowWindowMode mode) + { + using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual)) + { + var secondaryWindow = GetWindow("SecondaryWindow"); + var (_, miniaturizeButton, _) = secondaryWindow.GetChromeButtons(); + + Assert.Equal(false, miniaturizeButton.Enabled); + } + } + [PlatformTheory(TestPlatforms.MacOS)] [InlineData(ShowWindowMode.NonOwned)] - [InlineData(ShowWindowMode.Owned)] public void Minimize_Button_Minimizes_Window(ShowWindowMode mode) { using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual))