Reorganizing .NET tests for specific driver configurations

SeleniumHQ · Jun 13, 2019 · 91484a8 · 91484a8
1 parent cb566ed
commit 91484a8
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 42 deletions.
diff --git a/...CustomDriverConfigs/ChromiumEdgeDriver.cs → ...stomDriverConfigs/DevChannelEdgeDriver.cs b/...CustomDriverConfigs/ChromiumEdgeDriver.cs → ...stomDriverConfigs/DevChannelEdgeDriver.cs
@@ -6,16 +6,16 @@
 
 namespace OpenQA.Selenium.Edge
 {
-    public class ChromiumEdgeDriver : EdgeDriver
+    public class DevChannelEdgeDriver : EdgeDriver
     {
         private static string servicePath = string.Empty;
 
-        public ChromiumEdgeDriver()
+        public DevChannelEdgeDriver()
             : this(DefaultService, DefaultOptions)
         {
         }
 
-        public ChromiumEdgeDriver(EdgeDriverService service, EdgeOptions options)
+        public DevChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)
             : base(service, options)
         {
         }

diff --git a/.../CustomDriverConfigs/DefaultEdgeDriver.cs → ...n/CustomDriverConfigs/LegacyEdgeDriver.cs b/.../CustomDriverConfigs/DefaultEdgeDriver.cs → ...n/CustomDriverConfigs/LegacyEdgeDriver.cs
@@ -6,14 +6,14 @@
 
 namespace OpenQA.Selenium.Edge
 {
-    public class DefaultEdgeDriver : EdgeDriver
+    public class LegacyEdgeDriver : EdgeDriver
     {
-        public DefaultEdgeDriver()
+        public LegacyEdgeDriver()
             : this(DefaultService, new EdgeOptions())
         {
         }
 
-        public DefaultEdgeDriver(EdgeDriverService service, EdgeOptions options)
+        public LegacyEdgeDriver(EdgeDriverService service, EdgeOptions options)
             : base(service, options)
         {
         }

diff --git a/...mDriverConfigs/NightlyFirefoxWebDriver.cs → ...verConfigs/NightlyChannelFirefoxDriver.cs b/...mDriverConfigs/NightlyFirefoxWebDriver.cs → ...verConfigs/NightlyChannelFirefoxDriver.cs
@@ -5,14 +5,14 @@ namespace OpenQA.Selenium.Firefox
     // This is a simple wrapper class to create a FirefoxDriver that
     // uses the Marionette implementation and has no parameters in the
     // constructor.
-    public class NightlyFirefoxWebDriver : FirefoxDriver
+    public class NightlyChannelFirefoxDriver : FirefoxDriver
     {
-        public NightlyFirefoxWebDriver(FirefoxDriverService service)
+        public NightlyChannelFirefoxDriver(FirefoxDriverService service)
             : this(service, DefaultOptions)
         {
         }
 
-        public NightlyFirefoxWebDriver(FirefoxDriverService service, FirefoxOptions options)
+        public NightlyChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)
             : base(service, options)
         {
         }

diff --git a/dotnet/test/common/CustomDriverConfigs/SpecCompliantChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/SpecCompliantChromeDriver.cs
diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenQA.Selenium.Chrome
+{
+    public class StableChannelChromeDriver : ChromeDriver
+    {
+        public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions options)
+            : base(service, options)
+        {
+        }
+    }
+}
diff --git a/...mDriverConfigs/ReleaseFirefoxWebDriver.cs → ...iverConfigs/StableChannelFirefoxDriver.cs b/...mDriverConfigs/ReleaseFirefoxWebDriver.cs → ...iverConfigs/StableChannelFirefoxDriver.cs
@@ -5,14 +5,14 @@ namespace OpenQA.Selenium.Firefox
     // This is a simple wrapper class to create a FirefoxDriver that
     // uses the Marionette implementation and has no parameters in the
     // constructor.
-    public class ReleaseFirefoxWebDriver : FirefoxDriver
+    public class StableChannelFirefoxDriver : FirefoxDriver
     {
-        public ReleaseFirefoxWebDriver(FirefoxDriverService service)
+        public StableChannelFirefoxDriver(FirefoxDriverService service)
             : this(service, DefaultOptions)
         {
         }
 
-        public ReleaseFirefoxWebDriver(FirefoxDriverService service, FirefoxOptions options)
+        public StableChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)
             : base(service, options, RemoteWebDriver.DefaultCommandTimeout)
         {
         }

diff --git a/dotnet/test/common/appconfig.json b/dotnet/test/common/appconfig.json
@@ -20,7 +20,7 @@
   },
   "DriverConfigs": {
     "Chrome": {
-      "DriverTypeName": "OpenQA.Selenium.Chrome.SpecCompliantChromeDriver",
+      "DriverTypeName": "OpenQA.Selenium.Chrome.StableChannelChromeDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Chrome",
       "RemoteCapabilities": "chrome"
@@ -41,28 +41,28 @@
     },
 
     "Edge": {
-      "DriverTypeName": "OpenQA.Selenium.Edge.ChromiumEdgeDriver",
+      "DriverTypeName": "OpenQA.Selenium.Edge.DevChannelEdgeDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Edge",
       "RemoteCapabilities": "MicrosoftEdge"
     },
 
     "EdgeLegacy": {
-      "DriverTypeName": "OpenQA.Selenium.Edge.DefaultEdgeDriver",
+      "DriverTypeName": "OpenQA.Selenium.Edge.LegacyEdgeDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "EdgeLegacy",
       "RemoteCapabilities": "MicrosoftEdge"
     },
 
     "Firefox": {
-      "DriverTypeName": "OpenQA.Selenium.Firefox.ReleaseFirefoxWebDriver",
+      "DriverTypeName": "OpenQA.Selenium.Firefox.StableChannelFirefoxDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Firefox",
       "RemoteCapabilities": "firefox"
     },
 
     "FirefoxNightly": {
-      "DriverTypeName": "OpenQA.Selenium.Firefox.NightlyFirefoxWebDriver",
+      "DriverTypeName": "OpenQA.Selenium.Firefox.NightlyChannelFirefoxDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Firefox",
       "RemoteCapabilities": "firefox"