Fix type convertion for object primitive type (#85)

aquality-automation · Jan 28, 2021 · 676c73f · 676c73f
1 parent 46b775f
commit 676c73f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Utilities/JsonSettingsFile.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Utilities/JsonSettingsFile.cs
@@ -68,7 +68,13 @@ public T GetValue<T>(string path)
             var envValue = GetEnvironmentValue(path);
             if (envValue != null)
             {
-                return ConvertEnvVar(() => (T) TypeDescriptor.GetConverter(typeof(T)).ConvertFrom(envValue),
+                return ConvertEnvVar(() =>
+                {
+                    var type = typeof(T);
+                    return type == typeof(object) 
+                    ? (T) Convert.ChangeType(envValue, type)
+                    : (T) TypeDescriptor.GetConverter(type).ConvertFrom(envValue);
+                },
                     envValue, path);
             }
 

diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Utilities/JsonFileTests.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Utilities/JsonFileTests.cs
@@ -109,6 +109,19 @@ public void Should_BePossibleTo_GetEmptyValueDictionary()
         [NonParallelizable]
         public void Should_BePossibleTo_OverrideDictionaryOfValues_FromEnvVar()
         {
+            CheckOverrideDictionaryFromEnvVar<string>();
+        }
+
+        [Test]
+        [NonParallelizable]
+        public void Should_BePossibleTo_OverrideDictionaryOfObjects_FromEnvVar()
+        {
+            CheckOverrideDictionaryFromEnvVar<object>();
+        }
+
+        private void CheckOverrideDictionaryFromEnvVar<T>()
+        {
+
             var expectedDict = new Dictionary<string, object>
             {
                 {"intl.accept_languages", "1"},
@@ -120,7 +133,7 @@ public void Should_BePossibleTo_OverrideDictionaryOfValues_FromEnvVar()
             Environment.SetEnvironmentVariable("driverSettings.chrome.options.disable-popup-blocking", "bla");
 
             Assert.AreEqual(expectedDict,
-                AddedParamsSettings.GetValueDictionary<string>(".driverSettings.chrome.options"),
+                AddedParamsSettings.GetValueDictionary<T>(".driverSettings.chrome.options"),
                 "Dictionary of keys and values was overriden successively");
         }