Don't get all window buttons when only one needed.

AvaloniaUI · Mar 13, 2023 · 7005333 · 7005333
1 parent 2cce1d4
commit 7005333
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
@@ -145,7 +145,7 @@ public static IDisposable OpenWindowWithClick(this AppiumWebElement element)
                     var text = windows.Select(x => x.Text).ToList();
                     var newWindow = session.FindElements(By.XPath("/XCUIElementTypeApplication/XCUIElementTypeWindow"))
                         .First(x => x.Text == newWindowTitle);
-                    var close = ((AppiumWebElement)newWindow).GetChromeButtons().Close;
+                    var close = ((AppiumWebElement)newWindow).FindElementByAccessibilityId("_XCUI:CloseWindow");
                     close!.Click();
                     Thread.Sleep(1000);
                 });

diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
@@ -83,9 +83,9 @@ public void WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent_When_Clicking_Resiz
         public void WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent_When_In_Fullscreen()
         {
             var mainWindow = GetWindow("MainWindow");
-            var buttons = mainWindow.GetChromeButtons();
+            var fullScreen = mainWindow.FindElementByAccessibilityId("_XCUI:FullScreenWindow");
 
-            buttons.FullScreen.Click();
+            fullScreen.Click();
 
             Thread.Sleep(500);
 
@@ -275,7 +275,7 @@ 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().Minimize;
+                var miniaturizeButton = secondaryWindow.FindElementByAccessibilityId("_XCUI:MinimizeWindow");
 
                 Assert.False(miniaturizeButton.Enabled);
             }
@@ -289,7 +289,7 @@ public void Minimize_Button_Minimizes_Window(ShowWindowMode mode)
             using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual))
             {
                 var secondaryWindow = GetWindow("SecondaryWindow");
-                var miniaturizeButton = secondaryWindow.GetChromeButtons().Minimize;
+                var miniaturizeButton = secondaryWindow.FindElementByAccessibilityId("_XCUI:MinimizeWindow");
 
                 miniaturizeButton.Click();
                 Thread.Sleep(1000);
@@ -333,7 +333,7 @@ public void Hidden_Child_Window_Is_Not_Reshown_When_Parent_Clicked()
 
             // Close the window manually.
             secondaryWindow = GetWindow("SecondaryWindow");
-            secondaryWindow.GetChromeButtons().Close.Click();
+            secondaryWindow.FindElementByAccessibilityId("_XCUI:CloseWindow").Click();
         }
 
         [PlatformTheory(TestPlatforms.MacOS)]
@@ -345,7 +345,7 @@ public void Window_Has_Disabled_Zoom_Button_When_CanResize_Is_False(ShowWindowMo
             using (OpenWindow(null, mode, WindowStartupLocation.Manual, canResize: false))
             {
                 var secondaryWindow = GetWindow("SecondaryWindow");
-                var zoomButton = secondaryWindow.GetChromeButtons().Maximize;
+                var zoomButton = secondaryWindow.FindElementByAccessibilityId("_XCUI:ZoomWindow");
                 Assert.False(zoomButton.Enabled);
             }
         }