Fixed errors in tests and configuration constructor usage.

open-collar · May 17, 2021 · 8d7eaef · 8d7eaef
1 parent c0acc90
commit 8d7eaef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/OpenCollar.Extensions.Configuration/Collections/ConfigurationDictionaryBase.cs b/src/OpenCollar.Extensions.Configuration/Collections/ConfigurationDictionaryBase.cs
@@ -384,7 +384,7 @@ public Element<TKey, TElement> this[TKey key]
                     return value;
                 }
 
-                throw new ArgumentOutOfRangeException(nameof(key), key, string.Format(CultureInfo.CurrentCulture, Exceptions.KeyNotFound, nameof(key)));
+                throw new ArgumentOutOfRangeException(nameof(key), key, string.Format(CultureInfo.CurrentCulture, Exceptions.KeyNotFound, nameof(key), key));
             }
         }
 
@@ -860,7 +860,7 @@ protected TElement AddNew(TKey key)
                     break;
 
                 case ImplementationKind.ConfigurationObject:
-                    var validators = ServiceCollectionExtensions.GetValidators(PropertyDef.ElementImplementation.ImplementationType);
+                    var validators = ServiceCollectionExtensions.GetValidators(PropertyDef.ElementImplementation.Type);
                     value = (TElement)Activator.CreateInstance(PropertyDef.ElementImplementation.ImplementationType, PropertyDef, ConfigurationRoot, this, PropertyDef.Settings, validators);
                     break;
 

diff --git a/src/OpenCollar.Extensions.Configuration/PropertyDef.cs b/src/OpenCollar.Extensions.Configuration/PropertyDef.cs
@@ -645,7 +645,7 @@ public TElement CopyValue<TElement>(IImplementation implementation, TElement val
                     return (TElement)Activator.CreateInstance(implementation.ImplementationType, parent, this, configurationRoot, value, implementation.Settings);
 
                 case ImplementationKind.ConfigurationObject:
-                    var validators = ServiceCollectionExtensions.GetValidators(implementation.ImplementationType);
+                    var validators = ServiceCollectionExtensions.GetValidators(implementation.Type);
                     var clone = Activator.CreateInstance(implementation.ImplementationType, this, configurationRoot, parent, implementation.Settings, validators);
                     ((ConfigurationObjectBase)clone).Clone((IConfigurationObject)value);
                     return (TElement)clone;

diff --git a/test/OpenCollar.Extensions.Configuration.TESTS/ConfigurationObjectBaseTests.cs b/test/OpenCollar.Extensions.Configuration.TESTS/ConfigurationObjectBaseTests.cs
@@ -106,14 +106,16 @@ public void TestConstructors()
             Assert.NotNull(x);
             Assert.Null(x.PropertyDef());
 
+            var validators = System.Array.Empty<IConfigurationObjectValidator<IRootElement>>();
+
             Assert.Throws<TargetInvocationException>(() =>
             {
-                var y = Activator.CreateInstance(x.GetType(), (IPropertyDef)null, (IConfigurationRoot)null, (IConfigurationParent)null, new ConfigurationObjectSettings());
+                var y = Activator.CreateInstance(x.GetType(), (IPropertyDef)null, (IConfigurationRoot)null, (IConfigurationParent)null, new ConfigurationObjectSettings(), validators);
             });
 
             try
             {
-                var y = Activator.CreateInstance(x.GetType(), (IPropertyDef)null, (IConfigurationRoot)null, (IConfigurationParent)null, new ConfigurationObjectSettings());
+                var y = Activator.CreateInstance(x.GetType(), (IPropertyDef)null, (IConfigurationRoot)null, (IConfigurationParent)null, new ConfigurationObjectSettings(), validators);
             }
             catch(TargetInvocationException ex)
             {
@@ -132,7 +134,8 @@ public void TestDefaults()
 
             Assert.Equal("DEFAULT_VALUE", fixture.RootElement.CustomValueB);
 
-            // The default here is true, but the value in the config is false.  In earlier versions the default overrode the config value.
+            // The default here is true, but the value in the config is false. In earlier versions the default overrode
+            // the config value.
             Assert.False(fixture.RootElement.TestDefaults);
         }
 

diff --git a/test/OpenCollar.Extensions.Configuration.TESTS/Mocks/ConfigurationObjectMock.cs b/test/OpenCollar.Extensions.Configuration.TESTS/Mocks/ConfigurationObjectMock.cs
@@ -23,7 +23,7 @@ namespace OpenCollar.Extensions.Configuration.TESTS
 {
     internal class ConfigurationObjectMock : ConfigurationObjectBase<IRootElement>
     {
-        public ConfigurationObjectMock(IPropertyDef propertyDef, IConfigurationRoot configurationRoot, IConfigurationParent parent, ConfigurationObjectSettings settings) : base(propertyDef, configurationRoot, parent, settings)
+        public ConfigurationObjectMock(IPropertyDef propertyDef, IConfigurationRoot configurationRoot, IConfigurationParent parent, ConfigurationObjectSettings settings) : base(propertyDef, configurationRoot, parent, settings, System.Array.Empty<IConfigurationObjectValidator<IRootElement>>())
         {
         }
     }