[Testing] Updated Appium.WebDriver to v7.0.0 (#27184)

* Updated Appium.WebDriver to v7.0.0 * More changes
dotnet · Jan 22, 2025 · a407b5f · a407b5f
1 parent 1ccfcef
commit a407b5f
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj b/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0" />
+    <PackageReference Include="Appium.WebDriver" Version="7.0.0" />
     <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj b/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0" />
+    <PackageReference Include="Appium.WebDriver" Version="7.0.0" />
     <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19214.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19214.cs
@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Appium;
 using UITest.Core;

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19214_2.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19214_2.cs
@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Appium;
 using UITest.Core;

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19214_3.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19214_3.cs
@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Appium;
 using UITest.Core;

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22715.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22715.cs
@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Appium;
 using UITest.Core;

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrolling.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrolling.cs
@@ -2,7 +2,6 @@
 using NUnit.Framework.Legacy;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Appium;
 using UITest.Core;

diff --git a/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj b/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0" />
+    <PackageReference Include="Appium.WebDriver" Version="7.0.0" />
     <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj b/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0" />
+    <PackageReference Include="Appium.WebDriver" Version="7.0.0" />
     <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumDeviceActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumDeviceActions.cs
@@ -69,7 +69,10 @@ CommandResponse Unlock(IDictionary<string, object> parameters)
 		{
 			if (_appiumApp.Driver is AndroidDriver androidDriver)
 			{
-				androidDriver.Unlock();
+				string unlockType = (string)parameters["unlockType"];
+				string unlockKey = (string)parameters["unlockKey"];
+
+				androidDriver.Unlock(unlockType, unlockKey);
 
 				return CommandResponse.SuccessEmptyResponse;
 			}

diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumScrollActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumScrollActions.cs
@@ -1,7 +1,5 @@
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.Mac;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Core;
 

diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumSliderActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumSliderActions.cs
@@ -1,6 +1,5 @@
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Core;
 

diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumSwipeActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumSwipeActions.cs
@@ -1,6 +1,5 @@
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.MultiTouch;
 using OpenQA.Selenium.Interactions;
 using UITest.Core;
 

diff --git a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
@@ -1615,15 +1615,21 @@ public static void Lock(this IApp app)
 		/// Functionality that's only available on Android and iOS.
 		/// </summary>
 		/// <param name="app">Represents the main gateway to interact with an app.</param>
+		/// <param name="unlockType">This capability supports the following possible values: pin, pinWithKeyEvent, password, pattern.</param>
+		/// <param name="unlockKey">a valid pin (digits in range 0-9), password (latin characters) or pattern (treat the pattern pins similarly to numbers on a digital phone dial).</param>
 		/// <exception cref="InvalidOperationException">Unlock is only supported on <see cref="AppiumAndroidApp"/>.</exception>
-		public static void Unlock(this IApp app)
+		public static void Unlock(this IApp app, string unlockType = "", string unlockKey = "")
 		{
 			if (app is not AppiumAndroidApp && app is not AppiumIOSApp)
 			{
 				throw new InvalidOperationException($"Unlock is only supported on AppiumAndroidApp and AppiumIOSApp");
 			}
 
-			app.CommandExecutor.Execute("unlock", ImmutableDictionary<string, object>.Empty);
+			app.CommandExecutor.Execute("unlock", new Dictionary<string, object>()
+			{
+				{ "unlockType", unlockType },
+				{ "unlockKey", unlockKey },
+			});
 		}
 
 		/// <summary>

diff --git a/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj b/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0" />
+    <PackageReference Include="Appium.WebDriver" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>