Add some comments

epam · Dec 5, 2017 · be95fe3 · be95fe3
2 parents 4dde7c9 + b697c74
commit be95fe3
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 2 deletions.
diff --git a/C#.Net/JDI ImageToWebElement/JDI ImageToWebElement.csproj b/C#.Net/JDI ImageToWebElement/JDI ImageToWebElement.csproj
@@ -38,6 +38,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
+    </Reference>
     <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
       <HintPath>..\packages\SikuliIntegrator.1.1.0\lib\Ionic.Zip.dll</HintPath>
     </Reference>
@@ -59,6 +62,9 @@
     <Reference Include="WebDriver.Support, Version=3.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Selenium.Support.3.7.0\lib\net45\WebDriver.Support.dll</HintPath>
     </Reference>
+    <Reference Include="WebDriverManager, Version=2.2.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebDriverManager.2.2.4\lib\net452\WebDriverManager.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ImagePattnerSerach.cs" />
@@ -117,6 +123,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\Selenium.Chrome.WebDriver.2.33\build\Selenium.Chrome.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Chrome.WebDriver.2.33\build\Selenium.Chrome.WebDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.IEDriver64.3.3.0.1\build\Selenium.WebDriver.IEDriver64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.IEDriver64.3.3.0.1\build\Selenium.WebDriver.IEDriver64.targets'))" />
   </Target>
   <Import Project="..\packages\Selenium.Chrome.WebDriver.2.33\build\Selenium.Chrome.WebDriver.targets" Condition="Exists('..\packages\Selenium.Chrome.WebDriver.2.33\build\Selenium.Chrome.WebDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.IEDriver64.3.3.0.1\build\Selenium.WebDriver.IEDriver64.targets" Condition="Exists('..\packages\Selenium.WebDriver.IEDriver64.3.3.0.1\build\Selenium.WebDriver.IEDriver64.targets')" />
 </Project>
diff --git a/C#.Net/JDI ImageToWebElement/Tests/TestBase.cs b/C#.Net/JDI ImageToWebElement/Tests/TestBase.cs
@@ -5,22 +5,67 @@
 using JDI_Web.Selenium.Elements.Composite;
 using JDI_Web.Settings;
 using NUnit.Framework;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Chrome;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WebDriverManager;
+using WebDriverManager.DriverConfigs.Impl;
+using WebDriverManager.Helpers;
+using WebDriverManager.Services;
 using static JDI_UIWebTests.UIObjects.TestSite;
 
 namespace JDI_ImageToWebElement.Tests
 {
+
+    public class CustomVariableService : IVariableService
+    {
+        public void SetupVariable(string path)
+        {
+            UpdatePath(path);
+        }
+
+        protected void UpdatePath(string path)
+        {
+            const string name = "PATH";
+            var pathVariable = Environment.GetEnvironmentVariable(name, EnvironmentVariableTarget.Process);
+            if (pathVariable == null) throw new ArgumentNullException($"Can't get {name} variable");
+            path = Path.GetDirectoryName(path);
+            var newPathVariable = $"{path};{pathVariable}";
+            if (path != null && !pathVariable.Contains(path))
+                Environment.SetEnvironmentVariable(name, newPathVariable, EnvironmentVariableTarget.Process);
+        }
+    }
+
+
     [SetUpFixture]
     public class TestBase
     {
         [OneTimeSetUp]
         protected void SetUp()
         {
+          //  if (!new JDI_Web.Selenium.DriverManager.WebDriverManager().IsLocalVersionLatestVersion(JDI_Web.Selenium.DriverFactory.DriverTypes.Firefox, AppDomain.CurrentDomain.BaseDirectory))
+           //     new JDI_Web.Selenium.DriverManager.WebDriverManager().GetLatestVersion(JDI_Web.Selenium.DriverFactory.DriverTypes.Firefox);
+            //string version = versionInfo.ProductVersion; // Will typically return "1.0.0" in your case
+           // new JDI_Web.Selenium.DriverManager.WebDriverManager().GetLatestVersion(DriverTypes.Chrome);
+         //   string url = new ChromeConfig().GetUrl64();
+         //   string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory);
+          //  string name = new ChromeConfig().GetBinaryName();
+          //  string vrs = new ChromeConfig().GetLatestVersion();
+         //   var versionInfo = FileVersionInfo.GetVersionInfo(Path.Combine(path, name));
+         //   string version = versionInfo.ProductVersion;
+       //     url = UrlHelper.BuildUrl(url, "2.33");
+         //   new DriverManager().SetUpDriver(url,Path.Combine(path,name), name);
+       //     IWebDriver drv = new ChromeDriver();
+
+            // WebSettings.UseDriver(WebSettings.() -> getIEDriver());
             WebSettings.InitNUnitDefault();
+            //WebSettings.UseDriver(DriverTypes.IE);
             var logger = JDISettings.Logger;
             logger.Info("Init test run...");
             WinProcUtils.KillAllRunWebDrivers();

diff --git a/C#.Net/JDI ImageToWebElement/packages.config b/C#.Net/JDI ImageToWebElement/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AngleSharp" version="0.9.9" targetFramework="net461" />
   <package id="NUnit" version="3.9.0" targetFramework="net461" />
   <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
   <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net461" />
@@ -12,5 +13,7 @@
   <package id="Selenium.Chrome.WebDriver" version="2.33" targetFramework="net461" />
   <package id="Selenium.Support" version="3.7.0" targetFramework="net461" />
   <package id="Selenium.WebDriver" version="3.7.0" targetFramework="net461" />
+  <package id="Selenium.WebDriver.IEDriver64" version="3.3.0.1" targetFramework="net461" />
   <package id="SikuliIntegrator" version="1.1.0" targetFramework="net461" />
+  <package id="WebDriverManager" version="2.2.4" targetFramework="net461" />
 </packages>
diff --git a/C#.Net/JDI/Web/JDI Web/Selenium/DriverFactory/WebDriverFactory.cs b/C#.Net/JDI/Web/JDI Web/Selenium/DriverFactory/WebDriverFactory.cs
@@ -91,8 +91,8 @@ private string RegisterLocalDriver(DriverTypes driverType)
 
             if (Settings.WebSettings.GetLatestDriver)
             {
-                if(!DriverManager.WebDriverManager.IsLocalVersionLatestVersion(driverType, DriverPath))
-                DriverPath = DriverManager.WebDriverManager.GetLatestVersion(driverType);
+                if(!DriverManager.DriverManager.IsLocalVersionLatestVersion(driverType, DriverPath))
+                DriverPath = DriverManager.DriverManager.GetLatestVersion(driverType);
             }
             return RegisterDriver(GetDriverName(_driverNamesDictionary[driverType]),
                 () => WebDriverSettings(_driversDictionary[driverType](DriverPath)));