Merge pull request #131 from wztech0192/develop

Add IDictionary support
Tynamix · Jan 22, 2022 · ab192b1 · ab192b1
2 parents 17a9264 + a95d9a9
commit ab192b1
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 2 deletions.
diff --git a/Tynamix.ObjectFiller.Test/DictionaryFillingTest.cs b/Tynamix.ObjectFiller.Test/DictionaryFillingTest.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tynamix.ObjectFiller.Test
+{
+    [TestClass]
+    public class DictionaryFillingTest
+    {
+        public class EntityA
+        {
+            public string Name { get; set; }
+            public int ID { get; set; }
+            public IDictionary<string, string> InterfaceDictionary { get; set; }
+            public Dictionary<string, string> ConcreteDictionary { get; set; }
+
+            public NestedEntity NestedEntity { get; set; }
+        }
+
+        public class NestedEntity
+        {
+            public IDictionary<string, string> InterfaceDictionary { get; set; }
+            public Dictionary<string, string> ConcreteDictionary { get; set; }
+        }
+
+
+        [TestMethod]
+        public void TestDictionaryType()
+        {
+            Filler<EntityA> filler = new Filler<EntityA>();
+
+            var result = filler.Create();
+
+            Assert.IsNotNull(result.Name);
+            Assert.IsNotNull(result.ID);
+            Assert.IsNotNull(result.InterfaceDictionary);
+            Assert.IsTrue(result.InterfaceDictionary.Any());
+            Assert.IsNotNull(result.ConcreteDictionary);
+            Assert.IsTrue(result.ConcreteDictionary.Any());
+
+            Assert.IsNotNull(result.NestedEntity);
+            Assert.IsNotNull(result.NestedEntity.InterfaceDictionary);
+            Assert.IsTrue(result.NestedEntity.InterfaceDictionary.Any());
+            Assert.IsNotNull(result.NestedEntity.ConcreteDictionary);
+            Assert.IsTrue(result.NestedEntity.ConcreteDictionary.Any());
+
+        }
+    }
+}
diff --git a/Tynamix.ObjectFiller/Filler.cs b/Tynamix.ObjectFiller/Filler.cs
@@ -284,7 +284,19 @@ private static bool ListParamTypeIsValid(Type listType, FillerSetupItem currentS
         /// </returns>
         private static bool TypeIsDictionary(Type type)
         {
-            return type.GetImplementedInterfaces().Any(x => x == typeof(IDictionary));
+            Type interfaceType = typeof(IDictionary);
+            Type genericType = typeof(IDictionary<,>);
+
+            if (type.IsInterface())
+            {
+                return type.IsGenericType() && 
+                    (
+                        type.GetGenericTypeDefinition() == genericType || 
+                        type.GetImplementedInterfaces().Any(x => x.IsGenericType() &&  x.GetGenericTypeDefinition() == typeof(IDictionary<,>))
+                    );
+            }
+
+            return type.GetImplementedInterfaces().Any(x => x == interfaceType);
         }
 
         /// <summary>
@@ -751,7 +763,6 @@ private IDictionary GetFilledDictionary(
             FillerSetupItem currentSetupItem,
             HashStack<Type> typeTracker)
         {
-            IDictionary dictionary = (IDictionary)Activator.CreateInstance(propertyType);
 
             bool derivedType = !propertyType.GetGenericTypeArguments().Any();
 
@@ -763,6 +774,24 @@ private IDictionary GetFilledDictionary(
                             ? propertyType.GetGenericTypeArguments()[1]
                             : propertyType.GetTypeInfo().BaseType.GetGenericTypeArguments()[1];
 
+            IDictionary dictionary;
+            if (!propertyType.IsInterface()
+                && propertyType.GetImplementedInterfaces().Any(x => x == typeof(IDictionary)))
+            {
+                dictionary = (IDictionary)Activator.CreateInstance(propertyType);
+            }
+            else if (propertyType.IsGenericType() && propertyType.GetGenericTypeDefinition() == typeof(IDictionary<,>)
+                     || propertyType.GetImplementedInterfaces().Any(x => x.IsGenericType() && x.GetGenericTypeDefinition() == typeof(IDictionary<,>)))
+            {
+                Type openDictionaryType = typeof(Dictionary<,>);
+                Type genericDictionaryType = openDictionaryType.MakeGenericType(keyType, valueType);
+                dictionary = (IDictionary)Activator.CreateInstance(genericDictionaryType);
+            }
+            else
+            {
+                dictionary = (IDictionary)Activator.CreateInstance(propertyType);
+            }
+
             int maxDictionaryItems = 0;
 
             if (keyType.IsEnum())