FxCop/static analysis warning suppression. No functional changes

Author: jimevans

dotnet/src/webdriver/Chrome/ChromeDriver.cs

@@ -142,7 +142,7 @@ 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(new DriverServiceCommandExecutor(service, commandTimeout), options.ToCapabilities())
+            : base(new DriverServiceCommandExecutor(service, commandTimeout), ConvertOptionsToCapabilities(options))
         {
         }
         #endregion
@@ -162,5 +162,15 @@ public override IFileDetector FileDetector
             get { return base.FileDetector; }
             set { }
         }
+
+        private static ICapabilities ConvertOptionsToCapabilities(ChromeOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException("options", "options must not be null");
+            }
+
+            return options.ToCapabilities();
+        }
     }
 }

dotnet/src/webdriver/Edge/EdgeDriver.cs

@@ -107,10 +107,20 @@ 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(new DriverServiceCommandExecutor(service, commandTimeout), options.ToCapabilities())
+            : base(new DriverServiceCommandExecutor(service, commandTimeout), ConvertOptionsToCapabilities(options))
         {
         }
         #endregion
+
+        private static ICapabilities ConvertOptionsToCapabilities(EdgeOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException("options", "options must not be null");
+            }
+
+            return options.ToCapabilities();
+        }
     }
 }
 

dotnet/src/webdriver/Edge/EdgeDriverService.cs

@@ -32,9 +32,6 @@ public sealed class EdgeDriverService : DriverService
     {
         private const string MicrosoftWebDriverServiceFileName = "MicrosoftWebDriver.exe";
         private static readonly Uri MicrosoftWebDriverDownloadUrl = new Uri("http://go.microsoft.com/fwlink/?LinkId=619687");
-        private string logPath = string.Empty;
-        private string urlPathPrefix = string.Empty;
-        private string portServerAddress = string.Empty;
 
 
         /// <summary>
@@ -76,7 +73,7 @@ public static EdgeDriverService CreateDefaultService(string driverPath)
         /// <returns>A EdgeDriverService using a random port.</returns>
         public static EdgeDriverService CreateDefaultService(string driverPath, string driverExecutableFileName)
         {
-            return new EdgeDriverService(driverPath, driverExecutableFileName, PortUtilities.FindFreePort());
+            return CreateDefaultService(driverPath, driverExecutableFileName, PortUtilities.FindFreePort());
         }
 
         /// <summary>

dotnet/src/webdriver/Firefox/FirefoxBinary.cs

@@ -35,7 +35,7 @@ namespace OpenQA.Selenium.Firefox
     /// </summary>
     /// <remarks>The <see cref="FirefoxBinary"/> class is responsible for instantiating the
     /// Firefox process, and the operating system environment in which it runs.</remarks>
-    public class FirefoxBinary
+    public class FirefoxBinary : IDisposable
     {
         #region Constants
         private const string NoFocusLibraryName = "x_ignore_nofocus.so"; 
@@ -46,6 +46,7 @@ public class FirefoxBinary
         private Executable executable;
         private Process process;
         private TimeSpan timeout = TimeSpan.FromSeconds(45);
+        private bool isDisposed = false;
         #endregion
 
         #region Constructors
@@ -140,28 +141,28 @@ public void StartProfile(FirefoxProfile profile, params string[] commandLineArgu
                 commandLineArgs.Append(" ").Append(commandLineArg);
             }
 
-            Process builder = new Process();
-            builder.StartInfo.FileName = this.BinaryExecutable.ExecutablePath;
-            builder.StartInfo.Arguments = commandLineArgs.ToString();
-            builder.StartInfo.UseShellExecute = false;
+            this.process = new Process();
+            this.process.StartInfo.FileName = this.BinaryExecutable.ExecutablePath;
+            this.process.StartInfo.Arguments = commandLineArgs.ToString();
+            this.process.StartInfo.UseShellExecute = false;
 
             foreach (string environmentVar in this.extraEnv.Keys)
             {
-                if (builder.StartInfo.EnvironmentVariables.ContainsKey(environmentVar))
+                if (this.process.StartInfo.EnvironmentVariables.ContainsKey(environmentVar))
                 {
-                    builder.StartInfo.EnvironmentVariables[environmentVar] = this.extraEnv[environmentVar];
+                    this.process.StartInfo.EnvironmentVariables[environmentVar] = this.extraEnv[environmentVar];
                 }
                 else
                 {
-                    builder.StartInfo.EnvironmentVariables.Add(environmentVar, this.extraEnv[environmentVar]);
+                    this.process.StartInfo.EnvironmentVariables.Add(environmentVar, this.extraEnv[environmentVar]);
                 }
             }
 
-            this.BinaryExecutable.SetLibraryPath(builder);
+            this.BinaryExecutable.SetLibraryPath(this.process);
 
-            this.StartFirefoxProcess(builder);
+            this.StartFirefoxProcess();
 
-            this.CopeWithTheStrangenessOfTheMac(builder);
+            this.CopeWithTheStrangenessOfTheMac();
         }
 
         /// <summary>
@@ -186,21 +187,6 @@ public void SetEnvironmentProperty(string propertyName, string value)
             }
         }
 
-        /// <summary>
-        /// Creates a named profile for Firefox.
-        /// </summary>
-        /// <param name="profileName">The name of the profile to create.</param>
-        [SecurityPermission(SecurityAction.Demand)]
-        public void CreateProfile(string profileName)
-        {
-            Process builder = new Process();
-            builder.StartInfo.FileName = this.executable.ExecutablePath;
-            builder.StartInfo.Arguments = "--verbose -CreateProfile " + profileName;
-            builder.StartInfo.EnvironmentVariables.Add("MOZ_NO_REMOTE", "1");
-
-            this.StartFirefoxProcess(builder);
-        }
-
         /// <summary>
         /// Waits for the process to complete execution.
         /// </summary>
@@ -211,30 +197,12 @@ public void WaitForProcessExit()
         }
 
         /// <summary>
-        /// Stops the execution of this <see cref="FirefoxBinary"/>, terminating the process if necessary.
+        /// Releases all resources used by the <see cref="FirefoxBinary"/>.
         /// </summary>
-        [SecurityPermission(SecurityAction.Demand)]
-        public void Quit()
+        public void Dispose()
         {
-            // Suicide watch: First,  a second to see if the process will die on 
-            // it's own (we will likely have asked the process to kill itself just 
-            // before calling this method).
-            if (this.process != null)
-            {
-                if (!this.process.HasExited)
-                {
-                    System.Threading.Thread.Sleep(1000);
-                }
-
-                // Murder option: The process is still alive, so kill it.
-                if (!this.process.HasExited)
-                {
-                    this.process.Kill();
-                }
-
-                this.process.Dispose();
-                this.process = null;
-            }
+            this.Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>
@@ -249,17 +217,48 @@ public override string ToString()
         /// <summary>
         /// Starts the Firefox process.
         /// </summary>
-        /// <param name="builder">A <see cref="Process"/> object used to start Firefox.</param>
         [SecurityPermission(SecurityAction.Demand)]
-        protected void StartFirefoxProcess(Process builder)
+        protected void StartFirefoxProcess()
+        {
+            this.process.Start();
+        }
+
+        /// <summary>
+        /// Releases the unmanaged resources used by the <see cref="FirefoxBinary"/> and optionally 
+        /// releases the managed resources.
+        /// </summary>
+        /// <param name="disposing"><see langword="true"/> to release managed and resources; 
+        /// <see langword="false"/> to only release unmanaged resources.</param>
+        [SecurityPermission(SecurityAction.Demand)]
+        protected virtual void Dispose(bool disposing)
         {
-            if (builder == null)
+            if (!this.isDisposed)
             {
-                throw new ArgumentNullException("builder", "builder cannot be null");
-            }
+                if (disposing)
+                {
+                    // Suicide watch: First,  a second to see if the process will die on 
+                    // it's own (we will likely have asked the process to kill itself just 
+                    // before calling this method).
+                    if (this.process != null)
+                    {
+                        if (!this.process.HasExited)
+                        {
+                            System.Threading.Thread.Sleep(1000);
+                        }
 
-            this.process = builder;
-            this.process.Start();
+                        // Murder option: The process is still alive, so kill it.
+                        if (!this.process.HasExited)
+                        {
+                            this.process.Kill();
+                        }
+
+                        this.process.Dispose();
+                        this.process = null;
+                    }
+                }
+
+                this.isDisposed = true;
+            }
         }
 
         private static void Sleep(int timeInMilliseconds)
@@ -343,7 +342,7 @@ private void ModifyLinkLibraryPath(FirefoxProfile profile)
         }
 
         [SecurityPermission(SecurityAction.Demand)]
-        private void CopeWithTheStrangenessOfTheMac(Process builder)
+        private void CopeWithTheStrangenessOfTheMac()
         {
             if (Platform.CurrentPlatform.IsPlatformType(PlatformType.Mac))
             {
@@ -363,7 +362,7 @@ private void CopeWithTheStrangenessOfTheMac(Process builder)
                     // TODO(simon): This is utterly bogus. We should do something far smarter
                     System.Threading.Thread.Sleep(10000);
 
-                    this.StartFirefoxProcess(builder);
+                    this.StartFirefoxProcess();
                 }
                 catch (ThreadStateException)
                 {
@@ -382,7 +381,7 @@ private void CopeWithTheStrangenessOfTheMac(Process builder)
 
                     StringBuilder message = new StringBuilder("Unable to start firefox cleanly.\n");
                     message.Append("Exit value: ").Append(this.process.ExitCode.ToString(CultureInfo.InvariantCulture)).Append("\n");
-                    message.Append("Ran from: ").Append(builder.StartInfo.FileName).Append("\n");
+                    message.Append("Ran from: ").Append(this.process.StartInfo.FileName).Append("\n");
                     throw new WebDriverException(message.ToString());
                 }
                 catch (ThreadStateException)

dotnet/src/webdriver/Firefox/FirefoxDriver.cs

@@ -191,7 +191,7 @@ public FirefoxDriver(FirefoxDriverService service)
         /// <param name="options">The <see cref="FirefoxOptions"/> to be used with the Firefox driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public FirefoxDriver(FirefoxDriverService service, FirefoxOptions options, TimeSpan commandTimeout)
-            : base(new DriverServiceCommandExecutor(service, commandTimeout), options.ToCapabilities())
+            : base(new DriverServiceCommandExecutor(service, commandTimeout), ConvertOptionsToCapabilities(options))
         {
         }
         #endregion
@@ -357,6 +357,16 @@ private static ICapabilities RemoveUnneededCapabilities(ICapabilities capabiliti
             caps.CapabilitiesDictionary.Remove(FirefoxDriver.BinaryCapabilityName);
             return caps;
         }
+
+        private static ICapabilities ConvertOptionsToCapabilities(FirefoxOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException("options", "options must not be null");
+            }
+
+            return options.ToCapabilities();
+        }
         #endregion
     }
 }

dotnet/src/webdriver/Firefox/FirefoxDriverCommandExecutor.cs

@@ -28,11 +28,12 @@ namespace OpenQA.Selenium.Firefox
     /// <summary>
     /// Provides a way of executing Commands using the FirefoxDriver.
     /// </summary>
-    public class FirefoxDriverCommandExecutor : ICommandExecutor
+    public class FirefoxDriverCommandExecutor : ICommandExecutor, IDisposable
     {
         private FirefoxDriverServer server;
         private HttpCommandExecutor internalExecutor;
         private TimeSpan commandTimeout;
+        private bool isDisposed;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FirefoxDriverCommandExecutor"/> class.
@@ -84,11 +85,39 @@ public Response Execute(Command commandToExecute)
             {
                 if (commandToExecute.Name == DriverCommand.Quit)
                 {
-                    this.server.Dispose();
+                    this.Dispose();
                 }
             }
 
             return toReturn;
         }
+
+        /// <summary>
+        /// Releases all resources used by the <see cref="FirefoxDriverCommandExecutor"/>.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases the unmanaged resources used by the <see cref="FirefoxDriverCommandExecutor"/> and 
+        /// optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing"><see langword="true"/> to release managed and resources; 
+        /// <see langword="false"/> to only release unmanaged resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!this.isDisposed)
+            {
+                if (disposing)
+                {
+                    this.server.Dispose();
+                }
+
+                this.isDisposed = true;
+            }
+        }
     }
 }

dotnet/src/webdriver/Firefox/FirefoxDriverServer.cs

@@ -125,11 +125,9 @@ protected virtual void Dispose(bool disposing)
             {
                 // This should only be called after the QUIT command has been sent,
                 // so go ahead and clean up our process and profile.
-                this.process.Quit();
+                this.process.Dispose();
                 this.profile.Clean();
             }
-
-            GC.SuppressFinalize(this);
         }
 
         private static int DetermineNextFreePort(string host, int port)