From 6ce643352cd0846dfad4a7df61c6677fc94b2f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Mon, 29 Apr 2024 12:18:12 +0200 Subject: [PATCH 1/5] Update Appium to 5.0.0-rc.8 --- .../ControlGallery.Android.Appium.UITests.csproj | 2 +- .../iOS.Appium.UITests/ControlGallery.iOS.Appium.UITests.csproj | 2 +- src/Controls/tests/UITests/Controls.AppiumTests.csproj | 2 +- src/TestUtils/src/UITest.Appium/UITest.Appium.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Compatibility/ControlGallery/test/Android.Appium.UITests/ControlGallery.Android.Appium.UITests.csproj b/src/Compatibility/ControlGallery/test/Android.Appium.UITests/ControlGallery.Android.Appium.UITests.csproj index 5d66c158ad15..d159f19d24aa 100644 --- a/src/Compatibility/ControlGallery/test/Android.Appium.UITests/ControlGallery.Android.Appium.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/Android.Appium.UITests/ControlGallery.Android.Appium.UITests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Compatibility/ControlGallery/test/iOS.Appium.UITests/ControlGallery.iOS.Appium.UITests.csproj b/src/Compatibility/ControlGallery/test/iOS.Appium.UITests/ControlGallery.iOS.Appium.UITests.csproj index 4558c59d5333..e3a5735429ec 100644 --- a/src/Compatibility/ControlGallery/test/iOS.Appium.UITests/ControlGallery.iOS.Appium.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/iOS.Appium.UITests/ControlGallery.iOS.Appium.UITests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Controls/tests/UITests/Controls.AppiumTests.csproj b/src/Controls/tests/UITests/Controls.AppiumTests.csproj index 127b45dcfd01..e883f1157928 100644 --- a/src/Controls/tests/UITests/Controls.AppiumTests.csproj +++ b/src/Controls/tests/UITests/Controls.AppiumTests.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj b/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj index 3d33c1a996c8..5abfdb1a3fc6 100644 --- a/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj +++ b/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj @@ -7,7 +7,7 @@ - + From 0feaad1d802b8d6132984cebf43c50e928e94818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Mon, 29 Apr 2024 12:47:01 +0200 Subject: [PATCH 2/5] Updated references --- src/Controls/tests/UITests/Controls.AppiumTests.csproj | 2 +- src/TestUtils/src/UITest.Appium/UITest.Appium.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controls/tests/UITests/Controls.AppiumTests.csproj b/src/Controls/tests/UITests/Controls.AppiumTests.csproj index e883f1157928..fd007f4e37ad 100644 --- a/src/Controls/tests/UITests/Controls.AppiumTests.csproj +++ b/src/Controls/tests/UITests/Controls.AppiumTests.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj b/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj index 5abfdb1a3fc6..9ce373645f51 100644 --- a/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj +++ b/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj @@ -8,7 +8,7 @@ - + From fe6aa9c092af9be7739ef431aa84e52c37e39621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Mon, 29 Apr 2024 12:47:49 +0200 Subject: [PATCH 3/5] Removed code using removed methods --- .../UITest.Appium/Actions/AppiumLifecycleActions.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs index 63e9698bac2c..a36028bff3d2 100644 --- a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs +++ b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs @@ -61,12 +61,6 @@ CommandResponse LaunchApp(IDictionary parameters) { "bundleId", _app.GetAppId() }, }); } - else if (_app.GetTestDevice() == TestDevice.Windows) - { -#pragma warning disable CS0618 // Type or member is obsolete - _app.Driver.LaunchApp(); -#pragma warning restore CS0618 // Type or member is obsolete - } else { _app.Driver.ActivateApp(_app.GetAppId()); @@ -130,12 +124,6 @@ CommandResponse CloseApp(IDictionary parameters) { "bundleId", _app.GetAppId() }, }); } - else if (_app.GetTestDevice() == TestDevice.Windows) - { -#pragma warning disable CS0618 // Type or member is obsolete - _app.Driver.CloseApp(); -#pragma warning restore CS0618 // Type or member is obsolete - } else _app.Driver.TerminateApp(_app.GetAppId()); From beb6fb167fb9cf7d150d5e26963111f8ed3d33eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Mon, 29 Apr 2024 14:42:17 +0200 Subject: [PATCH 4/5] Fix CloseApp method impl on Windows --- .../src/UITest.Appium/Actions/AppiumLifecycleActions.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs index a36028bff3d2..87f9293212b3 100644 --- a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs +++ b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs @@ -124,6 +124,11 @@ CommandResponse CloseApp(IDictionary parameters) { "bundleId", _app.GetAppId() }, }); } + else if (_app.GetTestDevice() == TestDevice.Windows) + { + if (_app.Driver is WindowsDriver windowsDriver) + windowsDriver.CloseApp(); + } else _app.Driver.TerminateApp(_app.GetAppId()); From d9a0648eaa8a16ce35c991650d4509046a3054e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Wed, 8 May 2024 12:10:12 +0200 Subject: [PATCH 5/5] More changes --- src/Controls/tests/UITests/Controls.AppiumTests.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Controls/tests/UITests/Controls.AppiumTests.csproj b/src/Controls/tests/UITests/Controls.AppiumTests.csproj index a82eaed13b63..ec9ce083b1ae 100644 --- a/src/Controls/tests/UITests/Controls.AppiumTests.csproj +++ b/src/Controls/tests/UITests/Controls.AppiumTests.csproj @@ -41,7 +41,6 @@ -