[dotnet] allow toggling test values by environment variable

titusfortner · titusfortner · commit ef9f98969d61 · 2022-05-09T00:17:13.000-05:00
diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using Newtonsoft.Json;
 using NUnit.Framework;
-using System.Collections.Generic;
 
 namespace OpenQA.Selenium.Environment
 {
@@ -28,15 +27,16 @@ private EnvironmentManager()
             string content = File.ReadAllText(configFile);
             TestEnvironment env = JsonConvert.DeserializeObject<TestEnvironment>(content);
 
-            string activeDriverConfig = TestContext.Parameters.Get("ActiveDriverConfig", env.ActiveDriverConfig);
+            string activeDriverConfig = System.Environment.GetEnvironmentVariable("ACTIVE_DRIVER_CONFIG") ?? TestContext.Parameters.Get("ActiveDriverConfig", env.ActiveDriverConfig);
+            string driverServiceLocation = System.Environment.GetEnvironmentVariable("DRIVER_SERVICE_LOCATION") ?? TestContext.Parameters.Get("DriverServiceLocation", env.DriverServiceLocation);
             string activeWebsiteConfig = TestContext.Parameters.Get("ActiveWebsiteConfig", env.ActiveWebsiteConfig);
-            string driverServiceLocation = TestContext.Parameters.Get("DriverServiceLocation", env.DriverServiceLocation);
             DriverConfig driverConfig = env.DriverConfigs[activeDriverConfig];
             WebsiteConfig websiteConfig = env.WebSiteConfigs[activeWebsiteConfig];
             TestWebServerConfig webServerConfig = env.TestWebServerConfig;
             webServerConfig.CaptureConsoleOutput = TestContext.Parameters.Get<bool>("CaptureWebServerOutput", env.TestWebServerConfig.CaptureConsoleOutput);
             webServerConfig.HideCommandPromptWindow = TestContext.Parameters.Get<bool>("HideWebServerCommandPrompt", env.TestWebServerConfig.HideCommandPromptWindow);
             webServerConfig.JavaHomeDirectory = TestContext.Parameters.Get("WebServerJavaHome", env.TestWebServerConfig.JavaHomeDirectory);
+
             this.driverFactory = new DriverFactory(driverServiceLocation);
             this.driverFactory.DriverStarting += OnDriverStarting;
 
@@ -160,7 +160,7 @@ public static EnvironmentManager Instance
             }
         }
 
-        public Browser Browser 
+        public Browser Browser
         {
             get { return browser; }
         }
@@ -183,7 +183,7 @@ public string CurrentDirectory
                 return testDirectory;
             }
         }
-        
+
         public TestWebServer WebServer
         {
             get { return webServer; }
@@ -210,12 +210,12 @@ public UrlBuilder UrlBuilder
         public IWebDriver GetCurrentDriver()
         {
             if (driver != null)
-            { 
-                return driver; 
+            {
+                return driver;
             }
-            else 
-            { 
-                return CreateFreshDriver(); 
+            else
+            {
+                return CreateFreshDriver();
             }
         }
 
@@ -238,9 +238,9 @@ public IWebDriver CreateFreshDriver()
 
         public void CloseCurrentDriver()
         {
-            if (driver != null) 
+            if (driver != null)
             {
-                driver.Quit(); 
+                driver.Quit();
             }
             driver = null;
         }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using Newtonsoft.Json;`
`5`	`5`	`using NUnit.Framework;`
`6`		`-using System.Collections.Generic;`
`7`	`6`
`8`	`7`	`namespace OpenQA.Selenium.Environment`
`9`	`8`	`{`
`@@ -28,15 +27,16 @@ private EnvironmentManager()`
`28`	`27`	`string content = File.ReadAllText(configFile);`
`29`	`28`	`TestEnvironment env = JsonConvert.DeserializeObject<TestEnvironment>(content);`
`30`	`29`
`31`		`- string activeDriverConfig = TestContext.Parameters.Get("ActiveDriverConfig", env.ActiveDriverConfig);`
	`30`	`+ string activeDriverConfig = System.Environment.GetEnvironmentVariable("ACTIVE_DRIVER_CONFIG") ?? TestContext.Parameters.Get("ActiveDriverConfig", env.ActiveDriverConfig);`
	`31`	`+ string driverServiceLocation = System.Environment.GetEnvironmentVariable("DRIVER_SERVICE_LOCATION") ?? TestContext.Parameters.Get("DriverServiceLocation", env.DriverServiceLocation);`
`32`	`32`	`string activeWebsiteConfig = TestContext.Parameters.Get("ActiveWebsiteConfig", env.ActiveWebsiteConfig);`
`33`		`- string driverServiceLocation = TestContext.Parameters.Get("DriverServiceLocation", env.DriverServiceLocation);`
`34`	`33`	`DriverConfig driverConfig = env.DriverConfigs[activeDriverConfig];`
`35`	`34`	`WebsiteConfig websiteConfig = env.WebSiteConfigs[activeWebsiteConfig];`
`36`	`35`	`TestWebServerConfig webServerConfig = env.TestWebServerConfig;`
`37`	`36`	`webServerConfig.CaptureConsoleOutput = TestContext.Parameters.Get<bool>("CaptureWebServerOutput", env.TestWebServerConfig.CaptureConsoleOutput);`
`38`	`37`	`webServerConfig.HideCommandPromptWindow = TestContext.Parameters.Get<bool>("HideWebServerCommandPrompt", env.TestWebServerConfig.HideCommandPromptWindow);`
`39`	`38`	`webServerConfig.JavaHomeDirectory = TestContext.Parameters.Get("WebServerJavaHome", env.TestWebServerConfig.JavaHomeDirectory);`
	`39`	`+`
`40`	`40`	`this.driverFactory = new DriverFactory(driverServiceLocation);`
`41`	`41`	`this.driverFactory.DriverStarting += OnDriverStarting;`
`42`	`42`
`@@ -160,7 +160,7 @@ public static EnvironmentManager Instance`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`- public Browser Browser`
	`163`	`+ public Browser Browser`
`164`	`164`	`{`
`165`	`165`	`get { return browser; }`
`166`	`166`	`}`
`@@ -183,7 +183,7 @@ public string CurrentDirectory`
`183`	`183`	`return testDirectory;`
`184`	`184`	`}`
`185`	`185`	`}`
`186`		`-`
	`186`	`+`
`187`	`187`	`public TestWebServer WebServer`
`188`	`188`	`{`
`189`	`189`	`get { return webServer; }`
`@@ -210,12 +210,12 @@ public UrlBuilder UrlBuilder`
`210`	`210`	`public IWebDriver GetCurrentDriver()`
`211`	`211`	`{`
`212`	`212`	`if (driver != null)`
`213`		`- {`
`214`		`- return driver;`
	`213`	`+ {`
	`214`	`+ return driver;`
`215`	`215`	`}`
`216`		`- else`
`217`		`- {`
`218`		`- return CreateFreshDriver();`
	`216`	`+ else`
	`217`	`+ {`
	`218`	`+ return CreateFreshDriver();`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`@@ -238,9 +238,9 @@ public IWebDriver CreateFreshDriver()`
`238`	`238`
`239`	`239`	`public void CloseCurrentDriver()`
`240`	`240`	`{`
`241`		`- if (driver != null)`
	`241`	`+ if (driver != null)`
`242`	`242`	`{`
`243`		`- driver.Quit();`
	`243`	`+ driver.Quit();`
`244`	`244`	`}`
`245`	`245`	`driver = null;`
`246`	`246`	`}`