Split driver and service

Author: nvborisenko

dotnet/test/common/AssemblyFixture.cs

@@ -47,6 +47,7 @@ public async Task RunBeforeAnyTestAsync()
         public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
+            EnvironmentManager.Instance.CloseCurrentDriverService();
             await EnvironmentManager.Instance.WebServer.StopAsync();
             if (EnvironmentManager.Instance.Browser == Browser.Remote)
             {

dotnet/test/common/Environment/DriverFactory.cs

@@ -55,17 +55,51 @@ private void PopulateOptionsTypes()
 
         public event EventHandler<DriverStartingEventArgs> DriverStarting;
 
-        public IWebDriver CreateDriver(Type driverType)
+        public DriverService CreateDriverService(Type driverType)
         {
-            return CreateDriverWithOptions(driverType, null);
+            DriverService service = null;
+
+            if (typeof(ChromeDriver).IsAssignableFrom(driverType))
+            {
+                service = ChromeDriverService.CreateDefaultService();
+            }
+            else if (typeof(EdgeDriver).IsAssignableFrom(driverType))
+            {
+                service = EdgeDriverService.CreateDefaultService();
+            }
+            else if (typeof(InternetExplorerDriver).IsAssignableFrom(driverType))
+            {
+                service = InternetExplorerDriverService.CreateDefaultService();
+            }
+            else if (typeof(FirefoxDriver).IsAssignableFrom(driverType))
+            {
+                service = FirefoxDriverService.CreateDefaultService();
+            }
+            else if (typeof(SafariDriver).IsAssignableFrom(driverType))
+            {
+                service = SafariDriverService.CreateDefaultService();
+            }
+
+            if (!String.IsNullOrEmpty(this.driverPath) && service != null)
+            {
+                service.DriverServicePath = Path.GetDirectoryName(this.driverPath);
+                service.DriverServiceExecutableName = Path.GetFileName(this.driverPath);
+            }
+
+            return service;
         }
 
-        public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverOptions)
+        public IWebDriver CreateDriver(DriverService service, Type driverType)
+        {
+            return CreateDriverWithOptions(service, driverType, null);
+        }
+
+        public IWebDriver CreateDriverWithOptions(DriverService service, Type driverType, DriverOptions driverOptions)
         {
             Console.WriteLine($"Creating new driver of {driverType} type...");
 
             Browser browser = Browser.All;
-            DriverService service = null;
+            
             DriverOptions options = null;
 
             List<Type> constructorArgTypeList = new List<Type>();
@@ -78,7 +112,6 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
                 var chromeOptions = (ChromeOptions)options;
                 chromeOptions.AddArguments("--no-sandbox", "--disable-dev-shm-usage");
 
-                service = ChromeDriverService.CreateDefaultService();
                 if (!string.IsNullOrEmpty(this.browserBinaryLocation))
                 {
                     ((ChromeOptions)options).BinaryLocation = this.browserBinaryLocation;
@@ -92,7 +125,6 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
                 var edgeOptions = (EdgeOptions)options;
                 edgeOptions.AddArguments("--no-sandbox", "--disable-dev-shm-usage");
 
-                service = EdgeDriverService.CreateDefaultService();
                 if (!string.IsNullOrEmpty(this.browserBinaryLocation))
                 {
                     ((EdgeOptions)options).BinaryLocation = this.browserBinaryLocation;
@@ -102,13 +134,11 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
             {
                 browser = Browser.IE;
                 options = GetDriverOptions<InternetExplorerOptions>(driverType, driverOptions);
-                service = InternetExplorerDriverService.CreateDefaultService();
             }
             else if (typeof(FirefoxDriver).IsAssignableFrom(driverType))
             {
                 browser = Browser.Firefox;
                 options = GetDriverOptions<FirefoxOptions>(driverType, driverOptions);
-                service = FirefoxDriverService.CreateDefaultService();
                 if (!string.IsNullOrEmpty(this.browserBinaryLocation))
                 {
                     ((FirefoxOptions)options).BinaryLocation = this.browserBinaryLocation;
@@ -118,18 +148,12 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
             {
                 browser = Browser.Safari;
                 options = GetDriverOptions<SafariOptions>(driverType, driverOptions);
-                service = SafariDriverService.CreateDefaultService();
-            }
-
-            if (!String.IsNullOrEmpty(this.driverPath) && service != null)
-            {
-                service.DriverServicePath = Path.GetDirectoryName(this.driverPath);
-                service.DriverServiceExecutableName = Path.GetFileName(this.driverPath);
             }
 
             this.OnDriverLaunching(service, options);
 
             driver = (IWebDriver)Activator.CreateInstance(driverType, service, options);
+
             return driver;
         }
 

dotnet/test/common/Environment/EnvironmentManager.cs

@@ -33,6 +33,7 @@ public class EnvironmentManager
         private static EnvironmentManager instance;
         private Type driverType;
         private Browser browser;
+        private DriverService driverService;
         private IWebDriver driver;
         private UrlBuilder urlBuilder;
         private TestWebServer webServer;
@@ -205,7 +206,9 @@ private EnvironmentManager()
             {
                 webServer.StopAsync().Wait();
             }
+
             CloseCurrentDriver();
+            CloseCurrentDriverService();
         }
 
         public event EventHandler<DriverStartingEventArgs> DriverStarting;
@@ -265,6 +268,18 @@ public UrlBuilder UrlBuilder
             }
         }
 
+        public DriverService GetCurrentDriverService()
+        {
+            if (driverService != null)
+            {
+                return driverService;
+            }
+
+            driverService = driverFactory.CreateDriverService(driverType);
+
+            return driverService;
+        }
+
         public IWebDriver GetCurrentDriver()
         {
             if (driver != null)
@@ -277,14 +292,19 @@ public IWebDriver GetCurrentDriver()
             }
         }
 
+        public DriverService CreateDriverServiceInstance()
+        {
+            return driverFactory.CreateDriverService(driverType);
+        }
+
         public IWebDriver CreateDriverInstance()
         {
-            return driverFactory.CreateDriver(driverType);
+            return driverFactory.CreateDriver(GetCurrentDriverService(), driverType);
         }
 
         public IWebDriver CreateDriverInstance(DriverOptions options)
         {
-            return driverFactory.CreateDriverWithOptions(driverType, options);
+            return driverFactory.CreateDriverWithOptions(GetCurrentDriverService(), driverType, options);
         }
 
         public IWebDriver CreateFreshDriver()
@@ -294,6 +314,13 @@ public IWebDriver CreateFreshDriver()
             return driver;
         }
 
+        public void CloseCurrentDriverService()
+        {
+            driverService?.Dispose();
+
+            driverService = null;
+        }
+
         public void CloseCurrentDriver()
         {
             if (driver != null)