Revert "Fix tests execution, but service is still not disposed yet"

nvborisenko · nvborisenko · commit 62716d552d99 · 2024-11-24T18:25:31.000+03:00
This reverts commit 57b3a69.
diff --git a/dotnet/src/webdriver/Chrome/ChromeDriver.cs b/dotnet/src/webdriver/Chrome/ChromeDriver.cs
@@ -125,7 +125,7 @@ public ChromeDriver(string chromeDriverDirectory, ChromeOptions options)
         /// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public ChromeDriver(string chromeDriverDirectory, ChromeOptions options, TimeSpan commandTimeout)
-            : this(ChromeDriverService.CreateDefaultService(chromeDriverDirectory), options, commandTimeout)
+            : this(ChromeDriverService.CreateDefaultService(chromeDriverDirectory), options, commandTimeout, disposeService: true)
         {
         }
 
@@ -136,7 +136,12 @@ public ChromeDriver(string chromeDriverDirectory, ChromeOptions options, TimeSpa
         /// <param name="service">The <see cref="ChromeDriverService"/> to use.</param>
         /// <param name="options">The <see cref="ChromeOptions"/> used to initialize the driver.</param>
         public ChromeDriver(ChromeDriverService service, ChromeOptions options)
-            : this(service, options, RemoteWebDriver.DefaultCommandTimeout)
+            : this(service, options, RemoteWebDriver.DefaultCommandTimeout, disposeService: true)
+        {
+        }
+
+        public ChromeDriver(ChromeDriverService service, ChromeOptions options, bool disposeService)
+            : this(service, options, RemoteWebDriver.DefaultCommandTimeout, disposeService)
         {
         }
 
@@ -147,7 +152,13 @@ public ChromeDriver(ChromeDriverService service, ChromeOptions options)
         /// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public ChromeDriver(ChromeDriverService service, ChromeOptions options, TimeSpan commandTimeout)
-            : base(service, options, commandTimeout)
+            : base(service, options, commandTimeout, disposeService: true)
+        {
+            this.AddCustomChromeCommands();
+        }
+
+        public ChromeDriver(ChromeDriverService service, ChromeOptions options, TimeSpan commandTimeout, bool disposeService)
+            : base(service, options, commandTimeout, disposeService)
         {
             this.AddCustomChromeCommands();
         }
diff --git a/dotnet/src/webdriver/Chromium/ChromiumDriver.cs b/dotnet/src/webdriver/Chromium/ChromiumDriver.cs
@@ -107,6 +107,7 @@ public class ChromiumDriver : WebDriver, ISupportsLogs, IDevTools
         public static readonly string SetPermissionCommand = "setPermission";
 
         private readonly ChromiumDriverService driverService;
+        private readonly bool disposeDriverService;
         private readonly string optionsCapabilityName;
         private DevToolsSession devToolsSession;
 
@@ -127,10 +128,11 @@ public class ChromiumDriver : WebDriver, ISupportsLogs, IDevTools
         /// <param name="service">The <see cref="ChromiumDriverService"/> to use.</param>
         /// <param name="options">The <see cref="ChromiumOptions"/> to be used with the ChromiumDriver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
-        protected ChromiumDriver(ChromiumDriverService service, ChromiumOptions options, TimeSpan commandTimeout)
+        protected ChromiumDriver(ChromiumDriverService service, ChromiumOptions options, TimeSpan commandTimeout, bool disposeService)
             : base(StartDriverServiceCommandExecutor(service, options, commandTimeout), ConvertOptionsToCapabilities(options))
         {
             this.driverService = service;
+            this.disposeDriverService = disposeService;
             this.optionsCapabilityName = options.CapabilityName;
         }
 
@@ -469,6 +471,11 @@ protected override void Dispose(bool disposing)
             }
 
             base.Dispose(disposing);
+
+            if (this.disposeDriverService)
+            {
+                this.driverService?.Dispose();
+            }
         }
 
         private static ICapabilities ConvertOptionsToCapabilities(ChromiumOptions options)
diff --git a/dotnet/src/webdriver/Edge/EdgeDriver.cs b/dotnet/src/webdriver/Edge/EdgeDriver.cs
@@ -117,7 +117,7 @@ public EdgeDriver(EdgeDriverService service, EdgeOptions options)
         /// <param name="options">The <see cref="EdgeOptions"/> to be used with the Edge driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public EdgeDriver(EdgeDriverService service, EdgeOptions options, TimeSpan commandTimeout)
-            : base(service, options, commandTimeout)
+            : base(service, options, commandTimeout, disposeService: false)
         {
             this.AddCustomEdgeCommands();
         }
diff --git a/dotnet/test/common/CustomDriverConfigs/DefaultSafariDriver.cs b/dotnet/test/common/CustomDriverConfigs/DefaultSafariDriver.cs
@@ -11,11 +11,6 @@ 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
@@ -13,11 +13,6 @@ 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
@@ -13,11 +13,6 @@ 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
@@ -16,11 +16,6 @@ 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
@@ -16,11 +16,6 @@ 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
@@ -16,11 +16,6 @@ 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
@@ -13,11 +13,6 @@ 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
@@ -14,11 +14,6 @@ public StableChannelEdgeDriver(EdgeOptions options)
         {
         }
 
-        public StableChannelEdgeDriver(EdgeDriverService service)
-            : base(service)
-        {
-        }
-
         public StableChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)
             : base(service, options)
         {
diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelFirefoxDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelFirefoxDriver.cs
@@ -16,11 +16,6 @@ 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
@@ -15,13 +15,15 @@ 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>();
 
         public DriverFactory(string driverPath, string browserBinaryLocation)
         {
             this.driverPath = driverPath;
             this.browserBinaryLocation = browserBinaryLocation;
 
+            this.PopulateServiceTypes();
             this.PopulateOptionsTypes();
         }
 
@@ -34,6 +36,15 @@ private void PopulateOptionsTypes()
             this.optionsTypes[Browser.Safari] = typeof(SafariOptions);
         }
 
+        private void PopulateServiceTypes()
+        {
+            this.serviceTypes[Browser.Chrome] = typeof(ChromeDriverService);
+            this.serviceTypes[Browser.Edge] = typeof(EdgeDriverService);
+            this.serviceTypes[Browser.Firefox] = typeof(FirefoxDriverService);
+            this.serviceTypes[Browser.IE] = typeof(InternetExplorerDriverService);
+            this.serviceTypes[Browser.Safari] = typeof(SafariDriverService);
+        }
+
         public event EventHandler<DriverStartingEventArgs> DriverStarting;
 
         public IWebDriver CreateDriver(Type driverType, bool logging = false)
@@ -66,7 +77,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
                 var chromeOptions = (ChromeOptions)options;
                 chromeOptions.AddArguments("--no-sandbox", "--disable-dev-shm-usage");
 
-                service = ChromeDriverService.CreateDefaultService();
+                service = CreateService<ChromeDriverService>();
                 if (!string.IsNullOrEmpty(this.browserBinaryLocation))
                 {
                     ((ChromeOptions)options).BinaryLocation = this.browserBinaryLocation;
@@ -84,7 +95,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
                 var edgeOptions = (EdgeOptions)options;
                 edgeOptions.AddArguments("--no-sandbox", "--disable-dev-shm-usage");
 
-                service = EdgeDriverService.CreateDefaultService();
+                service = CreateService<EdgeDriverService>();
                 if (!string.IsNullOrEmpty(this.browserBinaryLocation))
                 {
                     ((EdgeOptions)options).BinaryLocation = this.browserBinaryLocation;
@@ -98,7 +109,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
             {
                 browser = Browser.IE;
                 options = GetDriverOptions<InternetExplorerOptions>(driverType, driverOptions);
-                service = InternetExplorerDriverService.CreateDefaultService();
+                service = CreateService<InternetExplorerDriverService>();
                 if (enableLogging)
                 {
                     ((InternetExplorerDriverService)service).LoggingLevel = InternetExplorerDriverLogLevel.Trace;
@@ -108,7 +119,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
             {
                 browser = Browser.Firefox;
                 options = GetDriverOptions<FirefoxOptions>(driverType, driverOptions);
-                service = FirefoxDriverService.CreateDefaultService();
+                service = CreateService<FirefoxDriverService>();
                 if (!string.IsNullOrEmpty(this.browserBinaryLocation))
                 {
                     ((FirefoxOptions)options).BinaryLocation = this.browserBinaryLocation;
@@ -122,7 +133,7 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
             {
                 browser = Browser.Safari;
                 options = GetDriverOptions<SafariOptions>(driverType, driverOptions);
-                service = SafariDriverService.CreateDefaultService();
+                service = CreateService<SafariDriverService>();
             }
 
             if (!String.IsNullOrEmpty(this.driverPath) && service != null)
@@ -133,7 +144,18 @@ public IWebDriver CreateDriverWithOptions(Type driverType, DriverOptions driverO
 
             this.OnDriverLaunching(service, options);
 
-            driver = (IWebDriver)Activator.CreateInstance(driverType, service);
+            if (browser != Browser.All)
+            {
+                constructorArgTypeList.Add(this.serviceTypes[browser]);
+                constructorArgTypeList.Add(this.optionsTypes[browser]);
+                ConstructorInfo ctorInfo = driverType.GetConstructor(constructorArgTypeList.ToArray());
+                if (ctorInfo != null)
+                {
+                    return (IWebDriver)ctorInfo.Invoke(new object[] { service, options });
+                }
+            }
+
+            driver = (IWebDriver)Activator.CreateInstance(driverType, service, true);
             return driver;
         }
 
@@ -170,5 +192,41 @@ 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
+        {
+            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)
+            {
+                service = (T)createDefaultServiceMethod.Invoke(null, new object[] { });
+            }
+
+            return service;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public ChromeDriver(string chromeDriverDirectory, ChromeOptions options)`
`125`	`125`	`/// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>`
`126`	`126`	`/// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>`
`127`	`127`	`public ChromeDriver(string chromeDriverDirectory, ChromeOptions options, TimeSpan commandTimeout)`
`128`		`- : this(ChromeDriverService.CreateDefaultService(chromeDriverDirectory), options, commandTimeout)`
	`128`	`+ : this(ChromeDriverService.CreateDefaultService(chromeDriverDirectory), options, commandTimeout, disposeService: true)`
`129`	`129`	`{`
`130`	`130`	`}`
`131`	`131`
`@@ -136,7 +136,12 @@ public ChromeDriver(string chromeDriverDirectory, ChromeOptions options, TimeSpa`
`136`	`136`	`/// <param name="service">The <see cref="ChromeDriverService"/> to use.</param>`
`137`	`137`	`/// <param name="options">The <see cref="ChromeOptions"/> used to initialize the driver.</param>`
`138`	`138`	`public ChromeDriver(ChromeDriverService service, ChromeOptions options)`
`139`		`- : this(service, options, RemoteWebDriver.DefaultCommandTimeout)`
	`139`	`+ : this(service, options, RemoteWebDriver.DefaultCommandTimeout, disposeService: true)`
	`140`	`+ {`
	`141`	`+ }`
	`142`	`+`
	`143`	`+ public ChromeDriver(ChromeDriverService service, ChromeOptions options, bool disposeService)`
	`144`	`+ : this(service, options, RemoteWebDriver.DefaultCommandTimeout, disposeService)`
`140`	`145`	`{`
`141`	`146`	`}`
`142`	`147`
`@@ -147,7 +152,13 @@ public ChromeDriver(ChromeDriverService service, ChromeOptions options)`
`147`	`152`	`/// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>`
`148`	`153`	`/// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>`
`149`	`154`	`public ChromeDriver(ChromeDriverService service, ChromeOptions options, TimeSpan commandTimeout)`
`150`		`- : base(service, options, commandTimeout)`
	`155`	`+ : base(service, options, commandTimeout, disposeService: true)`
	`156`	`+ {`
	`157`	`+ this.AddCustomChromeCommands();`
	`158`	`+ }`
	`159`	`+`
	`160`	`+ public ChromeDriver(ChromeDriverService service, ChromeOptions options, TimeSpan commandTimeout, bool disposeService)`
	`161`	`+ : base(service, options, commandTimeout, disposeService)`
`151`	`162`	`{`
`152`	`163`	`this.AddCustomChromeCommands();`
`153`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public EdgeDriver(EdgeDriverService service, EdgeOptions options)`
`117`	`117`	`/// <param name="options">The <see cref="EdgeOptions"/> to be used with the Edge driver.</param>`
`118`	`118`	`/// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>`
`119`	`119`	`public EdgeDriver(EdgeDriverService service, EdgeOptions options, TimeSpan commandTimeout)`
`120`		`- : base(service, options, commandTimeout)`
	`120`	`+ : base(service, options, commandTimeout, disposeService: false)`
`121`	`121`	`{`
`122`	`122`	`this.AddCustomEdgeCommands();`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,6 @@ public DefaultSafariDriver(SafariOptions options)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`		`- public DefaultSafariDriver(SafariDriverService service)`
`15`		`- : base(service)`
`16`		`- {`
`17`		`- }`
`18`		`-`
`19`	`14`	`public DefaultSafariDriver(SafariDriverService service, SafariOptions options)`
`20`	`15`	`: base(service, options)`
`21`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,6 @@ public DevChannelChromeDriver(ChromeOptions options)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- public DevChannelChromeDriver(ChromeDriverService service)`
`17`		`- : base(service)`
`18`		`- {`
`19`		`- }`
`20`		`-`
`21`	`16`	`public DevChannelChromeDriver(ChromeDriverService service, ChromeOptions options)`
`22`	`17`	`: base(service, options)`
`23`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,6 @@ public DevChannelEdgeDriver(EdgeOptions options)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- public DevChannelEdgeDriver(EdgeDriverService service)`
`17`		`- : base(service)`
`18`		`- {`
`19`		`- }`
`20`		`-`
`21`	`16`	`public DevChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)`
`22`	`17`	`: base(service, options)`
`23`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,6 @@ public EdgeInternetExplorerModeDriver(InternetExplorerOptions options)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`		`- public EdgeInternetExplorerModeDriver(InternetExplorerDriverService service)`
`20`		`- : base(service)`
`21`		`- {`
`22`		`- }`
`23`		`-`
`24`	`19`	`public EdgeInternetExplorerModeDriver(InternetExplorerDriverService service, InternetExplorerOptions options)`
`25`	`20`	`: base(service, options)`
`26`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,6 @@ public NightlyChannelFirefoxDriver(FirefoxOptions options)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`		`- public NightlyChannelFirefoxDriver(FirefoxDriverService service)`
`20`		`- : base(service)`
`21`		`- {`
`22`		`- }`
`23`		`-`
`24`	`19`	`public NightlyChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)`
`25`	`20`	`: base(service, options)`
`26`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,6 @@ public SafariTechnologyPreviewDriver(SafariOptions options)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
`19`		`- public SafariTechnologyPreviewDriver(SafariDriverService service)`
`20`		`- : base(service)`
`21`		`- {`
`22`		`- }`
`23`		`-`
`24`	`19`	`public SafariTechnologyPreviewDriver(SafariDriverService service, SafariOptions options)`
`25`	`20`	`: base(service, options)`
`26`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,6 @@ public StableChannelChromeDriver(ChromeOptions options)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- public StableChannelChromeDriver(ChromeDriverService service)`
`17`		`- : base(service)`
`18`		`- {`
`19`		`- }`
`20`		`-`
`21`	`16`	`public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions options)`
`22`	`17`	`: base(service, options)`
`23`	`18`	`{`