Skip to content

Commit

Permalink
Merge branch 'master' into Feature/TestContainers
Browse files Browse the repository at this point in the history
  • Loading branch information
Maheshkale447 committed Jan 29, 2024
2 parents 4284211 + a23caee commit 7d8ba79
Show file tree
Hide file tree
Showing 17 changed files with 68 additions and 68 deletions.
14 changes: 7 additions & 7 deletions Ginger/Ginger/Ginger.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -658,16 +658,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.1.3.50" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.16.0" />
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
<PackageReference Include="EPPlus" Version="6.0.4" />
<PackageReference Include="FontAwesome5" Version="2.1.11" />
<PackageReference Include="Gherkin" Version="5.1.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
<PackageReference Include="LiteDB" Version="5.0.17" />
<PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
<PackageReference Include="log4net" Version="2.0.14" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.5.0" />
<PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1001" />
<PackageReference Include="Mono.Posix" Version="7.1.0-final.1.21458.1" />
Expand All @@ -679,8 +679,8 @@
<PackageReference Include="sharpadbclient" Version="2.3.23" />
<PackageReference Include="Syncfusion.Shared.WPF" Version="20.1.0.55" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.Web.Services.Description" Version="8.0.0" />
<PackageReference Include="System.Windows.Forms.DataVisualization" Version="1.0.0-prerelease.20110.1" />
Expand Down
6 changes: 3 additions & 3 deletions Ginger/GingerAutoPilotTest/GingerAutoPilotTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

<ItemGroup>
<PackageReference Include="GingerTestHelper" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions Ginger/GingerConsoleTest/GingerConsoleTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<ItemGroup>
<PackageReference Include="GingerTestHelper" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
12 changes: 6 additions & 6 deletions Ginger/GingerCore/GingerCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -544,18 +544,18 @@
<PackageReference Include="AutoMapper">
<Version>12.0.1</Version>
</PackageReference>
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.10" />
<PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" />
<PackageReference Include="CassandraCSharpDriver">
<Version>3.19.5</Version>
</PackageReference>
<PackageReference Include="Castle.Core">
<Version>4.4.0</Version>
<Version>5.1.1</Version>
</PackageReference>
<PackageReference Include="CouchbaseNetClient">
<Version>2.7.11</Version>
</PackageReference>
<PackageReference Include="DocumentFormat.OpenXml">
<Version>2.16.0</Version>
<Version>3.0.1</Version>
</PackageReference>
<PackageReference Include="EPPlus">
<Version>6.0.4</Version>
Expand All @@ -568,13 +568,13 @@
<Version>3.15.0</Version>
</PackageReference>
<PackageReference Include="HtmlAgilityPack">
<Version>1.11.21</Version>
<Version>1.11.58</Version>
</PackageReference>
<PackageReference Include="LibGit2Sharp.NativeBinaries">
<Version>2.0.278</Version>
</PackageReference>
<PackageReference Include="log4net">
<Version>2.0.12</Version>
<Version>2.0.15</Version>
</PackageReference>
<PackageReference Include="lz4net">
<Version>1.0.15.93</Version>
Expand Down Expand Up @@ -622,7 +622,7 @@
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Drawing.Common">
<Version>8.0.0</Version>
<Version>8.0.1</Version>
</PackageReference>
<PackageReference Include="System.Globalization">
<Version>4.3.0</Version>
Expand Down
8 changes: 4 additions & 4 deletions Ginger/GingerCoreCommon/GingerCoreCommon.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Amdocs.Ginger.Common</RootNamespace>

<AssemblyVersion>24.1.1.1</AssemblyVersion>
<FileVersion>24.1.1.1</FileVersion>
<AssemblyVersion>24.2.1.1</AssemblyVersion>
<FileVersion>24.2.1.1</FileVersion>

<PackageId>Ginger.Core.Common</PackageId>
<Authors>Amdocs</Authors>
<Company>Amdocs</Company>
<Product>Ginger by Amdocs</Product>
<Copyright>Copyright © 2014-2022 European Support Limited</Copyright>

<Version>24.1.1.1</Version>
<Version>24.2.1.1</Version>
<Title>Ginger Core Common</Title>
</PropertyGroup>

Expand All @@ -41,7 +41,7 @@
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NJsonSchema" Version="9.13.10" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions Ginger/GingerCoreCommonTest/GingerCoreCommonTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

<ItemGroup>
<PackageReference Include="GingerTestHelper" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2689,7 +2689,7 @@ public Bitmap GetScreenShot(Tuple<int, int> setScreenSize = null, bool IsFullPag
{
Screenshot ss = ((ITakesScreenshot)Driver).GetScreenshot();
string filename = Path.GetTempFileName();
ss.SaveAsFile(filename, ScreenshotImageFormat.Png);
ss.SaveAsFile(filename);
return new System.Drawing.Bitmap(filename);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using DevToolsDomains = OpenQA.Selenium.DevTools.V117.DevToolsSessionDomains;
using DevToolsDomains = OpenQA.Selenium.DevTools.V121.DevToolsSessionDomains;

namespace GingerCore.Drivers
{
Expand Down Expand Up @@ -8925,7 +8925,7 @@ async Task<ElementInfo> IVisualTestingDriver.GetElementAtPoint(long ptX, long pt
parentElementLocation.X += elemInfo.X;
parentElementLocation.Y += elemInfo.Y;

Point p_Pos = GetElementPosition((RemoteWebElement)ele);
Point p_Pos = GetElementPosition((IWebElement)ele);
ptX -= p_Pos.X;
ptY -= p_Pos.Y;

Expand All @@ -8944,13 +8944,13 @@ async Task<ElementInfo> IVisualTestingDriver.GetElementAtPoint(long ptX, long pt
}
}

public RemoteWebElement GetElementFromPoint(long X, long Y)
public IWebElement GetElementFromPoint(long X, long Y)
{
while (true)
{
String s_Script = "return document.elementFromPoint(arguments[0], arguments[1]);";

RemoteWebElement i_Elem = (RemoteWebElement)((IJavaScriptExecutor)Driver).ExecuteScript(s_Script, X, Y);
IWebElement i_Elem = (IWebElement)((IJavaScriptExecutor)Driver).ExecuteScript(s_Script, X, Y);
if (i_Elem == null)
{
return null;
Expand All @@ -8969,7 +8969,7 @@ public RemoteWebElement GetElementFromPoint(long X, long Y)
}
}

public Point GetElementPosition(RemoteWebElement i_Elem)
public Point GetElementPosition(IWebElement i_Elem)
{
String s_Script = "var X, Y; "
+ "if (window.pageYOffset) " // supported by most browsers
Expand All @@ -8986,7 +8986,7 @@ public Point GetElementPosition(RemoteWebElement i_Elem)
+ "} "
+ "return new Array(X, Y);";

RemoteWebDriver i_Driver = (RemoteWebDriver)((RemoteWebElement)i_Elem).WrappedDriver;
RemoteWebDriver i_Driver = (RemoteWebDriver)((WebElement)i_Elem).WrappedDriver;
IList<Object> i_Coord = (IList<Object>)i_Driver.ExecuteScript(s_Script);

int s32_ScrollX = Convert.ToInt32(i_Coord[0]);
Expand Down Expand Up @@ -10068,9 +10068,9 @@ private void SetUPDevTools(IWebDriver webDriver)
try
{
//DevTool Session
devToolsSession = devTools.GetDevToolsSession(117);
devToolsSession = devTools.GetDevToolsSession(121);
devToolsDomains = devToolsSession.GetVersionSpecificDomains<DevToolsDomains>();
devToolsDomains.Network.Enable(new OpenQA.Selenium.DevTools.V117.Network.EnableCommandSettings());
devToolsDomains.Network.Enable(new OpenQA.Selenium.DevTools.V121.Network.EnableCommandSettings());
blockOrUnblockUrls();
}
catch (Exception ex)
Expand All @@ -10096,11 +10096,11 @@ private void blockOrUnblockUrls()
{
if (mAct.ControlAction == ActBrowserElement.eControlAction.SetBlockedUrls)
{
devToolsDomains.Network.SetBlockedURLs(new OpenQA.Selenium.DevTools.V117.Network.SetBlockedURLsCommandSettings() { Urls = getBlockedUrlsArray(mAct.GetInputParamCalculatedValue("sBlockedUrls")) });
devToolsDomains.Network.SetBlockedURLs(new OpenQA.Selenium.DevTools.V121.Network.SetBlockedURLsCommandSettings() { Urls = getBlockedUrlsArray(mAct.GetInputParamCalculatedValue("sBlockedUrls")) });
}
else if (mAct.ControlAction == ActBrowserElement.eControlAction.UnblockeUrls)
{
devToolsDomains.Network.SetBlockedURLs(new OpenQA.Selenium.DevTools.V117.Network.SetBlockedURLsCommandSettings() { Urls = new string[] { } });
devToolsDomains.Network.SetBlockedURLs(new OpenQA.Selenium.DevTools.V121.Network.SetBlockedURLsCommandSettings() { Urls = new string[] { } });
}
Thread.Sleep(300);
}
Expand Down Expand Up @@ -10188,7 +10188,7 @@ public async Task StopMonitoringNetworkLog(ActBrowserElement act)
act.AddOrUpdateReturnParamActual(act.ControlAction.ToString() + " " + val.Item1.ToString(), Convert.ToString(val.Item2));
}

await devToolsDomains.Network.Disable(new OpenQA.Selenium.DevTools.V117.Network.DisableCommandSettings());
await devToolsDomains.Network.Disable(new OpenQA.Selenium.DevTools.V121.Network.DisableCommandSettings());
devToolsSession.Dispose();
devTools.CloseDevToolsSession();

Expand Down
16 changes: 8 additions & 8 deletions Ginger/GingerCoreNET/GingerCoreNET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@

<PackageReference Include="CassandraCSharpDriver" Version="3.19.5" />

<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />

<PackageReference Include="AutoMapper" Version="12.0.1" />

Expand All @@ -250,15 +250,15 @@

<PackageReference Include="HBaseNet" Version="0.1.0" />

<PackageReference Include="HtmlAgilityPack" Version="1.11.21" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
<PackageReference Include="InputSimulatorStandard" Version="1.0.0" />

<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="2.0.278" />
<PackageReference Include="LiteDB" Version="5.0.17" />

<PackageReference Include="DocumentFormat.OpenXml" Version="2.9.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />

<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="log4net" Version="2.0.15" />

<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.5.0" />

Expand Down Expand Up @@ -292,15 +292,15 @@
<PackageReference Include="protobuf-net.Core" Version="3.2.26" />
<PackageReference Include="Protractor" Version="1.0.0" />
<PackageReference Include="RestSharp" Version="108.0.3" />
<PackageReference Include="Selenium.Support" Version="4.13.1" />
<PackageReference Include="Selenium.WebDriver" Version="4.13.1" />
<PackageReference Include="Selenium.Support" Version="4.17.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.17.0" />
<PackageReference Include="Selenium.WebDriver.Extensions" Version="4.1.0" />
<PackageReference Include="SharpAdbClient" Version="2.3.23" />
<PackageReference Include="SSH.NET" Version="2023.0.1" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.DispatchProxy" Version="4.7.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
Expand Down
6 changes: 3 additions & 3 deletions Ginger/GingerCoreNETUnitTest/GingerCoreNETUnitTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@
<PackageReference Include="Ginger.ExecuterService.Contracts" Version="23.5.1" />
<PackageReference Include="GingerTestHelper" Version="2.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="3.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="Testcontainers" Version="3.7.0" />
<PackageReference Include="Testcontainers.Couchbase" Version="3.7.0" />
Expand Down
8 changes: 4 additions & 4 deletions Ginger/GingerCoreTest/GingerCoreTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@
<Version>2.0.2</Version>
</PackageReference>
<PackageReference Include="log4net">
<Version>2.0.14</Version>
<Version>2.0.15</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestFramework">
<Version>2.2.10</Version>
<Version>3.2.0</Version>
</PackageReference>
<PackageReference Include="System.Resources.Extensions">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.310801">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Ginger/GingerPluginCore/GingerPluginCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="System.Reflection.DispatchProxy" Version="4.7.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Ginger/GingerPluginCoreTest/GingerPluginCoreTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

<ItemGroup>
<PackageReference Include="GingerTestHelper" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions Ginger/GingerTest/GingerTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

<ItemGroup>
<PackageReference Include="GingerTestHelper" Version="2.0.2" />
<PackageReference Include="log4net" Version="2.0.14" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="coverlet.collector" Version="3.1.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Ginger/GingerUtils/GingerUtils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions Ginger/GingerUtilsTest/GingerUtilsTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

<ItemGroup>
<PackageReference Include="GingerTestHelper" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 7d8ba79

Please sign in to comment.