Fix conflicts

ERNI-Academy · May 23, 2024 · 9525f8b · 9525f8b
1 parent a8abc0e
commit 9525f8b
Show file tree

Hide file tree

Showing 65 changed files with 61 additions and 2,480 deletions.
diff --git a/TestWare.sln b/TestWare.sln
@@ -40,13 +40,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reporting", "Reporting", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWare.Engines.Selenoid", "src\Engines\TestWare.Engines.Selenoid\TestWare.Engines.Selenoid.csproj", "{0B7E3DFE-AB55-4C0C-81C6-6A6F517475EE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWare.Samples.Selenoid.Web", "samples\TestWare.Samples.Selenoid.Web\TestWare.Samples.Selenoid.Web.csproj", "{672C5D48-DD50-4AA3-8974-50B95746EA07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWare.Samples.Selenoid.Web", "samples\TestWare.Samples.Selenoid.Web\TestWare.Samples.Selenoid.Web.csproj", "{672C5D48-DD50-4AA3-8974-50B95746EA07}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWare.Engines.MongoDB", "src\Engines\TestWare.Engines.MongoDB\TestWare.Engines.MongoDB.csproj", "{4DFC2BE5-D3EF-4F39-AAD4-B8213DE92A11}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWare.Samples.MongoDB", "samples\TestWare.Samples.MongoDB\TestWare.Samples.MongoDB.csproj", "{5378DE68-675E-440D-AAA9-7D3AF8AA680E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWare.Samples.MongoDB", "samples\TestWare.Samples.MongoDB\TestWare.Samples.MongoDB.csproj", "{5378DE68-675E-440D-AAA9-7D3AF8AA680E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWare.AllureReport", "src\Core\TestWare.AllureReport\TestWare.AllureReport.csproj", "{91F2B723-A68B-4711-969B-89897B3C6161}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWare.AllureReport", "src\Core\TestWare.AllureReport\TestWare.AllureReport.csproj", "{91F2B723-A68B-4711-969B-89897B3C6161}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWare.Engines.Common", "src\Engines\TestWare.Engines.Common\TestWare.Engines.Common\TestWare.Engines.Common.csproj", "{FFD6A200-D2F1-4CBE-8FDC-320C7839AAB9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -114,6 +116,10 @@ Global
 		{91F2B723-A68B-4711-969B-89897B3C6161}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91F2B723-A68B-4711-969B-89897B3C6161}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91F2B723-A68B-4711-969B-89897B3C6161}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFD6A200-D2F1-4CBE-8FDC-320C7839AAB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFD6A200-D2F1-4CBE-8FDC-320C7839AAB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFD6A200-D2F1-4CBE-8FDC-320C7839AAB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFD6A200-D2F1-4CBE-8FDC-320C7839AAB9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -137,6 +143,7 @@ Global
 		{4DFC2BE5-D3EF-4F39-AAD4-B8213DE92A11} = {A2E4E1F7-CB61-48DC-AA38-A74F7DC74CA2}
 		{5378DE68-675E-440D-AAA9-7D3AF8AA680E} = {58B1446D-98A3-46A2-A668-305F0170B39F}
 		{91F2B723-A68B-4711-969B-89897B3C6161} = {DCCEF363-0EBE-46EA-B02B-CD59010626F6}
+		{FFD6A200-D2F1-4CBE-8FDC-320C7839AAB9} = {A2E4E1F7-CB61-48DC-AA38-A74F7DC74CA2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4F88CB24-23C8-4E0E-8B83-29023C1642B8}

diff --git a/samples/TestWare.Samples.MongoDB/TestWare.Samples.MongoDB.csproj b/samples/TestWare.Samples.MongoDB/TestWare.Samples.MongoDB.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
     <PackageReference Include="coverlet.collector" Version="3.1.0" />

diff --git a/src/Engines/TestWare.Engines.Appium/AppiumManager.cs b/src/Engines/TestWare.Engines.Appium/AppiumManager.cs
@@ -68,7 +68,7 @@ public string CollectEvidence(string destinationPath, string evidenceName)
             }
 
             var screenshot = ((ITakesScreenshot)appiumDriver).GetScreenshot();
-            screenshot.SaveAsFile(Path.Combine(destinationPath, $"{evidenceName}.png"), ScreenshotImageFormat.Png);
+            screenshot.SaveAsFile(Path.Combine(destinationPath, $"{evidenceName}.png"));
         }
         catch 
         {

diff --git a/...lenium/Extras/AbstractFindsByAttribute.cs → ...Common/Extras/AbstractFindsByAttribute.cs b/...lenium/Extras/AbstractFindsByAttribute.cs → ...Common/Extras/AbstractFindsByAttribute.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Base class for attributes to mark elements with methods by which to find a corresponding element on the page.

diff --git a/...TestWare.Engines.Selenoid/Extras/ByAll.cs → ...n/TestWare.Engines.Common/Extras/ByAll.cs b/...TestWare.Engines.Selenoid/Extras/ByAll.cs → ...n/TestWare.Engines.Common/Extras/ByAll.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Mechanism used to locate elements within a document using a series of lookups. This class will

diff --git a/...Ware.Engines.Selenoid/Extras/ByChained.cs → ...stWare.Engines.Common/Extras/ByChained.cs b/...Ware.Engines.Selenoid/Extras/ByChained.cs → ...stWare.Engines.Common/Extras/ByChained.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Mechanism used to locate elements within a document using a series of other lookups.  This class

diff --git a/...Ware.Engines.Selenoid/Extras/ByFactory.cs → ...stWare.Engines.Common/Extras/ByFactory.cs b/...Ware.Engines.Selenoid/Extras/ByFactory.cs → ...stWare.Engines.Common/Extras/ByFactory.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Provides instances of the <see cref="By"/> object to the attributes.

diff --git a/...are.Engines.Selenium/Extras/ByIdOrName.cs → ...tWare.Engines.Common/Extras/ByIdOrName.cs b/...are.Engines.Selenium/Extras/ByIdOrName.cs → ...tWare.Engines.Common/Extras/ByIdOrName.cs
@@ -3,7 +3,7 @@
 using System.Globalization;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Finds element when the id or the name attribute has the specified value.

diff --git a/...s.Selenium/Extras/CacheLookupAttribute.cs → ...nes.Common/Extras/CacheLookupAttribute.cs b/...s.Selenium/Extras/CacheLookupAttribute.cs → ...nes.Common/Extras/CacheLookupAttribute.cs
@@ -1,5 +1,5 @@
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Marks the element so that lookups to the browser page are cached. This class cannot be inherited.

diff --git a/....Selenoid/Extras/DefaultElementLocator.cs → ...es.Common/Extras/DefaultElementLocator.cs b/....Selenoid/Extras/DefaultElementLocator.cs → ...es.Common/Extras/DefaultElementLocator.cs
@@ -3,7 +3,7 @@
 using System.Collections.ObjectModel;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// A default locator for elements for use with the <see cref="PageFactory"/>. This locator

diff --git a/...xtras/DefaultPageObjectMemberDecorator.cs → ...xtras/DefaultPageObjectMemberDecorator.cs b/...xtras/DefaultPageObjectMemberDecorator.cs → ...xtras/DefaultPageObjectMemberDecorator.cs
@@ -5,7 +5,7 @@
 using OpenQA.Selenium;
 using TestWare.Engines.Selenium.Extras.MemberBuilders;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Default decorator determining how members of a class which represent elements in a Page Object

diff --git a/...nes.Selenium/Extras/ExpectedConditions.cs → ...gines.Common/Extras/ExpectedConditions.cs b/...nes.Selenium/Extras/ExpectedConditions.cs → ...gines.Common/Extras/ExpectedConditions.cs
@@ -3,7 +3,7 @@
 using System.Text.RegularExpressions;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Supplies a set of common conditions that can be waited for using <see cref="WebDriverWait"/>.
@@ -73,7 +73,7 @@ public static Func<IWebDriver, bool> UrlMatches(string regex)
         return (driver) =>
         {
             var currentUrl = driver.Url;
-            var pattern = new Regex(regex, RegexOptions.IgnoreCase);
+            var pattern = new Regex(regex, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(10));
             var match = pattern.Match(currentUrl);
             return match.Success;
         };

diff --git a/...es.Selenium/Extras/FindsByAllAttribute.cs → ...ines.Common/Extras/FindsByAllAttribute.cs b/...es.Selenium/Extras/FindsByAllAttribute.cs → ...ines.Common/Extras/FindsByAllAttribute.cs
@@ -1,5 +1,5 @@
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Marks elements to indicate that found elements should match the criteria of

diff --git a/...gines.Selenium/Extras/FindsByAttribute.cs → ...Engines.Common/Extras/FindsByAttribute.cs b/...gines.Selenium/Extras/FindsByAttribute.cs → ...Engines.Common/Extras/FindsByAttribute.cs
@@ -3,7 +3,7 @@
 using System.ComponentModel;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Marks program elements with methods by which to find a corresponding element on the page. Used

diff --git a/...lenium/Extras/FindsBySequenceAttribute.cs → ...Common/Extras/FindsBySequenceAttribute.cs b/...lenium/Extras/FindsBySequenceAttribute.cs → ...Common/Extras/FindsBySequenceAttribute.cs
@@ -1,6 +1,6 @@
 
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Marks elements to indicate that each <see cref="FindsByAttribute"/> on the field or

diff --git a/...s/TestWare.Engines.Selenoid/Extras/How.cs → ...mon/TestWare.Engines.Common/Extras/How.cs b/...s/TestWare.Engines.Selenoid/Extras/How.cs → ...mon/TestWare.Engines.Common/Extras/How.cs
@@ -1,5 +1,5 @@
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Provides the lookup methods for the FindsBy attribute (for using in PageObjects)

diff --git a/...ngines.Selenoid/Extras/IElementLocator.cs → ....Engines.Common/Extras/IElementLocator.cs b/...ngines.Selenoid/Extras/IElementLocator.cs → ....Engines.Common/Extras/IElementLocator.cs
@@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Interface describing how elements are to be located by a <see cref="PageFactory"/>.

diff --git a/...nium/Extras/IPageObjectMemberDecorator.cs → ...mmon/Extras/IPageObjectMemberDecorator.cs b/...nium/Extras/IPageObjectMemberDecorator.cs → ...mmon/Extras/IPageObjectMemberDecorator.cs
@@ -2,7 +2,7 @@
 
 using System.Reflection;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Interface describing how members of a class which represent elements in a Page Object

diff --git a/...m/Extras/MemberBuilders/IMemberBuilder.cs → ...n/Extras/MemberBuilders/IMemberBuilder.cs b/...m/Extras/MemberBuilders/IMemberBuilder.cs → ...n/Extras/MemberBuilders/IMemberBuilder.cs
@@ -18,6 +18,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using OpenQA.Selenium;
+using TestWare.Engines.Common.Extras;
 
 namespace TestWare.Engines.Selenium.Extras.MemberBuilders;
 

diff --git a/...xtras/MemberBuilders/WebElementBuilder.cs → ...xtras/MemberBuilders/WebElementBuilder.cs b/...xtras/MemberBuilders/WebElementBuilder.cs → ...xtras/MemberBuilders/WebElementBuilder.cs
@@ -18,6 +18,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using OpenQA.Selenium;
+using TestWare.Engines.Common.Extras;
 
 namespace TestWare.Engines.Selenium.Extras.MemberBuilders;
 

diff --git a/...s/MemberBuilders/WebElementListBuilder.cs → ...s/MemberBuilders/WebElementListBuilder.cs b/...s/MemberBuilders/WebElementListBuilder.cs → ...s/MemberBuilders/WebElementListBuilder.cs
diff --git a/...s/MemberBuilders/WrappedElementBuilder.cs → ...s/MemberBuilders/WrappedElementBuilder.cs b/...s/MemberBuilders/WrappedElementBuilder.cs → ...s/MemberBuilders/WrappedElementBuilder.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using OpenQA.Selenium;
+using TestWare.Engines.Common.Extras;
 
 namespace TestWare.Engines.Selenium.Extras.MemberBuilders;
 

diff --git a/...mberBuilders/WrappedElementListBuilder.cs → ...mberBuilders/WrappedElementListBuilder.cs b/...mberBuilders/WrappedElementListBuilder.cs → ...mberBuilders/WrappedElementListBuilder.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using OpenQA.Selenium;
+using TestWare.Engines.Common.Extras;
 
 namespace TestWare.Engines.Selenium.Extras.MemberBuilders;
 

diff --git a/...re.Engines.Selenoid/Extras/PageFactory.cs → ...Ware.Engines.Common/Extras/PageFactory.cs b/...re.Engines.Selenoid/Extras/PageFactory.cs → ...Ware.Engines.Common/Extras/PageFactory.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Provides the ability to produce Page Objects modeling a page. This class cannot be inherited.

diff --git a/...Selenium/Extras/RetryingElementLocator.cs → ...s.Common/Extras/RetryingElementLocator.cs b/...Selenium/Extras/RetryingElementLocator.cs → ...s.Common/Extras/RetryingElementLocator.cs
@@ -3,7 +3,7 @@
 using System.Collections.ObjectModel;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// A locator for elements for use with the <see cref="PageFactory"/> that retries locating

diff --git a/...s.Selenium/Extras/WebDriverObjectProxy.cs → ...nes.Common/Extras/WebDriverObjectProxy.cs b/...s.Selenium/Extras/WebDriverObjectProxy.cs → ...nes.Common/Extras/WebDriverObjectProxy.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Represents a base proxy class for objects used with the PageFactory.

diff --git a/...s.Selenium/Extras/WebElementEnumerable.cs → ...nes.Common/Extras/WebElementEnumerable.cs b/...s.Selenium/Extras/WebElementEnumerable.cs → ...nes.Common/Extras/WebElementEnumerable.cs
@@ -1,6 +1,6 @@
 using TestWare.Engines.Selenium.Extras;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Due to Linq optimized execution in dotnet core for IList, some methods lead to multiple elements retrieval.

diff --git a/...es.Selenium/Extras/WebElementListProxy.cs → ...ines.Common/Extras/WebElementListProxy.cs b/...es.Selenium/Extras/WebElementListProxy.cs → ...ines.Common/Extras/WebElementListProxy.cs
@@ -3,7 +3,7 @@
 using System.Collections;
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Represents a proxy class for a list of elements to be used with the PageFactory.

diff --git a/...ngines.Selenoid/Extras/WebElementProxy.cs → ....Engines.Common/Extras/WebElementProxy.cs b/...ngines.Selenoid/Extras/WebElementProxy.cs → ....Engines.Common/Extras/WebElementProxy.cs
@@ -5,7 +5,7 @@
 using OpenQA.Selenium.Interactions.Internal;
 using OpenQA.Selenium.Internal;
 
-namespace TestWare.Engines.Selenoid.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Intercepts the request to a single <see cref="IWebElement"/>
@@ -63,9 +63,6 @@ public IWebElement WrappedElement
 
     public string GetCssValue(string propertyName) => WrappedElement.GetCssValue(propertyName);
 
-    [Obsolete ("Deprecated on IWebElement")]
-    public string GetProperty(string propertyName) => WrappedElement.GetProperty(propertyName);
-
     public void SendKeys(string text) => WrappedElement.SendKeys(text);
 
     public void Submit() => WrappedElement.Submit();

diff --git a/...es.Selenium/Extras/WrapsElementFactory.cs → ...ines.Common/Extras/WrapsElementFactory.cs b/...es.Selenium/Extras/WrapsElementFactory.cs → ...ines.Common/Extras/WrapsElementFactory.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 internal static class WrapsElementFactory
 {

diff --git a/....Selenium/Extras/WrapsElementListProxy.cs → ...es.Common/Extras/WrapsElementListProxy.cs b/....Selenium/Extras/WrapsElementListProxy.cs → ...es.Common/Extras/WrapsElementListProxy.cs
@@ -4,7 +4,7 @@
 using OpenQA.Selenium;
 using TestWare.Engines.Selenium.Extras;
 
-namespace TestWare.Engines.Selenium.Extras;
+namespace TestWare.Engines.Common.Extras;
 
 /// <summary>
 /// Represents a proxy class for a list of elements to be used with the PageFactory.

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
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Selenium.Support" Version="4.21.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.21.0" />
+  </ItemGroup>
+
+</Project>