[dotnet] Simplify testing driver factory

RenderMichael · RenderMichael · commit c321a466bed1 · 2025-02-06T01:05:56.000-05:00
diff --git a/dotnet/test/common/CustomDriverConfigs/DefaultSafariDriver.cs b/dotnet/test/common/CustomDriverConfigs/DefaultSafariDriver.cs
@@ -30,6 +30,11 @@ public DefaultSafariDriver(SafariOptions options)
         {
         }
 
+        public DefaultSafariDriver(SafariDriverService service)
+            : base(service)
+        {
+        }
+
         public DefaultSafariDriver(SafariDriverService service, SafariOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/DevChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/DevChannelChromeDriver.cs
@@ -32,6 +32,11 @@ public DevChannelChromeDriver(ChromeOptions options)
         {
         }
 
+        public DevChannelChromeDriver(ChromeDriverService service)
+            : base(service)
+        {
+        }
+
         public DevChannelChromeDriver(ChromeDriverService service, ChromeOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/DevChannelEdgeDriver.cs b/dotnet/test/common/CustomDriverConfigs/DevChannelEdgeDriver.cs
@@ -32,6 +32,11 @@ public DevChannelEdgeDriver(EdgeOptions options)
         {
         }
 
+        public DevChannelEdgeDriver(EdgeDriverService service)
+            : base(service)
+        {
+        }
+
         public DevChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/EdgeInternetExplorerModeDriver.cs b/dotnet/test/common/CustomDriverConfigs/EdgeInternetExplorerModeDriver.cs
@@ -35,6 +35,11 @@ public EdgeInternetExplorerModeDriver(InternetExplorerOptions options)
         {
         }
 
+        public EdgeInternetExplorerModeDriver(InternetExplorerDriverService service)
+            : base(service)
+        {
+        }
+
         public EdgeInternetExplorerModeDriver(InternetExplorerDriverService service, InternetExplorerOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/NightlyChannelFirefoxDriver.cs b/dotnet/test/common/CustomDriverConfigs/NightlyChannelFirefoxDriver.cs
@@ -35,6 +35,11 @@ public NightlyChannelFirefoxDriver(FirefoxOptions options)
         {
         }
 
+        public NightlyChannelFirefoxDriver(FirefoxDriverService service)
+         : base(service)
+        {
+        }
+
         public NightlyChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/SafariTechnologyPreviewDriver.cs b/dotnet/test/common/CustomDriverConfigs/SafariTechnologyPreviewDriver.cs
@@ -35,6 +35,11 @@ public SafariTechnologyPreviewDriver(SafariOptions options)
         {
         }
 
+        public SafariTechnologyPreviewDriver(SafariDriverService service)
+            : base(service)
+        {
+        }
+
         public SafariTechnologyPreviewDriver(SafariDriverService service, SafariOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs
@@ -32,6 +32,11 @@ public StableChannelChromeDriver(ChromeOptions options)
         {
         }
 
+        public StableChannelChromeDriver(ChromeDriverService service)
+            : base(service)
+        {
+        }
+
         public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelEdgeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelEdgeDriver.cs
@@ -33,10 +33,16 @@ public StableChannelEdgeDriver(EdgeOptions options)
         {
         }
 
+        public StableChannelEdgeDriver(EdgeDriverService service)
+            : base(service)
+        {
+        }
+
         public StableChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)
             : base(service, options)
         {
         }
+
         public static EdgeOptions DefaultOptions
         {
             get { return new EdgeOptions(); }
diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelFirefoxDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelFirefoxDriver.cs
@@ -35,6 +35,11 @@ public StableChannelFirefoxDriver(FirefoxOptions options)
         {
         }
 
+        public StableChannelFirefoxDriver(FirefoxDriverService service)
+        : base(service)
+        {
+        }
+
         public StableChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/Environment/DriverFactory.cs b/dotnet/test/common/Environment/DriverFactory.cs
@@ -32,10 +32,10 @@ namespace OpenQA.Selenium.Environment
 {
     public class DriverFactory
     {
-        string driverPath;
-        string browserBinaryLocation;
-        private Dictionary<Browser, Type> serviceTypes = new Dictionary<Browser, Type>();
-        private Dictionary<Browser, Type> optionsTypes = new Dictionary<Browser, Type>();
+        private readonly string driverPath;
+        private readonly string browserBinaryLocation;
+        private readonly Dictionary<Browser, Type> serviceTypes = new Dictionary<Browser, Type>();
+        private readonly Dictionary<Browser, Type> optionsTypes = new Dictionary<Browser, Type>();
 
         public DriverFactory(string driverPath, string browserBinaryLocation)
         {
@@ -71,17 +71,15 @@ public IWebDriver CreateDriver(Type driverType, bool logging = false)
             return CreateDriverWithOptions(driverType, null, logging);
         }
 
-        public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverOptions, bool logging = false)
+        public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverOptions, bool enableLogging = false)
         {
             Console.WriteLine($"Creating new driver of {driverType} type...");
 
             Browser browser = Browser.All;
             DriverService service = null;
             DriverOptions options = null;
-            bool enableLogging = logging;
 
-            List<Type> constructorArgTypeList = new List<Type>();
-            IWebDriver driver = null;
+            IWebDriver driver;
             if (typeof(ChromeDriver).IsAssignableFrom(driverType))
             {
                 browser = Browser.Chrome;
@@ -149,7 +147,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
                 service = CreateService<SafariDriverService>();
             }
 
-            if (!String.IsNullOrEmpty(this.driverPath) && service != null)
+            if (!string.IsNullOrEmpty(this.driverPath) && service != null)
             {
                 service.DriverServicePath = Path.GetDirectoryName(this.driverPath);
                 service.DriverServiceExecutableName = Path.GetFileName(this.driverPath);
@@ -159,12 +157,10 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
 
             if (browser != Browser.All)
             {
-                constructorArgTypeList.Add(this.serviceTypes[browser]);
-                constructorArgTypeList.Add(this.optionsTypes[browser]);
-                ConstructorInfo ctorInfo = driverType.GetConstructor(constructorArgTypeList.ToArray());
+                ConstructorInfo ctorInfo = driverType.GetConstructor([this.serviceTypes[browser], this.optionsTypes[browser]]);
                 if (ctorInfo != null)
                 {
-                    return (IWebDriver)ctorInfo.Invoke(new object[] { service, options });
+                    return (IWebDriver)ctorInfo.Invoke([service, options]);
                 }
             }
 
@@ -176,20 +172,23 @@ protected void OnDriverLaunching(DriverService service, DriverOptions options)
         {
             if (this.DriverStarting != null)
             {
-                DriverStartingEventArgs args = new DriverStartingEventArgs(service, options);
-                this.DriverStarting(this, args);
+                this.DriverStarting(this, new DriverStartingEventArgs(service, options));
             }
         }
 
-        private T GetDriverOptions<T>(Type driverType, DriverOptions overriddenOptions) where T : DriverOptions, new()
+        private TOptions GetDriverOptions<TOptions>(Type driverType, DriverOptions overriddenOptions)
+            where TOptions : DriverOptions, new()
         {
-            T options = new T();
-            Type optionsType = typeof(T);
+            TOptions options;
 
             PropertyInfo defaultOptionsProperty = driverType.GetProperty("DefaultOptions", BindingFlags.Public | BindingFlags.Static);
-            if (defaultOptionsProperty != null && defaultOptionsProperty.PropertyType == optionsType)
+            if (defaultOptionsProperty != null && defaultOptionsProperty.PropertyType == typeof(TOptions))
             {
-                options = (T)defaultOptionsProperty.GetValue(null, null);
+                options = (TOptions)defaultOptionsProperty.GetValue(null, null);
+            }
+            else
+            {
+                options = new TOptions();
             }
 
             if (overriddenOptions != null)
@@ -208,41 +207,16 @@ protected void OnDriverLaunching(DriverService service, DriverOptions options)
             return options;
         }
 
-
-        private T MergeOptions<T>(object baseOptions, DriverOptions overriddenOptions) where T : DriverOptions, new()
-        {
-            // If the driver type has a static DefaultOptions property,
-            // get the value of that property, which should be a valid
-            // options of the generic type (T). Otherwise, create a new
-            // instance of the browser-specific options class.
-            T mergedOptions = new T();
-            if (baseOptions != null && baseOptions is T)
-            {
-                mergedOptions = (T)baseOptions;
-            }
-
-            if (overriddenOptions != null)
-            {
-                mergedOptions.PageLoadStrategy = overriddenOptions.PageLoadStrategy;
-                mergedOptions.UnhandledPromptBehavior = overriddenOptions.UnhandledPromptBehavior;
-                mergedOptions.Proxy = overriddenOptions.Proxy;
-            }
-
-            return mergedOptions;
-        }
-
-        private T CreateService<T>() where T : DriverService
+        private TService CreateService<TService>()
+            where TService : DriverService
         {
-            T service = default(T);
-            Type serviceType = typeof(T);
-
-            MethodInfo createDefaultServiceMethod = serviceType.GetMethod("CreateDefaultService", BindingFlags.Public | BindingFlags.Static, null, new Type[] { }, null);
-            if (createDefaultServiceMethod != null && createDefaultServiceMethod.ReturnType == serviceType)
+            MethodInfo createDefaultServiceMethod = typeof(TService).GetMethod("CreateDefaultService", BindingFlags.Public | BindingFlags.Static, null, [], null);
+            if (createDefaultServiceMethod != null && createDefaultServiceMethod.ReturnType == typeof(TService))
             {
-                service = (T)createDefaultServiceMethod.Invoke(null, new object[] { });
+                return (TService)createDefaultServiceMethod.Invoke(null, []);
             }
 
-            return service;
+            return default;
         }
     }
 }
diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -31,14 +31,9 @@ namespace OpenQA.Selenium.Environment
     public class EnvironmentManager
     {
         private static EnvironmentManager instance;
-        private Type driverType;
-        private Browser browser;
+        private readonly Type driverType;
         private IWebDriver driver;
-        private UrlBuilder urlBuilder;
-        private TestWebServer webServer;
-        private DriverFactory driverFactory;
-        private RemoteSeleniumServer remoteServer;
-        private string remoteCapabilities;
+        private readonly DriverFactory driverFactory;
 
         private EnvironmentManager()
         {
@@ -91,10 +86,10 @@ private EnvironmentManager()
                 throw new ArgumentOutOfRangeException($"Unable to find driver type {driverConfig.DriverTypeName}");
             }
 
-            browser = driverConfig.BrowserValue;
-            remoteCapabilities = driverConfig.RemoteCapabilities;
+            Browser = driverConfig.BrowserValue;
+            RemoteCapabilities = driverConfig.RemoteCapabilities;
 
-            urlBuilder = new UrlBuilder(websiteConfig);
+            UrlBuilder = new UrlBuilder(websiteConfig);
 
             // When run using the `bazel test` command, the following environment
             // variable will be set. If not set, we're running from a build system
@@ -185,48 +180,28 @@ private EnvironmentManager()
                 // Use the default one.
             }
 
-            webServer = new TestWebServer(projectRoot, webServerConfig);
+            WebServer = new TestWebServer(projectRoot, webServerConfig);
             bool autoStartRemoteServer = false;
-            if (browser == Browser.Remote)
+            if (Browser == Browser.Remote)
             {
                 autoStartRemoteServer = driverConfig.AutoStartRemoteServer;
             }
 
-            remoteServer = new RemoteSeleniumServer(projectRoot, autoStartRemoteServer);
+            RemoteServer = new RemoteSeleniumServer(projectRoot, autoStartRemoteServer);
         }
 
         ~EnvironmentManager()
         {
-            if (remoteServer != null)
-            {
-                remoteServer.StopAsync().Wait();
-            }
-            if (webServer != null)
-            {
-                webServer.StopAsync().Wait();
-            }
+            RemoteServer?.StopAsync().Wait();
+            WebServer?.StopAsync().Wait();
             CloseCurrentDriver();
         }
 
         public event EventHandler<DriverStartingEventArgs> DriverStarting;
 
-        public static EnvironmentManager Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = new EnvironmentManager();
-                }
-
-                return instance;
-            }
-        }
+        public static EnvironmentManager Instance => instance ??= new EnvironmentManager();
 
-        public Browser Browser
-        {
-            get { return browser; }
-        }
+        public Browser Browser { get; }
 
         public string CurrentDirectory
         {
@@ -242,39 +217,17 @@ public string CurrentDirectory
             }
         }
 
-        public TestWebServer WebServer
-        {
-            get { return webServer; }
-        }
+        public TestWebServer WebServer { get; }
 
-        public RemoteSeleniumServer RemoteServer
-        {
-            get { return remoteServer; }
-        }
+        public RemoteSeleniumServer RemoteServer { get; }
 
-        public string RemoteCapabilities
-        {
-            get { return remoteCapabilities; }
-        }
+        public string RemoteCapabilities { get; }
 
-        public UrlBuilder UrlBuilder
-        {
-            get
-            {
-                return urlBuilder;
-            }
-        }
+        public UrlBuilder UrlBuilder { get; }
 
         public IWebDriver GetCurrentDriver()
         {
-            if (driver != null)
-            {
-                return driver;
-            }
-            else
-            {
-                return CreateFreshDriver();
-            }
+            return driver ?? CreateFreshDriver();
         }
 
         public IWebDriver CreateDriverInstance()
@@ -296,10 +249,7 @@ public IWebDriver CreateFreshDriver()
 
         public void CloseCurrentDriver()
         {
-            if (driver != null)
-            {
-                driver.Quit();
-            }
+            driver?.Quit();
             driver = null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ public DefaultSafariDriver(SafariOptions options)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ public DefaultSafariDriver(SafariDriverService service)`
	`34`	`+ : base(service)`
	`35`	`+ {`
	`36`	`+ }`
	`37`	`+`
`33`	`38`	`public DefaultSafariDriver(SafariDriverService service, SafariOptions options)`
`34`	`39`	`: base(service, options)`
`35`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ public DevChannelChromeDriver(ChromeOptions options)`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ public DevChannelChromeDriver(ChromeDriverService service)`
	`36`	`+ : base(service)`
	`37`	`+ {`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`public DevChannelChromeDriver(ChromeDriverService service, ChromeOptions options)`
`36`	`41`	`: base(service, options)`
`37`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ public DevChannelEdgeDriver(EdgeOptions options)`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ public DevChannelEdgeDriver(EdgeDriverService service)`
	`36`	`+ : base(service)`
	`37`	`+ {`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`public DevChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)`
`36`	`41`	`: base(service, options)`
`37`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public EdgeInternetExplorerModeDriver(InternetExplorerOptions options)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public EdgeInternetExplorerModeDriver(InternetExplorerDriverService service)`
	`39`	`+ : base(service)`
	`40`	`+ {`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`public EdgeInternetExplorerModeDriver(InternetExplorerDriverService service, InternetExplorerOptions options)`
`39`	`44`	`: base(service, options)`
`40`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public NightlyChannelFirefoxDriver(FirefoxOptions options)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public NightlyChannelFirefoxDriver(FirefoxDriverService service)`
	`39`	`+ : base(service)`
	`40`	`+ {`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`public NightlyChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)`
`39`	`44`	`: base(service, options)`
`40`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public SafariTechnologyPreviewDriver(SafariOptions options)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public SafariTechnologyPreviewDriver(SafariDriverService service)`
	`39`	`+ : base(service)`
	`40`	`+ {`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`public SafariTechnologyPreviewDriver(SafariDriverService service, SafariOptions options)`
`39`	`44`	`: base(service, options)`
`40`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ public StableChannelChromeDriver(ChromeOptions options)`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ public StableChannelChromeDriver(ChromeDriverService service)`
	`36`	`+ : base(service)`
	`37`	`+ {`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions options)`
`36`	`41`	`: base(service, options)`
`37`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,16 @@ public StableChannelEdgeDriver(EdgeOptions options)`
`33`	`33`	`{`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ public StableChannelEdgeDriver(EdgeDriverService service)`
	`37`	`+ : base(service)`
	`38`	`+ {`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`public StableChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)`
`37`	`42`	`: base(service, options)`
`38`	`43`	`{`
`39`	`44`	`}`
	`45`	`+`
`40`	`46`	`public static EdgeOptions DefaultOptions`
`41`	`47`	`{`
`42`	`48`	`get { return new EdgeOptions(); }`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public StableChannelFirefoxDriver(FirefoxOptions options)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public StableChannelFirefoxDriver(FirefoxDriverService service)`
	`39`	`+ : base(service)`
	`40`	`+ {`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`public StableChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)`
`39`	`44`	`: base(service, options)`
`40`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ namespace OpenQA.Selenium.Environment`
`32`	`32`	`{`
`33`	`33`	`public class DriverFactory`
`34`	`34`	`{`
`35`		`- string driverPath;`
`36`		`- string browserBinaryLocation;`
`37`		`- private Dictionary<Browser, Type> serviceTypes = new Dictionary<Browser, Type>();`
`38`		`- private Dictionary<Browser, Type> optionsTypes = new Dictionary<Browser, Type>();`
	`35`	`+ private readonly string driverPath;`
	`36`	`+ private readonly string browserBinaryLocation;`
	`37`	`+ private readonly Dictionary<Browser, Type> serviceTypes = new Dictionary<Browser, Type>();`
	`38`	`+ private readonly Dictionary<Browser, Type> optionsTypes = new Dictionary<Browser, Type>();`
`39`	`39`
`40`	`40`	`public DriverFactory(string driverPath, string browserBinaryLocation)`
`41`	`41`	`{`
`@@ -71,17 +71,15 @@ public IWebDriver CreateDriver(Type driverType, bool logging = false)`
`71`	`71`	`return CreateDriverWithOptions(driverType, null, logging);`
`72`	`72`	`}`
`73`	`73`
`74`		`- public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverOptions, bool logging = false)`
	`74`	`+ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverOptions, bool enableLogging = false)`
`75`	`75`	`{`
`76`	`76`	`Console.WriteLine($"Creating new driver of {driverType} type...");`
`77`	`77`
`78`	`78`	`Browser browser = Browser.All;`
`79`	`79`	`DriverService service = null;`
`80`	`80`	`DriverOptions options = null;`
`81`		`- bool enableLogging = logging;`
`82`	`81`
`83`		`- List<Type> constructorArgTypeList = new List<Type>();`
`84`		`- IWebDriver driver = null;`
	`82`	`+ IWebDriver driver;`
`85`	`83`	`if (typeof(ChromeDriver).IsAssignableFrom(driverType))`
`86`	`84`	`{`
`87`	`85`	`browser = Browser.Chrome;`
`@@ -149,7 +147,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO`
`149`	`147`	`service = CreateService<SafariDriverService>();`
`150`	`148`	`}`
`151`	`149`
`152`		`- if (!String.IsNullOrEmpty(this.driverPath) && service != null)`
	`150`	`+ if (!string.IsNullOrEmpty(this.driverPath) && service != null)`
`153`	`151`	`{`
`154`	`152`	`service.DriverServicePath = Path.GetDirectoryName(this.driverPath);`
`155`	`153`	`service.DriverServiceExecutableName = Path.GetFileName(this.driverPath);`
`@@ -159,12 +157,10 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO`
`159`	`157`
`160`	`158`	`if (browser != Browser.All)`
`161`	`159`	`{`
`162`		`- constructorArgTypeList.Add(this.serviceTypes[browser]);`
`163`		`- constructorArgTypeList.Add(this.optionsTypes[browser]);`
`164`		`- ConstructorInfo ctorInfo = driverType.GetConstructor(constructorArgTypeList.ToArray());`
	`160`	`+ ConstructorInfo ctorInfo = driverType.GetConstructor([this.serviceTypes[browser], this.optionsTypes[browser]]);`
`165`	`161`	`if (ctorInfo != null)`
`166`	`162`	`{`
`167`		`- return (IWebDriver)ctorInfo.Invoke(new object[] { service, options });`
	`163`	`+ return (IWebDriver)ctorInfo.Invoke([service, options]);`
`168`	`164`	`}`
`169`	`165`	`}`
`170`	`166`
`@@ -176,20 +172,23 @@ protected void OnDriverLaunching(DriverService service, DriverOptions options)`
`176`	`172`	`{`
`177`	`173`	`if (this.DriverStarting != null)`
`178`	`174`	`{`
`179`		`- DriverStartingEventArgs args = new DriverStartingEventArgs(service, options);`
`180`		`- this.DriverStarting(this, args);`
	`175`	`+ this.DriverStarting(this, new DriverStartingEventArgs(service, options));`
`181`	`176`	`}`
`182`	`177`	`}`
`183`	`178`
`184`		`- private T GetDriverOptions<T>(Type driverType, DriverOptions overriddenOptions) where T : DriverOptions, new()`
	`179`	`+ private TOptions GetDriverOptions<TOptions>(Type driverType, DriverOptions overriddenOptions)`
	`180`	`+ where TOptions : DriverOptions, new()`
`185`	`181`	`{`
`186`		`- T options = new T();`
`187`		`- Type optionsType = typeof(T);`
	`182`	`+ TOptions options;`
`188`	`183`
`189`	`184`	`PropertyInfo defaultOptionsProperty = driverType.GetProperty("DefaultOptions", BindingFlags.Public \| BindingFlags.Static);`
`190`		`- if (defaultOptionsProperty != null && defaultOptionsProperty.PropertyType == optionsType)`
	`185`	`+ if (defaultOptionsProperty != null && defaultOptionsProperty.PropertyType == typeof(TOptions))`
`191`	`186`	`{`
`192`		`- options = (T)defaultOptionsProperty.GetValue(null, null);`
	`187`	`+ options = (TOptions)defaultOptionsProperty.GetValue(null, null);`
	`188`	`+ }`
	`189`	`+ else`
	`190`	`+ {`
	`191`	`+ options = new TOptions();`
`193`	`192`	`}`
`194`	`193`
`195`	`194`	`if (overriddenOptions != null)`
`@@ -208,41 +207,16 @@ protected void OnDriverLaunching(DriverService service, DriverOptions options)`
`208`	`207`	`return options;`
`209`	`208`	`}`
`210`	`209`
`211`		`-`
`212`		`- private T MergeOptions<T>(object baseOptions, DriverOptions overriddenOptions) where T : DriverOptions, new()`
`213`		`- {`
`214`		`- // If the driver type has a static DefaultOptions property,`
`215`		`- // get the value of that property, which should be a valid`
`216`		`- // options of the generic type (T). Otherwise, create a new`
`217`		`- // instance of the browser-specific options class.`
`218`		`- T mergedOptions = new T();`
`219`		`- if (baseOptions != null && baseOptions is T)`
`220`		`- {`
`221`		`- mergedOptions = (T)baseOptions;`
`222`		`- }`
`223`		`-`
`224`		`- if (overriddenOptions != null)`
`225`		`- {`
`226`		`- mergedOptions.PageLoadStrategy = overriddenOptions.PageLoadStrategy;`
`227`		`- mergedOptions.UnhandledPromptBehavior = overriddenOptions.UnhandledPromptBehavior;`
`228`		`- mergedOptions.Proxy = overriddenOptions.Proxy;`
`229`		`- }`
`230`		`-`
`231`		`- return mergedOptions;`
`232`		`- }`
`233`		`-`
`234`		`- private T CreateService<T>() where T : DriverService`
	`210`	`+ private TService CreateService<TService>()`
	`211`	`+ where TService : DriverService`
`235`	`212`	`{`
`236`		`- T service = default(T);`
`237`		`- Type serviceType = typeof(T);`
`238`		`-`
`239`		`- MethodInfo createDefaultServiceMethod = serviceType.GetMethod("CreateDefaultService", BindingFlags.Public \| BindingFlags.Static, null, new Type[] { }, null);`
`240`		`- if (createDefaultServiceMethod != null && createDefaultServiceMethod.ReturnType == serviceType)`
	`213`	`+ MethodInfo createDefaultServiceMethod = typeof(TService).GetMethod("CreateDefaultService", BindingFlags.Public \| BindingFlags.Static, null, [], null);`
	`214`	`+ if (createDefaultServiceMethod != null && createDefaultServiceMethod.ReturnType == typeof(TService))`
`241`	`215`	`{`
`242`		`- service = (T)createDefaultServiceMethod.Invoke(null, new object[] { });`
	`216`	`+ return (TService)createDefaultServiceMethod.Invoke(null, []);`
`243`	`217`	`}`
`244`	`218`
`245`		`- return service;`
	`219`	`+ return default;`
`246`	`220`	`}`
`247`	`221`	`}`
`248`	`222`	`}`