Browse Source

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

pull/10677/head
Steven Kirk 4 years ago
parent
commit
7005333bc5
  1. 2
      tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
  2. 12
      tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs

2
tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs

@ -145,7 +145,7 @@ namespace Avalonia.IntegrationTests.Appium
var text = windows.Select(x => x.Text).ToList(); var text = windows.Select(x => x.Text).ToList();
var newWindow = session.FindElements(By.XPath("/XCUIElementTypeApplication/XCUIElementTypeWindow")) var newWindow = session.FindElements(By.XPath("/XCUIElementTypeApplication/XCUIElementTypeWindow"))
.First(x => x.Text == newWindowTitle); .First(x => x.Text == newWindowTitle);
var close = ((AppiumWebElement)newWindow).GetChromeButtons().Close; var close = ((AppiumWebElement)newWindow).FindElementByAccessibilityId("_XCUI:CloseWindow");
close!.Click(); close!.Click();
Thread.Sleep(1000); Thread.Sleep(1000);
}); });

12
tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs

@ -83,9 +83,9 @@ namespace Avalonia.IntegrationTests.Appium
public void WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent_When_In_Fullscreen() public void WindowOrder_Modal_Dialog_Stays_InFront_Of_Parent_When_In_Fullscreen()
{ {
var mainWindow = GetWindow("MainWindow"); var mainWindow = GetWindow("MainWindow");
var buttons = mainWindow.GetChromeButtons(); var fullScreen = mainWindow.FindElementByAccessibilityId("_XCUI:FullScreenWindow");
buttons.FullScreen.Click(); fullScreen.Click();
Thread.Sleep(500); Thread.Sleep(500);
@ -275,7 +275,7 @@ namespace Avalonia.IntegrationTests.Appium
using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual)) using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual))
{ {
var secondaryWindow = GetWindow("SecondaryWindow"); var secondaryWindow = GetWindow("SecondaryWindow");
var miniaturizeButton = secondaryWindow.GetChromeButtons().Minimize; var miniaturizeButton = secondaryWindow.FindElementByAccessibilityId("_XCUI:MinimizeWindow");
Assert.False(miniaturizeButton.Enabled); Assert.False(miniaturizeButton.Enabled);
} }
@ -289,7 +289,7 @@ namespace Avalonia.IntegrationTests.Appium
using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual)) using (OpenWindow(new PixelSize(200, 100), mode, WindowStartupLocation.Manual))
{ {
var secondaryWindow = GetWindow("SecondaryWindow"); var secondaryWindow = GetWindow("SecondaryWindow");
var miniaturizeButton = secondaryWindow.GetChromeButtons().Minimize; var miniaturizeButton = secondaryWindow.FindElementByAccessibilityId("_XCUI:MinimizeWindow");
miniaturizeButton.Click(); miniaturizeButton.Click();
Thread.Sleep(1000); Thread.Sleep(1000);
@ -333,7 +333,7 @@ namespace Avalonia.IntegrationTests.Appium
// Close the window manually. // Close the window manually.
secondaryWindow = GetWindow("SecondaryWindow"); secondaryWindow = GetWindow("SecondaryWindow");
secondaryWindow.GetChromeButtons().Close.Click(); secondaryWindow.FindElementByAccessibilityId("_XCUI:CloseWindow").Click();
} }
[PlatformTheory(TestPlatforms.MacOS)] [PlatformTheory(TestPlatforms.MacOS)]
@ -345,7 +345,7 @@ namespace Avalonia.IntegrationTests.Appium
using (OpenWindow(null, mode, WindowStartupLocation.Manual, canResize: false)) using (OpenWindow(null, mode, WindowStartupLocation.Manual, canResize: false))
{ {
var secondaryWindow = GetWindow("SecondaryWindow"); var secondaryWindow = GetWindow("SecondaryWindow");
var zoomButton = secondaryWindow.GetChromeButtons().Maximize; var zoomButton = secondaryWindow.FindElementByAccessibilityId("_XCUI:ZoomWindow");
Assert.False(zoomButton.Enabled); Assert.False(zoomButton.Enabled);
} }
} }

Loading…
Cancel
Save