Updating .NET remote tests to pass path to IEDriverServer.exe

Author: jimevans

dotnet/test/common/Environment/EnvironmentManager.cs

@@ -31,18 +31,7 @@ private EnvironmentManager()
 
             urlBuilder = new UrlBuilder();
 
-            Assembly executingAssembly = Assembly.GetExecutingAssembly();
-            string assemblyLocation = executingAssembly.Location;
-
-            // If we're shadow copying,. fiddle with 
-            // the codebase instead 
-            if (AppDomain.CurrentDomain.ShadowCopyFiles)
-            {
-                Uri uri = new Uri(executingAssembly.CodeBase);
-                assemblyLocation = uri.LocalPath;
-            }
-
-            string currentDirectory = Path.GetDirectoryName(assemblyLocation);
+            string currentDirectory = this.CurrentDirectory;
             DirectoryInfo info = new DirectoryInfo(currentDirectory);
             while (info != info.Root && string.Compare(info.Name, "build", StringComparison.OrdinalIgnoreCase) != 0)
             {
@@ -80,6 +69,26 @@ public Browser Browser
             get { return browser; }
         }
 
+        public string CurrentDirectory
+        {
+            get
+            {
+                Assembly executingAssembly = Assembly.GetExecutingAssembly();
+                string assemblyLocation = executingAssembly.Location;
+
+                // If we're shadow copying,. fiddle with 
+                // the codebase instead 
+                if (AppDomain.CurrentDomain.ShadowCopyFiles)
+                {
+                    Uri uri = new Uri(executingAssembly.CodeBase);
+                    assemblyLocation = uri.LocalPath;
+                }
+
+                string currentDirectory = Path.GetDirectoryName(assemblyLocation);
+                return currentDirectory;
+            }
+        }
+        
         public TestWebServer WebServer
         {
             get { return webServer; }

dotnet/test/common/Environment/RemoteSeleniumServer.cs

@@ -23,9 +23,11 @@ public void Start()
         {
             if (autoStart && (webserverProcess == null || webserverProcess.HasExited))
             {
+                string currentDirectory = EnvironmentManager.Instance.CurrentDirectory;
+                string ieDriverExe = System.IO.Path.Combine(currentDirectory, "IEDriverServer.exe");
                 webserverProcess = new Process();
                 webserverProcess.StartInfo.FileName = "java.exe";
-                webserverProcess.StartInfo.Arguments = "-jar " + serverJarName + " -port 6000";
+                webserverProcess.StartInfo.Arguments = "-Dwebdriver.ie.driver=" + ieDriverExe + " -jar " + serverJarName + " -port 6000";
                 webserverProcess.StartInfo.WorkingDirectory = projectRootPath;
                 webserverProcess.Start();
                 DateTime timeout = DateTime.Now.Add(TimeSpan.FromSeconds(30));