Fixed issue with invalid cast for Selenium interfaces

unickq · unickq · commit d1b4a1ac73c6 · 2017-11-27T16:47:48.000+02:00
diff --git a/Unickq.SpecFlow.Selenium.Example/App.config b/Unickq.SpecFlow.Selenium.Example/App.config
@@ -29,7 +29,7 @@
   
   <autofac>
     <components>
-      <component name="ChromeDebug" type="Unickq.SpecFlow.Selenium.Local.Chrome, Unickq.SpecFlow.Selenium.SpecFlowPlugin" service="OpenQA.Selenium.IWebDriver, WebDriver" instance-scope="per-dependency">
+      <component name="ChromeDebug" type="Unickq.SpecFlow.Selenium.Local.ChromeDriver, Unickq.SpecFlow.Selenium.SpecFlowPlugin" service="OpenQA.Selenium.IWebDriver, WebDriver" instance-scope="per-dependency">
         <parameters>
           <parameter name="capabilities">
             <dictionary>
@@ -42,7 +42,7 @@
         </parameters>
       </component>
       
-      <component name="FirefoxDebug" type="Unickq.SpecFlow.Selenium.Local.Firefox, Unickq.SpecFlow.Selenium.SpecFlowPlugin" service="OpenQA.Selenium.IWebDriver, WebDriver" instance-scope="per-dependency">
+      <component name="FirefoxDebug" type="Unickq.SpecFlow.Selenium.Local.FirefoxDriver, Unickq.SpecFlow.Selenium.SpecFlowPlugin" service="OpenQA.Selenium.IWebDriver, WebDriver" instance-scope="per-dependency">
         <parameters>
           <parameter name="capabilities">
             <dictionary>
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Extensions.cs b/Unickq.SpecFlow.Selenium.Plugin/Extensions.cs
@@ -1,4 +1,5 @@
-﻿using OpenQA.Selenium;
+﻿using System;
+using OpenQA.Selenium;
 using TechTalk.SpecFlow;
 
 namespace Unickq.SpecFlow.Selenium
@@ -16,5 +17,15 @@ public static IWebDriver GetWebDriver(this ScenarioContext scenarioContext)
             }
             throw new SpecFlowException("Driver is not present in ScenarioContext");
         }
+
+        public static string[] ParseWithDelimiter(string input, char splitter = '=')
+        {
+            var prms = input.Split(splitter);
+            if (prms.Length != 2)
+            {
+                throw new ArgumentException($"Preference count doesn't equal to 2. Please use '{splitter}' delimiter");
+            }
+            return new[] { prms[0], prms[1] };
+        }
     }
 }
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/ChromeDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/ChromeDriver.cs
@@ -4,7 +4,7 @@
 
 namespace Unickq.SpecFlow.Selenium.Local
 {
-    public class Chrome : LocalDriver
+    public class ChromeDriver : OpenQA.Selenium.Chrome.ChromeDriver
     {
         private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)
         {
@@ -25,7 +25,7 @@ private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)
                 }
                 else if (cap.Key.StartsWith("UserProfilePreference", StringComparison.OrdinalIgnoreCase))
                 {
-                    var args = ParseWithDelimiter(cap.Value.ToString());
+                    var args = Extensions.ParseWithDelimiter(cap.Value.ToString());
                     options.AddUserProfilePreference(args[0], args[1]);        
                 }
                 else if (cap.Key.Equals("BinaryLocation", StringComparison.OrdinalIgnoreCase))
@@ -38,14 +38,14 @@ private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)
                 }
                 else if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))
                 {
-                    var args = ParseWithDelimiter(cap.Value.ToString());
+                    var args = Extensions.ParseWithDelimiter(cap.Value.ToString());
                     options.AddAdditionalCapability(args[0], args[1]);
                 }
             }
             return options;
         }
 
-        public Chrome(Dictionary<string, object> capabilities) : base(new ChromeDriver(SetOptions(capabilities)))
+        public ChromeDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))
         {
         }
     }
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/EdgeDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/EdgeDriver.cs
@@ -4,9 +4,9 @@
 
 namespace Unickq.SpecFlow.Selenium.Local
 {
-    public class Edge : LocalDriver
+    public class EdgeDriver : OpenQA.Selenium.Edge.EdgeDriver
     {
-        public Edge(Dictionary<string, object> capabilities) : base(new EdgeDriver(SetOptions(capabilities)))
+        public EdgeDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))
         {
         }
 
@@ -17,7 +17,7 @@ private static EdgeOptions SetOptions(Dictionary<string, object> capabilities)
             {
                 if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))
                 {
-                    var args = ParseWithDelimiter(cap.Value.ToString());
+                    var args = Extensions.ParseWithDelimiter(cap.Value.ToString());
                     options.AddAdditionalCapability(args[0], args[1]);
                 }
             }
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/FirefoxDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/FirefoxDriver.cs
@@ -4,7 +4,7 @@
 
 namespace Unickq.SpecFlow.Selenium.Local
 {
-    public class Firefox : LocalDriver
+    public class FirefoxDriver : OpenQA.Selenium.Firefox.FirefoxDriver
     {
         private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities)
         {
@@ -13,7 +13,7 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities
             {
                 if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))
                 {
-                    var args = ParseWithDelimiter(cap.Value.ToString());              
+                    var args = Extensions.ParseWithDelimiter(cap.Value.ToString());              
                     options.AddAdditionalCapability(args[0], args[1]);
                 }
                 else if (cap.Key.Equals("Arguments", StringComparison.OrdinalIgnoreCase))
@@ -22,7 +22,7 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities
                 }
                 else if (cap.Key.StartsWith("Preference", StringComparison.OrdinalIgnoreCase))
                 {
-                    var args = ParseWithDelimiter(cap.Value.ToString());
+                    var args = Extensions.ParseWithDelimiter(cap.Value.ToString());
                     options.SetPreference(args[0], args[1]);                    
                 }
                 else if (cap.Key.Equals("Extensions", StringComparison.OrdinalIgnoreCase))
@@ -49,7 +49,7 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities
             return options;
         }
 
-        public Firefox(Dictionary<string, object> capabilities) : base(new FirefoxDriver(SetOptions(capabilities)))
+        public FirefoxDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))
         {
         }
     }
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/InternetExplorerDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/InternetExplorerDriver.cs
@@ -4,9 +4,9 @@
 
 namespace Unickq.SpecFlow.Selenium.Local
 {
-    public class InternetExplorer : LocalDriver
+    public class InternetExplorerDriver : OpenQA.Selenium.IE.InternetExplorerDriver
     {
-        public InternetExplorer(Dictionary<string, object> capabilities) : base(new InternetExplorerDriver(SetOptions(capabilities)))
+        public InternetExplorerDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))
         {
         }
 
@@ -17,7 +17,7 @@ private static InternetExplorerOptions SetOptions(Dictionary<string, object> cap
             {
                 if (cap.Key.StartsWith("capability", StringComparison.OrdinalIgnoreCase))
                 {
-                    var args = ParseWithDelimiter(cap.Value.ToString());
+                    var args = Extensions.ParseWithDelimiter(cap.Value.ToString());
                     options.AddAdditionalCapability(args[0], args[1]);
                 }
                 else if (cap.Key.Equals("BrowserCommandLineArguments", StringComparison.OrdinalIgnoreCase))
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/LocalDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/LocalDriver.cs
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/SafariDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/SafariDriver.cs
@@ -4,9 +4,9 @@
 
 namespace Unickq.SpecFlow.Selenium.Local
 {
-    public class Safari : LocalDriver
+    public class SafariDriver : OpenQA.Selenium.Safari.SafariDriver
     {
-        public Safari(Dictionary<string, object> capabilities) : base(new SafariDriver(SetOptions(capabilities)))
+        public SafariDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))
         {
         }
 
@@ -17,7 +17,7 @@ private static SafariOptions SetOptions(Dictionary<string, object> capabilities)
             {
                 if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))
                 {
-                    var args = ParseWithDelimiter(cap.Value.ToString());
+                    var args = Extensions.ParseWithDelimiter(cap.Value.ToString());
                     options.AddAdditionalCapability(args[0], args[1]);
                 }
                 else if (cap.Key.Equals("AcceptInsecureCertificates", StringComparison.OrdinalIgnoreCase))

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using OpenQA.Selenium;`
	`1`	`+using System;`
	`2`	`+using OpenQA.Selenium;`
`2`	`3`	`using TechTalk.SpecFlow;`
`3`	`4`
`4`	`5`	`namespace Unickq.SpecFlow.Selenium`
`@@ -16,5 +17,15 @@ public static IWebDriver GetWebDriver(this ScenarioContext scenarioContext)`
`16`	`17`	`}`
`17`	`18`	`throw new SpecFlowException("Driver is not present in ScenarioContext");`
`18`	`19`	`}`
	`20`	`+`
	`21`	`+ public static string[] ParseWithDelimiter(string input, char splitter = '=')`
	`22`	`+ {`
	`23`	`+ var prms = input.Split(splitter);`
	`24`	`+ if (prms.Length != 2)`
	`25`	`+ {`
	`26`	`+ throw new ArgumentException($"Preference count doesn't equal to 2. Please use '{splitter}' delimiter");`
	`27`	`+ }`
	`28`	`+ return new[] { prms[0], prms[1] };`
	`29`	`+ }`
`19`	`30`	`}`
`20`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Unickq.SpecFlow.Selenium.Local`
`6`	`6`	`{`
`7`		`- public class Chrome : LocalDriver`
	`7`	`+ public class ChromeDriver : OpenQA.Selenium.Chrome.ChromeDriver`
`8`	`8`	`{`
`9`	`9`	`private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)`
`10`	`10`	`{`
`@@ -25,7 +25,7 @@ private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)`
`25`	`25`	`}`
`26`	`26`	`else if (cap.Key.StartsWith("UserProfilePreference", StringComparison.OrdinalIgnoreCase))`
`27`	`27`	`{`
`28`		`- var args = ParseWithDelimiter(cap.Value.ToString());`
	`28`	`+ var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`29`	`29`	`options.AddUserProfilePreference(args[0], args[1]);`
`30`	`30`	`}`
`31`	`31`	`else if (cap.Key.Equals("BinaryLocation", StringComparison.OrdinalIgnoreCase))`
`@@ -38,14 +38,14 @@ private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)`
`38`	`38`	`}`
`39`	`39`	`else if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))`
`40`	`40`	`{`
`41`		`- var args = ParseWithDelimiter(cap.Value.ToString());`
	`41`	`+ var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`42`	`42`	`options.AddAdditionalCapability(args[0], args[1]);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`return options;`
`46`	`46`	`}`
`47`	`47`
`48`		`- public Chrome(Dictionary<string, object> capabilities) : base(new ChromeDriver(SetOptions(capabilities)))`
	`48`	`+ public ChromeDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))`
`49`	`49`	`{`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Unickq.SpecFlow.Selenium.Local`
`6`	`6`	`{`
`7`		`- public class Edge : LocalDriver`
	`7`	`+ public class EdgeDriver : OpenQA.Selenium.Edge.EdgeDriver`
`8`	`8`	`{`
`9`		`- public Edge(Dictionary<string, object> capabilities) : base(new EdgeDriver(SetOptions(capabilities)))`
	`9`	`+ public EdgeDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`@@ -17,7 +17,7 @@ private static EdgeOptions SetOptions(Dictionary<string, object> capabilities)`
`17`	`17`	`{`
`18`	`18`	`if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))`
`19`	`19`	`{`
`20`		`- var args = ParseWithDelimiter(cap.Value.ToString());`
	`20`	`+ var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`21`	`21`	`options.AddAdditionalCapability(args[0], args[1]);`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Unickq.SpecFlow.Selenium.Local`
`6`	`6`	`{`
`7`		`- public class Firefox : LocalDriver`
	`7`	`+ public class FirefoxDriver : OpenQA.Selenium.Firefox.FirefoxDriver`
`8`	`8`	`{`
`9`	`9`	`private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities)`
`10`	`10`	`{`
`@@ -13,7 +13,7 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities`
`13`	`13`	`{`
`14`	`14`	`if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))`
`15`	`15`	`{`
`16`		`- var args = ParseWithDelimiter(cap.Value.ToString());`
	`16`	`+ var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`17`	`17`	`options.AddAdditionalCapability(args[0], args[1]);`
`18`	`18`	`}`
`19`	`19`	`else if (cap.Key.Equals("Arguments", StringComparison.OrdinalIgnoreCase))`
`@@ -22,7 +22,7 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities`
`22`	`22`	`}`
`23`	`23`	`else if (cap.Key.StartsWith("Preference", StringComparison.OrdinalIgnoreCase))`
`24`	`24`	`{`
`25`		`- var args = ParseWithDelimiter(cap.Value.ToString());`
	`25`	`+ var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`26`	`26`	`options.SetPreference(args[0], args[1]);`
`27`	`27`	`}`
`28`	`28`	`else if (cap.Key.Equals("Extensions", StringComparison.OrdinalIgnoreCase))`
`@@ -49,7 +49,7 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities`
`49`	`49`	`return options;`
`50`	`50`	`}`
`51`	`51`
`52`		`- public Firefox(Dictionary<string, object> capabilities) : base(new FirefoxDriver(SetOptions(capabilities)))`
	`52`	`+ public FirefoxDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))`
`53`	`53`	`{`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Unickq.SpecFlow.Selenium.Local`
`6`	`6`	`{`
`7`		`- public class InternetExplorer : LocalDriver`
	`7`	`+ public class InternetExplorerDriver : OpenQA.Selenium.IE.InternetExplorerDriver`
`8`	`8`	`{`
`9`		`- public InternetExplorer(Dictionary<string, object> capabilities) : base(new InternetExplorerDriver(SetOptions(capabilities)))`
	`9`	`+ public InternetExplorerDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`@@ -17,7 +17,7 @@ private static InternetExplorerOptions SetOptions(Dictionary<string, object> cap`
`17`	`17`	`{`
`18`	`18`	`if (cap.Key.StartsWith("capability", StringComparison.OrdinalIgnoreCase))`
`19`	`19`	`{`
`20`		`- var args = ParseWithDelimiter(cap.Value.ToString());`
	`20`	`+ var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`21`	`21`	`options.AddAdditionalCapability(args[0], args[1]);`
`22`	`22`	`}`
`23`	`23`	`else if (cap.Key.Equals("BrowserCommandLineArguments", StringComparison.OrdinalIgnoreCase))`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Unickq.SpecFlow.Selenium.Local`
`6`	`6`	`{`
`7`		`- public class Safari : LocalDriver`
	`7`	`+ public class SafariDriver : OpenQA.Selenium.Safari.SafariDriver`
`8`	`8`	`{`
`9`		`- public Safari(Dictionary<string, object> capabilities) : base(new SafariDriver(SetOptions(capabilities)))`
	`9`	`+ public SafariDriver(Dictionary<string, object> capabilities) : base(SetOptions(capabilities))`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`@@ -17,7 +17,7 @@ private static SafariOptions SetOptions(Dictionary<string, object> capabilities)`
`17`	`17`	`{`
`18`	`18`	`if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))`
`19`	`19`	`{`
`20`		`- var args = ParseWithDelimiter(cap.Value.ToString());`
	`20`	`+ var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`21`	`21`	`options.AddAdditionalCapability(args[0], args[1]);`
`22`	`22`	`}`
`23`	`23`	`else if (cap.Key.Equals("AcceptInsecureCertificates", StringComparison.OrdinalIgnoreCase))`