Fix opera download url pattern.

rosolko · rosolko · commit 8d6b69296b6e · 2017-09-06T20:05:57.000+03:00
Add tests for download differents drivers.
Disable browser test for edge.
diff --git a/IntegrationTests/BrowserTests/BrowserTests.cs b/IntegrationTests/BrowserTests/BrowserTests.cs
@@ -13,12 +13,12 @@ public class BrowserData : IEnumerable<object[]>
     {
         private readonly List<object[]> _data = new List<object[]>
         {
-            new object[] {new ChromeConfig(), DriverType.Chrome, "chromedriver"},
-            new object[] {new EdgeConfig(), DriverType.Edge, "MicrosoftWebDriver"},
-            new object[] {new FirefoxConfig(), DriverType.Firefox, "geckodriver"},
-            new object[] {new InternetExplorerConfig(), DriverType.InternetExplorer, "IEDriverServer"},
-            new object[] {new OperaConfig(), DriverType.Opera, "operadriver"},
-            new object[] {new PhantomConfig(), DriverType.Phantom, "phantomjs"}
+            new object[] {new ChromeConfig(), DriverType.Chrome},
+//            new object[] {new EdgeConfig(), DriverType.Edge},
+            new object[] {new FirefoxConfig(), DriverType.Firefox},
+            new object[] {new InternetExplorerConfig(), DriverType.InternetExplorer},
+            new object[] {new OperaConfig(), DriverType.Opera},
+            new object[] {new PhantomConfig(), DriverType.Phantom}
         };
 
         public IEnumerator<object[]> GetEnumerator()
@@ -35,12 +35,10 @@ IEnumerator IEnumerable.GetEnumerator()
     public class BrowserTests : IDisposable
     {
         private IWebDriver _webDriver;
-        private string _driverExe;
 
         [Theory, ClassData(typeof(BrowserData)), Trait("Category", "Browser")]
-        protected void BrowserTest(IDriverConfig driverConfig, DriverType driverType, string driverExe)
+        protected void BrowserTest(IDriverConfig driverConfig, DriverType driverType)
         {
-            _driverExe = driverExe;
             new DriverManager().SetUpDriver(driverConfig);
             _webDriver = new DriverCreator().Create(driverType);
             _webDriver.Navigate().GoToUrl("https://www.wikipedia.org");
@@ -57,10 +55,6 @@ public void Dispose()
             {
                 Console.WriteLine(ex.Message, ex);
             }
-            finally
-            {
-                Helper.KillProcesses(_driverExe);
-            }
         }
     }
 }
diff --git a/IntegrationTests/BrowserTests/Helper.cs b/IntegrationTests/BrowserTests/Helper.cs
diff --git a/IntegrationTests/DriverDownloadTests.cs b/IntegrationTests/DriverDownloadTests.cs
@@ -0,0 +1,41 @@
+﻿using System.Collections;
+using System.Collections.Generic;
+using WebDriverManager;
+using WebDriverManager.DriverConfigs;
+using WebDriverManager.DriverConfigs.Impl;
+using Xunit;
+
+namespace IntegrationTests
+{
+    public class DriverData : IEnumerable<object[]>
+    {
+        private readonly List<object[]> _data = new List<object[]>
+        {
+            new object[] {new ChromeConfig()},
+            new object[] {new EdgeConfig()},
+            new object[] {new FirefoxConfig()},
+            new object[] {new InternetExplorerConfig()},
+            new object[] {new OperaConfig()},
+            new object[] {new PhantomConfig()}
+        };
+
+        public IEnumerator<object[]> GetEnumerator()
+        {
+            return _data.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+
+    public class DriverDownloadTests
+    {
+        [Theory, ClassData(typeof(DriverData)), Trait("Category", "Config")]
+        protected void DriverDownloadTest(IDriverConfig driverConfig)
+        {
+            new DriverManager().SetUpDriver(driverConfig);
+        }
+    }
+}
diff --git a/IntegrationTests/DriverManagerTests/CustomConfigTests.cs b/IntegrationTests/DriverManagerTests/CustomConfigTests.cs
@@ -10,12 +10,10 @@ namespace IntegrationTests.DriverManagerTests
     public class CustomConfigTests : IDisposable
     {
         private IWebDriver _webDriver;
-        private string _driverExe;
 
         [Fact, Trait("Category", "Browser")]
         protected void CustomConfigTest()
         {
-            _driverExe = "chromedriver";
             new DriverManager().SetUpDriver(new TaobaoChromeConfig());
             _webDriver = new DriverCreator().Create(DriverType.Chrome);
             _webDriver.Navigate().GoToUrl("https://www.wikipedia.org");
@@ -32,10 +30,6 @@ public void Dispose()
             {
                 Console.WriteLine(ex.Message, ex);
             }
-            finally
-            {
-                Helper.KillProcesses(_driverExe);
-            }
         }
     }
 }
diff --git a/IntegrationTests/DriverManagerTests/CustomServiceTests.cs b/IntegrationTests/DriverManagerTests/CustomServiceTests.cs
@@ -13,7 +13,6 @@ public class CustomServiceTests: IDisposable
         private IWebDriver _webDriver;
         private readonly BinaryService _customBinaryService;
         private readonly VariableService _customVariableService;
-        private string _driverExe;
 
         public CustomServiceTests()
         {
@@ -24,7 +23,6 @@ public CustomServiceTests()
         [Fact, Trait("Category", "Browser")]
         protected void CustomServiceTest()
         {
-            _driverExe = "geckodriver";
             new DriverManager(_customBinaryService, _customVariableService).SetUpDriver(new FirefoxConfig());
             _webDriver = new DriverCreator().Create(DriverType.Firefox);
             _webDriver.Navigate().GoToUrl("https://www.wikipedia.org");
@@ -41,10 +39,6 @@ public void Dispose()
             {
                 Console.WriteLine(ex.Message, ex);
             }
-            finally
-            {
-                Helper.KillProcesses(_driverExe);
-            }
         }
     }
 }
diff --git a/IntegrationTests/DriverManagerTests/ManualSetupTests.cs b/IntegrationTests/DriverManagerTests/ManualSetupTests.cs
@@ -40,10 +40,6 @@ public void Dispose()
             {
                 Console.WriteLine(ex.Message, ex);
             }
-            finally
-            {
-                Helper.KillProcesses(_driverName);
-            }
         }
     }
 }
diff --git a/IntegrationTests/IntegrationTests.csproj b/IntegrationTests/IntegrationTests.csproj
@@ -62,7 +62,7 @@
     <Compile Include="BrowserTests\BrowserTests.cs" />
     <Compile Include="BrowserTests\DriverCreator.cs" />
     <Compile Include="BrowserTests\DriverType.cs" />
-    <Compile Include="BrowserTests\Helper.cs" />
+    <Compile Include="DriverDownloadTests.cs" />
     <Compile Include="DriverManagerTests\CustomConfigTests.cs" />
     <Compile Include="DriverManagerTests\ManualSetupTests.cs" />
     <Compile Include="DriverManagerTests\CustomServiceTests.cs" />
diff --git a/WebDriverManager/DriverConfigs/Impl/OperaConfig.cs b/WebDriverManager/DriverConfigs/Impl/OperaConfig.cs
@@ -14,12 +14,12 @@ public virtual string GetName()
 
         public virtual string GetUrl32()
         {
-            return "https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win32.zip";
+            return "https://github.com/operasoftware/operachromiumdriver/releases/download/v.<version>/operadriver_win32.zip";
         }
 
         public virtual string GetUrl64()
         {
-            return "https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win64.zip";
+            return "https://github.com/operasoftware/operachromiumdriver/releases/download/v.<version>/operadriver_win64.zip";
         }
 
         public virtual string GetBinaryName()

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ public class BrowserData : IEnumerable<object[]>`
`13`	`13`	`{`
`14`	`14`	`private readonly List<object[]> _data = new List<object[]>`
`15`	`15`	`{`
`16`		`- new object[] {new ChromeConfig(), DriverType.Chrome, "chromedriver"},`
`17`		`- new object[] {new EdgeConfig(), DriverType.Edge, "MicrosoftWebDriver"},`
`18`		`- new object[] {new FirefoxConfig(), DriverType.Firefox, "geckodriver"},`
`19`		`- new object[] {new InternetExplorerConfig(), DriverType.InternetExplorer, "IEDriverServer"},`
`20`		`- new object[] {new OperaConfig(), DriverType.Opera, "operadriver"},`
`21`		`- new object[] {new PhantomConfig(), DriverType.Phantom, "phantomjs"}`
	`16`	`+ new object[] {new ChromeConfig(), DriverType.Chrome},`
	`17`	`+// new object[] {new EdgeConfig(), DriverType.Edge},`
	`18`	`+ new object[] {new FirefoxConfig(), DriverType.Firefox},`
	`19`	`+ new object[] {new InternetExplorerConfig(), DriverType.InternetExplorer},`
	`20`	`+ new object[] {new OperaConfig(), DriverType.Opera},`
	`21`	`+ new object[] {new PhantomConfig(), DriverType.Phantom}`
`22`	`22`	`};`
`23`	`23`
`24`	`24`	`public IEnumerator<object[]> GetEnumerator()`
`@@ -35,12 +35,10 @@ IEnumerator IEnumerable.GetEnumerator()`
`35`	`35`	`public class BrowserTests : IDisposable`
`36`	`36`	`{`
`37`	`37`	`private IWebDriver _webDriver;`
`38`		`- private string _driverExe;`
`39`	`38`
`40`	`39`	`[Theory, ClassData(typeof(BrowserData)), Trait("Category", "Browser")]`
`41`		`- protected void BrowserTest(IDriverConfig driverConfig, DriverType driverType, string driverExe)`
	`40`	`+ protected void BrowserTest(IDriverConfig driverConfig, DriverType driverType)`
`42`	`41`	`{`
`43`		`- _driverExe = driverExe;`
`44`	`42`	`new DriverManager().SetUpDriver(driverConfig);`
`45`	`43`	`_webDriver = new DriverCreator().Create(driverType);`
`46`	`44`	`_webDriver.Navigate().GoToUrl("https://www.wikipedia.org");`
`@@ -57,10 +55,6 @@ public void Dispose()`
`57`	`55`	`{`
`58`	`56`	`Console.WriteLine(ex.Message, ex);`
`59`	`57`	`}`
`60`		`- finally`
`61`		`- {`
`62`		`- Helper.KillProcesses(_driverExe);`
`63`		`- }`
`64`	`58`	`}`
`65`	`59`	`}`
`66`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,10 @@ namespace IntegrationTests.DriverManagerTests`
`10`	`10`	`public class CustomConfigTests : IDisposable`
`11`	`11`	`{`
`12`	`12`	`private IWebDriver _webDriver;`
`13`		`- private string _driverExe;`
`14`	`13`
`15`	`14`	`[Fact, Trait("Category", "Browser")]`
`16`	`15`	`protected void CustomConfigTest()`
`17`	`16`	`{`
`18`		`- _driverExe = "chromedriver";`
`19`	`17`	`new DriverManager().SetUpDriver(new TaobaoChromeConfig());`
`20`	`18`	`_webDriver = new DriverCreator().Create(DriverType.Chrome);`
`21`	`19`	`_webDriver.Navigate().GoToUrl("https://www.wikipedia.org");`
`@@ -32,10 +30,6 @@ public void Dispose()`
`32`	`30`	`{`
`33`	`31`	`Console.WriteLine(ex.Message, ex);`
`34`	`32`	`}`
`35`		`- finally`
`36`		`- {`
`37`		`- Helper.KillProcesses(_driverExe);`
`38`		`- }`
`39`	`33`	`}`
`40`	`34`	`}`
`41`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public class CustomServiceTests: IDisposable`
`13`	`13`	`private IWebDriver _webDriver;`
`14`	`14`	`private readonly BinaryService _customBinaryService;`
`15`	`15`	`private readonly VariableService _customVariableService;`
`16`		`- private string _driverExe;`
`17`	`16`
`18`	`17`	`public CustomServiceTests()`
`19`	`18`	`{`
`@@ -24,7 +23,6 @@ public CustomServiceTests()`
`24`	`23`	`[Fact, Trait("Category", "Browser")]`
`25`	`24`	`protected void CustomServiceTest()`
`26`	`25`	`{`
`27`		`- _driverExe = "geckodriver";`
`28`	`26`	`new DriverManager(_customBinaryService, _customVariableService).SetUpDriver(new FirefoxConfig());`
`29`	`27`	`_webDriver = new DriverCreator().Create(DriverType.Firefox);`
`30`	`28`	`_webDriver.Navigate().GoToUrl("https://www.wikipedia.org");`
`@@ -41,10 +39,6 @@ public void Dispose()`
`41`	`39`	`{`
`42`	`40`	`Console.WriteLine(ex.Message, ex);`
`43`	`41`	`}`
`44`		`- finally`
`45`		`- {`
`46`		`- Helper.KillProcesses(_driverExe);`
`47`		`- }`
`48`	`42`	`}`
`49`	`43`	`}`
`50`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,6 @@ public void Dispose()`
`40`	`40`	`{`
`41`	`41`	`Console.WriteLine(ex.Message, ex);`
`42`	`42`	`}`
`43`		`- finally`
`44`		`- {`
`45`		`- Helper.KillProcesses(_driverName);`
`46`		`- }`
`47`	`43`	`}`
`48`	`44`	`}`
`49`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ public virtual string GetName()`
`14`	`14`
`15`	`15`	`public virtual string GetUrl32()`
`16`	`16`	`{`
`17`		`- return "https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win32.zip";`
	`17`	`+ return "https://github.com/operasoftware/operachromiumdriver/releases/download/v.<version>/operadriver_win32.zip";`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public virtual string GetUrl64()`
`21`	`21`	`{`
`22`		`- return "https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win64.zip";`
	`22`	`+ return "https://github.com/operasoftware/operachromiumdriver/releases/download/v.<version>/operadriver_win64.zip";`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public virtual string GetBinaryName()`