Move all references to Extras common

ERNI-Academy · May 23, 2024 · d37eb54 · d37eb54
1 parent 1772057
commit d37eb54
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 172 deletions.
diff --git a/samples/TestWare.Samples.Appium.Mobile/POM/Cart/CartPage.cs b/samples/TestWare.Samples.Appium.Mobile/POM/Cart/CartPage.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using TestWare.Engines.Appium.Pages;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.Factory;
 using TestWare.Core.Libraries;
 

diff --git a/samples/TestWare.Samples.Appium.Mobile/POM/Login/LoginPage.cs b/samples/TestWare.Samples.Appium.Mobile/POM/Login/LoginPage.cs
@@ -1,5 +1,5 @@
 using OpenQA.Selenium;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.Factory;
 using TestWare.Engines.Appium.Pages;
 

diff --git a/samples/TestWare.Samples.Appium.Mobile/POM/Menu/MenuPage.cs b/samples/TestWare.Samples.Appium.Mobile/POM/Menu/MenuPage.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using TestWare.Engines.Appium.Pages;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.Factory;
 
 namespace TestWare.Samples.Appium.Mobile.POM.Menu;

diff --git a/samples/TestWare.Samples.Appium.Mobile/POM/Product/ProductPage.cs b/samples/TestWare.Samples.Appium.Mobile/POM/Product/ProductPage.cs
@@ -1,7 +1,7 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using TestWare.Core.Libraries;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.Factory;
 using TestWare.Engines.Appium.Pages;
 

diff --git a/samples/TestWare.Samples.Selenium.Web/POM/Stinto/Chat/ChatPage.cs b/samples/TestWare.Samples.Selenium.Web/POM/Stinto/Chat/ChatPage.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using TestWare.Core.Libraries;
-using TestWare.Engines.Selenium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Selenium.Factory;
 using TestWare.Engines.Selenium.Pages;
 

diff --git a/samples/TestWare.Samples.Selenium.Web/POM/Stinto/CreateChat/CreateChatPage.cs b/samples/TestWare.Samples.Selenium.Web/POM/Stinto/CreateChat/CreateChatPage.cs
@@ -1,5 +1,5 @@
 using OpenQA.Selenium;
-using TestWare.Engines.Selenium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Selenium.Factory;
 using TestWare.Engines.Selenium.Pages;
 

diff --git a/samples/TestWare.Samples.Selenium.Web/POM/Stinto/Home/HomePage.cs b/samples/TestWare.Samples.Selenium.Web/POM/Stinto/Home/HomePage.cs
@@ -1,5 +1,5 @@
 using OpenQA.Selenium;
-using TestWare.Engines.Selenium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Selenium.Factory;
 using TestWare.Engines.Selenium.Pages;
 

diff --git a/samples/TestWare.Samples.Selenium.Web/POM/SwagLabs/Login/LoginPage.cs b/samples/TestWare.Samples.Selenium.Web/POM/SwagLabs/Login/LoginPage.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using TestWare.Core.Libraries;
-using TestWare.Engines.Selenium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Selenium.Factory;
 using TestWare.Engines.Selenium.Pages;
 

diff --git a/samples/TestWare.Samples.Selenium.Web/POM/SwagLabs/Menu/MenuPage.cs b/samples/TestWare.Samples.Selenium.Web/POM/SwagLabs/Menu/MenuPage.cs
@@ -1,5 +1,5 @@
 using OpenQA.Selenium;
-using TestWare.Engines.Selenium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Selenium.Factory;
 using TestWare.Engines.Selenium.Pages;
 

diff --git a/samples/TestWare.Samples.Selenoid.Web/POM/SwagLabs/Login/LoginPage.cs b/samples/TestWare.Samples.Selenoid.Web/POM/SwagLabs/Login/LoginPage.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using TestWare.Core.Libraries;
-using TestWare.Engines.Selenoid.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Selenoid.Factory;
 using TestWare.Engines.Selenoid.Pages;
 

diff --git a/samples/TestWare.Samples.Selenoid.Web/POM/SwagLabs/Menu/MenuPage.cs b/samples/TestWare.Samples.Selenoid.Web/POM/SwagLabs/Menu/MenuPage.cs
@@ -1,5 +1,5 @@
 using OpenQA.Selenium;
-using TestWare.Engines.Selenoid.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Selenoid.Factory;
 using TestWare.Engines.Selenoid.Pages;
 

diff --git a/samples/TestWare.Samples.WinAppDriver/POM/Calculator/CalculatorPage.cs b/samples/TestWare.Samples.WinAppDriver/POM/Calculator/CalculatorPage.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.WinAppDriver.Factory;
 using TestWare.Engines.Appium.WinAppDriver.Pages;
 

diff --git a/samples/TestWare.Samples.WinAppDriver/POM/Notepad/NotepadPage.cs b/samples/TestWare.Samples.WinAppDriver/POM/Notepad/NotepadPage.cs
@@ -1,5 +1,5 @@
 using OpenQA.Selenium;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.WinAppDriver.Factory;
 using TestWare.Engines.Appium.WinAppDriver.Pages;
 

diff --git a/samples/TestWare.Samples.WinAppDriver/POM/WindowsCalculator/WindowsCalculatorPage.cs b/samples/TestWare.Samples.WinAppDriver/POM/WindowsCalculator/WindowsCalculatorPage.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.WinAppDriver.Factory;
 using TestWare.Engines.Appium.WinAppDriver.Pages;
 using Humanizer;

diff --git a/src/Engines/TestWare.Engines.Appium/Extras/ByFactory.cs b/src/Engines/TestWare.Engines.Appium/Extras/ByFactory.cs
diff --git a/src/Engines/TestWare.Engines.Appium/Extras/FindsByAttribute.cs b/src/Engines/TestWare.Engines.Appium/Extras/FindsByAttribute.cs
diff --git a/src/Engines/TestWare.Engines.Appium/Extras/How.cs b/src/Engines/TestWare.Engines.Appium/Extras/How.cs
diff --git a/src/Engines/TestWare.Engines.Appium/Extras/PageFactory.cs b/src/Engines/TestWare.Engines.Appium/Extras/PageFactory.cs
diff --git a/src/Engines/TestWare.Engines.Appium/Pages/MobilePage.cs b/src/Engines/TestWare.Engines.Appium/Pages/MobilePage.cs
@@ -2,7 +2,7 @@
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.MultiTouch;
 using System.Drawing;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.Factory;
 using TestWare.Engines.Selenium.Pages;
 

diff --git a/src/Engines/TestWare.Engines.Common/TestWare.Engines.Common/Extras/ByFactory.cs b/src/Engines/TestWare.Engines.Common/TestWare.Engines.Common/Extras/ByFactory.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Reflection;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
 
 namespace TestWare.Engines.Common.Extras;
 
@@ -36,7 +37,9 @@ public static By From(FindsByAttribute attribute)
             case How.PartialLinkText:
                 return By.PartialLinkText(usingValue);
             case How.XPath:
-                return By.XPath(usingValue);
+                return By.XPath(usingValue);
+            case How.AccessibilityId:
+                return MobileBy.AccessibilityId(usingValue);
             case How.Custom:
                 if (attribute.CustomFinderType == null)
                 {

diff --git a/src/Engines/TestWare.Engines.Common/TestWare.Engines.Common/Extras/How.cs b/src/Engines/TestWare.Engines.Common/TestWare.Engines.Common/Extras/How.cs
@@ -49,5 +49,10 @@ public enum How
     /// <summary>
     /// Finds by a custom <see cref="By"/> implementation.
     /// </summary>
-    Custom
+    Custom,
+
+    /// <summary>
+    /// Finds by <see cref="OpenQA.Selenium.Appium.MobileBy.AccessibilityId" />
+    /// </summary>
+    AccessibilityId
 }
diff --git a/src/Engines/TestWare.Engines.Common/TestWare.Engines.Common/TestWare.Engines.Common.csproj b/src/Engines/TestWare.Engines.Common/TestWare.Engines.Common/TestWare.Engines.Common.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
     <PackageReference Include="Selenium.Support" Version="4.21.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.21.0" />
   </ItemGroup>

diff --git a/src/Engines/TestWare.Engines.WinAppDriver/Pages/WinAppDriverPage.cs b/src/Engines/TestWare.Engines.WinAppDriver/Pages/WinAppDriverPage.cs
@@ -1,5 +1,5 @@
 using TestWare.Engines.Selenium.Pages;
-using TestWare.Engines.Appium.Extras;
+using TestWare.Engines.Common.Extras;
 using TestWare.Engines.Appium.WinAppDriver.Factory;
 
 namespace TestWare.Engines.Appium.WinAppDriver.Pages;
@@ -10,6 +10,6 @@ public abstract class WinAppDriverPage : PageBase
     protected WinAppDriverPage(IWindowsDriver driver)
     {
         Driver = driver;
-        Selenium.Extras.PageFactory.InitElements(Driver, this);
+        PageFactory.InitElements(Driver, this);
     }
 }
diff --git a/src/Engines/TestWare.Engines.WinAppDriver/TestWare.Engines.Appium.WinAppDriver.csproj b/src/Engines/TestWare.Engines.WinAppDriver/TestWare.Engines.Appium.WinAppDriver.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\TestWare.Engines.Appium\TestWare.Engines.Appium.csproj" />
-    <ProjectReference Include="..\TestWare.Engines.Selenium\TestWare.Engines.Selenium.csproj" />
+    <ProjectReference Include="..\TestWare.Engines.Common\TestWare.Engines.Common\TestWare.Engines.Common.csproj" />
   </ItemGroup>
 
 </Project>