Suppressing warnings

jimevans · jimevans · commit 32dd1b3d4942 · 2017-02-13T14:31:58.000-08:00
diff --git a/dotnet/src/webdriver/Firefox/FirefoxOptions.cs b/dotnet/src/webdriver/Firefox/FirefoxOptions.cs
@@ -325,7 +325,11 @@ public override ICapabilities ToCapabilities()
                 }
                 else
                 {
-                    capabilities.SetCapability(FirefoxBinaryCapability, new FirefoxBinary().BinaryExecutable.ExecutablePath);
+                    using (FirefoxBinary executablePathBinary = new FirefoxBinary())
+                    {
+                        string executablePath = executablePathBinary.BinaryExecutable.ExecutablePath;
+                        capabilities.SetCapability(FirefoxBinaryCapability, executablePath);
+                    }
                 }
             }
 
@@ -352,10 +356,13 @@ private Dictionary<string, object> GenerateFirefoxOptionsDictionary()
             }
             else
             {
-                string executablePath = new FirefoxBinary().BinaryExecutable.ExecutablePath;
-                if (!string.IsNullOrEmpty(executablePath))
+                using (FirefoxBinary executablePathBinary = new FirefoxBinary())
                 {
-                    firefoxOptions[FirefoxBinaryCapability] = executablePath;
+                    string executablePath = executablePathBinary.BinaryExecutable.ExecutablePath;
+                    if (!string.IsNullOrEmpty(executablePath))
+                    {
+                        firefoxOptions[FirefoxBinaryCapability] = executablePath;
+                    }
                 }
             }
 
diff --git a/dotnet/src/webdriver/GlobalSuppressions.cs b/dotnet/src/webdriver/GlobalSuppressions.cs
@@ -70,6 +70,7 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Multiprocess", Scope = "member", Target = "OpenQA.Selenium.Firefox.FirefoxDriverService.#DisableBrowserMultiprocessSupport", Justification = "Multiprocess is correctly spelled.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "x", Scope = "member", Target = "OpenQA.Selenium.Interactions.PointerInputDevice.#CreatePointerMove(OpenQA.Selenium.IWebElement,OpenQA.Selenium.Interactions.CoordinateOrigin,System.Int32,System.Int32,System.TimeSpan)", Justification = "An x-offset is an appropriate name for the parameter.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "y", Scope = "member", Target = "OpenQA.Selenium.Interactions.PointerInputDevice.#CreatePointerMove(OpenQA.Selenium.IWebElement,OpenQA.Selenium.Interactions.CoordinateOrigin,System.Int32,System.Int32,System.TimeSpan)", Justification = "A y-offset is an appropriate name for the parameter.")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Png", Scope = "member", Target = "OpenQA.Selenium.ScreenshotImageFormat.#Png", Justification = "PNG is the propert term for Portable Network Graphics.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "OpenQA.Selenium.Cookie.#ExpirySeconds", Justification = "This property only exists so that the JSON serializer can serialize a cookie without resorting to a custom converter.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Scope = "member", Target = "OpenQA.Selenium.Remote.ErrorResponse.#StackTrace", Justification = "Specification compliance demands use of an array.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Scope = "member", Target = "OpenQA.Selenium.Screenshot.#AsByteArray", Justification = "Specification compliance demands use of an array.")]
@@ -84,6 +85,7 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "OpenQA.Selenium.PhantomJS.PhantomJSDriver.#.ctor(OpenQA.Selenium.PhantomJS.PhantomJSOptions)", Justification = "Driver ensures that all dependent service objects are properly disposed.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "OpenQA.Selenium.PhantomJS.PhantomJSDriver.#.ctor(System.String,OpenQA.Selenium.PhantomJS.PhantomJSOptions,System.TimeSpan)", Justification = "Driver ensures that all dependent service objects are properly disposed.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "OpenQA.Selenium.Safari.SafariDriver.#.ctor(OpenQA.Selenium.Safari.SafariOptions)", Justification = "Driver ensures that all dependent service objects are properly disposed.")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "OpenQA.Selenium.Safari.SafariDriver.#.ctor(System.String,OpenQA.Selenium.Safari.SafariOptions,System.TimeSpan)", Justification = "Driver ensures that all dependent service objects are properly disposed.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "OpenQA.Selenium.Firefox.FirefoxDriver.#.ctor(OpenQA.Selenium.Firefox.FirefoxOptions)", Justification = "Driver ensures that all dependent service objects are properly disposed.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "OpenQA.Selenium.Firefox.FirefoxDriver.#.ctor()", Justification = "Driver ensures that all dependent service objects are properly disposed.")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "OpenQA.Selenium.Firefox.FirefoxDriver.#.ctor(OpenQA.Selenium.Firefox.FirefoxProfile)", Justification = "Driver ensures that all dependent service objects are properly disposed.")]
@@ -99,3 +101,9 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "HasWebStorage", Scope = "member", Target = "OpenQA.Selenium.Remote.RemoteWebDriver.#WebStorage", Justification = "HasWebStorage property name is properly spelled")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "geolocation", Scope = "member", Target = "OpenQA.Selenium.Remote.RemoteWebDriver.#LocationContext", Justification = "Geolocation is properly spelled")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors", Scope = "member", Target = "OpenQA.Selenium.Remote.RemoteWebDriver.#.ctor(OpenQA.Selenium.Remote.ICommandExecutor,OpenQA.Selenium.ICapabilities)", Justification = "Class provides a hook for subclasses to modify functionality, so virtual method call in constructor is appropriate.")]
+
+// Temporary suppressions until Interactions API is fully updated.
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "OpenQA.Selenium.Interactions.PauseInteraction.#.ctor(OpenQA.Selenium.Interactions.InputDevice)", Justification = "Temporary suppressions until Interactions API is made public.")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "OpenQA.Selenium.Interactions.PointerInputDevice.#.ctor(OpenQA.Selenium.Interactions.PointerKind)", Justification = "Temporary suppressions until Interactions API is made public.")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "OpenQA.Selenium.Interactions.PointerInputDevice.#CreatePointerCancel()", Justification = "Temporary suppressions until Interactions API is made public.")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "OpenQA.Selenium.Interactions.PointerInputDevice+PointerCancelInteraction.#.ctor(OpenQA.Selenium.Interactions.InputDevice)", Justification = "Temporary suppressions until Interactions API is made public.")]
diff --git a/dotnet/src/webdriver/Remote/RemoteTimeouts.cs b/dotnet/src/webdriver/Remote/RemoteTimeouts.cs
@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace OpenQA.Selenium.Remote
 {
@@ -145,7 +146,7 @@ private TimeSpan ExecuteGetTimeout(string timeoutType)
                     throw new WebDriverException("Specified timeout type not defined");
                 }
 
-                return TimeSpan.FromMilliseconds(Convert.ToDouble(responseValue[timeoutType]));
+                return TimeSpan.FromMilliseconds(Convert.ToDouble(responseValue[timeoutType], CultureInfo.InvariantCulture));
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,11 @@ public override ICapabilities ToCapabilities()`
`325`	`325`	`}`
`326`	`326`	`else`
`327`	`327`	`{`
`328`		`- capabilities.SetCapability(FirefoxBinaryCapability, new FirefoxBinary().BinaryExecutable.ExecutablePath);`
	`328`	`+ using (FirefoxBinary executablePathBinary = new FirefoxBinary())`
	`329`	`+ {`
	`330`	`+ string executablePath = executablePathBinary.BinaryExecutable.ExecutablePath;`
	`331`	`+ capabilities.SetCapability(FirefoxBinaryCapability, executablePath);`
	`332`	`+ }`
`329`	`333`	`}`
`330`	`334`	`}`
`331`	`335`
`@@ -352,10 +356,13 @@ private Dictionary<string, object> GenerateFirefoxOptionsDictionary()`
`352`	`356`	`}`
`353`	`357`	`else`
`354`	`358`	`{`
`355`		`- string executablePath = new FirefoxBinary().BinaryExecutable.ExecutablePath;`
`356`		`- if (!string.IsNullOrEmpty(executablePath))`
	`359`	`+ using (FirefoxBinary executablePathBinary = new FirefoxBinary())`
`357`	`360`	`{`
`358`		`- firefoxOptions[FirefoxBinaryCapability] = executablePath;`
	`361`	`+ string executablePath = executablePathBinary.BinaryExecutable.ExecutablePath;`
	`362`	`+ if (!string.IsNullOrEmpty(executablePath))`
	`363`	`+ {`
	`364`	`+ firefoxOptions[FirefoxBinaryCapability] = executablePath;`
	`365`	`+ }`
`359`	`366`	`}`
`360`	`367`	`}`
`361`	`368`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`using System;`
`20`	`20`	`using System.Collections.Generic;`
	`21`	`+using System.Globalization;`
`21`	`22`
`22`	`23`	`namespace OpenQA.Selenium.Remote`
`23`	`24`	`{`
`@@ -145,7 +146,7 @@ private TimeSpan ExecuteGetTimeout(string timeoutType)`
`145`	`146`	`throw new WebDriverException("Specified timeout type not defined");`
`146`	`147`	`}`
`147`	`148`
`148`		`- return TimeSpan.FromMilliseconds(Convert.ToDouble(responseValue[timeoutType]));`
	`149`	`+ return TimeSpan.FromMilliseconds(Convert.ToDouble(responseValue[timeoutType], CultureInfo.InvariantCulture));`
`149`	`150`	`}`
`150`	`151`	`else`
`151`	`152`	`{`