#89 fix for dictionaries added

Author: Tynamix

Tynamix.ObjectFiller.Test/BugfixTests/Bug89FillTypesInheritsFromDictionary.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ObjectFiller.Test.BugfixTests
+{
+    using Tynamix.ObjectFiller;
+
+    using Xunit;
+
+
+    public class Bug89FillTypesInheritsFromDictionary
+    {
+        public class EntityA
+        {
+            public string Name { get; set; }
+            public int ID { get; set; }
+            public EntityBList Bs { get; set; }
+        }
+        public class EntityB
+        {
+            public string Name { get; set; }
+            public Guid ID { get; set; }
+        }
+        public class EntityBList : Dictionary<string, EntityB>
+        {
+            public DateTime SomeDate { get; set; }
+        }
+
+        [Fact]
+        public void ADerivedDictionaryShallGetFilledAllProperties()
+        {
+            Filler<EntityA> filler = new Filler<EntityA>();
+
+            var result = filler.Create();
+
+            Assert.NotNull(result.Bs);
+            Assert.InRange(result.Bs.SomeDate, DateTime.MinValue.AddSeconds(1), DateTime.MaxValue.AddSeconds(-1));
+            Assert.True(result.Bs.Any());
+        }
+    }
+}

Tynamix.ObjectFiller.Test/BugfixTests/Bug89FillTypesInheritsFromList.cs

@@ -9,25 +9,25 @@ namespace ObjectFiller.Test.BugfixTests
 
     using Xunit;
 
-    public class EntityA
-    {
-        public string Name { get; set; }
-        public int ID { get; set; }
-        public EntityBList Bs { get; set; }
-    }
-    public class EntityB
-    {
-        public string Name { get; set; }
-        public Guid ID { get; set; }
-    }
-    public class EntityBList : List<EntityB>
-    {
-        public DateTime SomeDate { get; set; }
-    }
-
 
     public class Bug89FillTypesInheritsFromList
     {
+        public class EntityA
+        {
+            public string Name { get; set; }
+            public int ID { get; set; }
+            public EntityBList Bs { get; set; }
+        }
+        public class EntityB
+        {
+            public string Name { get; set; }
+            public Guid ID { get; set; }
+        }
+        public class EntityBList : List<EntityB>
+        {
+            public DateTime SomeDate { get; set; }
+        }
+
         [Fact]
         public void ADerivedListShallGetFilledAllProperties()
         {

Tynamix.ObjectFiller/Filler.cs

@@ -293,7 +293,7 @@ private static bool TypeIsList(Type type)
                    && (typeToCheck.GetGenericTypeDefinition() == typeof(IEnumerable<>)
                        || typeToCheck.GetImplementedInterfaces().Any(x => x == typeof(IList)));
 
-            return typeIsList(type) || (type.GetTypeInfo().BaseType !=null && typeIsList(type.GetTypeInfo().BaseType));
+            return typeIsList(type) || (type.GetTypeInfo().BaseType != null && typeIsList(type.GetTypeInfo().BaseType));
         }
 
         /// <summary>
@@ -734,8 +734,16 @@ private IDictionary GetFilledDictionary(
             HashStack<Type> typeTracker)
         {
             IDictionary dictionary = (IDictionary)Activator.CreateInstance(propertyType);
-            Type keyType = propertyType.GetGenericTypeArguments()[0];
-            Type valueType = propertyType.GetGenericTypeArguments()[1];
+
+            bool derivedType = !propertyType.GetGenericTypeArguments().Any();
+
+            Type keyType = !derivedType 
+                            ? propertyType.GetGenericTypeArguments()[0] 
+                            : propertyType.GetTypeInfo().BaseType.GetGenericTypeArguments()[0];
+
+            Type valueType = !derivedType
+                            ? propertyType.GetGenericTypeArguments()[1]
+                            : propertyType.GetTypeInfo().BaseType.GetGenericTypeArguments()[1];
 
             int maxDictionaryItems = 0;
 
@@ -775,6 +783,16 @@ private IDictionary GetFilledDictionary(
                 dictionary.Add(keyObject, valueObject);
             }
 
+            if (derivedType)
+            {
+
+                var remainingProperties = propertyType.GetProperties(true)
+                                          .Where(prop => this.GetSetMethodOnDeclaringType(prop) != null)
+                                          .ToArray();
+
+                this.FillProperties(dictionary, remainingProperties, currentSetupItem, typeTracker);
+            }
+
             return dictionary;
         }
 
@@ -831,10 +849,10 @@ private IList GetFilledList(Type propertyType, FillerSetupItem currentSetupItem,
 
             if (derivedList)
             {
-           
-               var remainingProperties = propertyType.GetProperties(true)
-                                         .Where(prop => this.GetSetMethodOnDeclaringType(prop) != null)
-                                         .ToArray();
+
+                var remainingProperties = propertyType.GetProperties(true)
+                                          .Where(prop => this.GetSetMethodOnDeclaringType(prop) != null)
+                                          .ToArray();
 
                 this.FillProperties(list, remainingProperties, currentSetupItem, typeTracker);
             }