From 393480190f6c3e0dbe0b6c11e35ec06bdaa1d426 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Sun, 12 Jan 2025 12:27:54 +0100 Subject: [PATCH] Update Dependencies, Handle issue #114 --- .../SimpleToDoList/SimpleToDoList.csproj | 12 +++++------ .../SnowflakesControlSample.csproj | 14 ++++++------- .../TestableApp.Appium/CalculatorTests.cs | 20 ++++++++++--------- .../TestableApp.Appium/DefaultAppFixture.cs | 20 +++++++++---------- .../CalculatorTests.cs | 4 ++-- .../TestableApp.Headless.NUnit.csproj | 1 + .../CalculatorTests.cs | 4 ++-- .../TestableApp.Headless.XUnit.csproj | 1 + .../MvvmDialogSample/MvvmDialogSample.csproj | 9 +++++---- 9 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj b/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj index a37c286..5bce12b 100644 --- a/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj +++ b/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj b/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj index aae83f4..ef09267 100644 --- a/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj +++ b/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj @@ -9,16 +9,16 @@ - + - - - - + + + + - - + + diff --git a/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs b/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs index e882d99..2bcc1e5 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs @@ -6,7 +6,7 @@ namespace TestableApp.Appium; [Collection("Default")] public class CalculatorTests { - private readonly AppiumDriver _session; + private readonly AppiumDriver _session; public CalculatorTests(DefaultAppFixture fixture) @@ -18,10 +18,11 @@ public CalculatorTests(DefaultAppFixture fixture) public void Should_Add_Numbers() { // Assert: - var firstOperandInput = _session.FindElementByAccessibilityId("FirstOperandInput")!; - var secondOperandInput = _session.FindElementByAccessibilityId("SecondOperandInput")!; - var addButton = _session.FindElementByAccessibilityId("AddButton")!; - var resultBox = _session.FindElementByAccessibilityId("ResultBox")!; + const string ByAccessibilityId = "AccessibilityId"; + var firstOperandInput = _session.FindElement(ByAccessibilityId, "FirstOperandInput")!; + var secondOperandInput = _session.FindElement(ByAccessibilityId, "SecondOperandInput")!; + var addButton = _session.FindElement(ByAccessibilityId, "AddButton")!; + var resultBox = _session.FindElement(ByAccessibilityId, "ResultBox")!; // Act: firstOperandInput.Clear(); @@ -39,10 +40,11 @@ public void Should_Add_Numbers() public void Cannot_Divide_By_Zero() { // Assert: - var firstOperandInput = _session.FindElementByAccessibilityId("FirstOperandInput")!; - var secondOperandInput = _session.FindElementByAccessibilityId("SecondOperandInput")!; - var divideButton = _session.FindElementByAccessibilityId("DivideButton")!; - var resultBox = _session.FindElementByAccessibilityId("ResultBox")!; + const string ByAccessibilityId = "AccessibilityId"; + var firstOperandInput = _session.FindElement(ByAccessibilityId, "FirstOperandInput")!; + var secondOperandInput = _session.FindElement("AccessibilityId", "SecondOperandInput")!; + var divideButton = _session.FindElement("AccessibilityId", "DivideButton")!; + var resultBox = _session.FindElement("AccessibilityId", "ResultBox")!; // Act: firstOperandInput.Clear(); diff --git a/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs b/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs index 8b65f16..2710706 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs @@ -28,7 +28,7 @@ public DefaultAppFixture() if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { ConfigureWin32Options(options); - Session = new WindowsDriver( + Session = new WindowsDriver( new Uri("http://127.0.0.1:4723"), options); @@ -40,7 +40,7 @@ public DefaultAppFixture() else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { ConfigureMacOptions(options); - Session = new MacDriver( + Session = new MacDriver( new Uri("http://127.0.0.1:4723/wd/hub"), options); } @@ -53,22 +53,22 @@ public DefaultAppFixture() protected virtual void ConfigureWin32Options(AppiumOptions options) { var path = Path.GetFullPath(TestAppPath); - options.AddAdditionalCapability(MobileCapabilityType.App, path); - options.AddAdditionalCapability(MobileCapabilityType.PlatformName, MobilePlatform.Windows); - options.AddAdditionalCapability(MobileCapabilityType.DeviceName, "WindowsPC"); + options.App = path; + options.PlatformName = MobilePlatform.Windows; + options.DeviceName= "WindowsPC"; // options.AddAdditionalCapability("appArguments", "--customArg"); } protected virtual void ConfigureMacOptions(AppiumOptions options) { - options.AddAdditionalCapability("appium:bundleId", TestAppBundleId); - options.AddAdditionalCapability(MobileCapabilityType.PlatformName, MobilePlatform.MacOS); - options.AddAdditionalCapability(MobileCapabilityType.AutomationName, "mac2"); - options.AddAdditionalCapability("appium:showServerLogs", true); + options.AddAdditionalOption("appium:bundleId", TestAppBundleId); + options.PlatformName = MobilePlatform.MacOS; + options.AutomationName = "mac2"; + options.AddAdditionalOption("appium:showServerLogs", true); // options.AddAdditionalCapability("appium:arguments", new[] { "--customArg" }); } - public AppiumDriver Session { get; } + public AppiumDriver Session { get; } public void Dispose() { diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs index fb885eb..f5bd484 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs @@ -28,7 +28,7 @@ public void Should_Add_Numbers() // Raise click event on the button: window.AddButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.That(window.ResultBox.Text, Is.EqualTo("30")); } @@ -49,7 +49,7 @@ public void Cannot_Divide_By_Zero() // Raise click event on the button: window.DivideButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.That(window.ResultBox.Text, Is.EqualTo("Cannot divide by zero!")); } diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj index caccdd3..fdf5a38 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj @@ -9,6 +9,7 @@ + diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs index 62ba5fe..db36745 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs @@ -28,7 +28,7 @@ public void Should_Add_Numbers() // Raise click event on the button: window.AddButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.Equal("30", window.ResultBox.Text); } @@ -49,7 +49,7 @@ public void Cannot_Divide_By_Zero() // Raise click event on the button: window.DivideButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.Equal("Cannot divide by zero!", window.ResultBox.Text); } diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj index a74778b..271d96f 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj @@ -9,6 +9,7 @@ + diff --git a/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj index eb1e53e..637b326 100644 --- a/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj +++ b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj @@ -13,11 +13,12 @@ - + - - - + + + +