Test improve

Author: rosolko

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},
-//            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}
+            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"}
         };
 
         public IEnumerator<object[]> GetEnumerator()
@@ -35,20 +35,39 @@ 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)
+        protected void BrowserTest(IDriverConfig driverConfig, DriverType driverType, string driverExe)
         {
-            new DriverManager().SetUpDriver(driverConfig);
+            _driverExe = driverExe;
+            if (driverType == DriverType.Phantom)
+            {
+                new DriverManager().SetUpDriver(driverConfig, "2.1.1");
+            }
+            else
+            {
+                new DriverManager().SetUpDriver(driverConfig);
+            }
             _webDriver = new DriverCreator().Create(driverType);
             _webDriver.Navigate().GoToUrl("https://www.wikipedia.org");
-            _webDriver.Navigate().GoToUrl("https://www.wikipedia.org");
             Assert.Equal("Wikipedia", _webDriver.Title);
         }
 
         public void Dispose()
         {
-            _webDriver.Quit();
+            try
+            {
+                _webDriver.Quit();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message, ex);
+            }
+            finally
+            {
+                Helper.KillProcesses(_driverExe);
+            }
         }
     }
 }

IntegrationTests/BrowserTests/Helper.cs

@@ -0,0 +1,16 @@
+using System.Diagnostics;
+
+namespace IntegrationTests.BrowserTests
+{
+    public static class Helper
+    {
+        public static void KillProcesses(string driverExe)
+        {
+            var driverProcesses = Process.GetProcessesByName(driverExe);
+            foreach (var driverProcess in driverProcesses)
+            {
+                driverProcess.Kill();
+            }
+        }
+    }
+}

IntegrationTests/DriverManagerTests/CustomConfigTests.cs

@@ -9,10 +9,12 @@ 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");
@@ -21,7 +23,18 @@ protected void CustomConfigTest()
 
         public void Dispose()
         {
-            _webDriver.Quit();
+            try
+            {
+                _webDriver.Quit();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message, ex);
+            }
+            finally
+            {
+                Helper.KillProcesses(_driverExe);
+            }
         }
     }
 }

IntegrationTests/DriverManagerTests/CustomServiceTests.cs

@@ -13,6 +13,7 @@ public class CustomServiceTests: IDisposable
         private IWebDriver _webDriver;
         private readonly BinaryService _customBinaryService;
         private readonly VariableService _customVariableService;
+        private string _driverExe;
 
         public CustomServiceTests()
         {
@@ -23,6 +24,7 @@ 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");
@@ -31,7 +33,18 @@ protected void CustomServiceTest()
 
         public void Dispose()
         {
-            _webDriver.Quit();
+            try
+            {
+                _webDriver.Quit();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message, ex);
+            }
+            finally
+            {
+                Helper.KillProcesses(_driverExe);
+            }
         }
     }
 }

IntegrationTests/DriverManagerTests/ManualSetupTests.cs

@@ -18,7 +18,7 @@ public ManualSetupTests()
         {
             _url = "https://chromedriver.storage.googleapis.com/2.25/chromedriver_win32.zip";
             _binaryOutput = Path.Combine(Directory.GetCurrentDirectory(), "Chrome", "2.25", "X32", "chromedriver.exe");
-            _driverName = "chromedriver.exe";
+            _driverName = "chromedriver";
         }
 
         [Fact, Trait("Category", "Browser")]
@@ -32,7 +32,18 @@ protected void ManualSetupTest()
 
         public void Dispose()
         {
-            _webDriver.Quit();
+            try
+            {
+                _webDriver.Quit();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message, ex);
+            }
+            finally
+            {
+                Helper.KillProcesses(_driverName);
+            }
         }
     }
 }

IntegrationTests/IntegrationTests.csproj

@@ -59,6 +59,7 @@
     <Compile Include="BrowserTests\BrowserTests.cs" />
     <Compile Include="BrowserTests\DriverCreator.cs" />
     <Compile Include="BrowserTests\DriverType.cs" />
+    <Compile Include="BrowserTests\Helper.cs" />
     <Compile Include="DriverManagerTests\CustomConfigTests.cs" />
     <Compile Include="DriverManagerTests\ManualSetupTests.cs" />
     <Compile Include="DriverManagerTests\CustomServiceTests.cs" />

WebDriverManager/DriverConfigs/Impl/InternetExplorerConfig.cs

@@ -10,7 +10,7 @@ public class InternetExplorerConfig : IDriverConfig
     {
         public string GetName()
         {
-            return "IE";
+            return "InternetExplorer";
         }
 
         public string GetUrl32()