Fix: Dictionaries and SortedLists caused an exception when enumerations were used as keys.

Author: HerrLoesch

ObjectFiller.Test/ListFillingTest.cs

@@ -7,6 +7,8 @@
 
 namespace ObjectFiller.Test
 {
+    using ObjectFiller.Test.TestPoco;
+
     [TestClass]
     public class ListFillingTest
     {
@@ -131,6 +133,16 @@ public void GenerateTestDataForADictionary()
             }
         }
 
+        [TestMethod]
+        public void GenerateDictionaryWithEnumeration()
+        {
+            var amountOfEnumValues = Enum.GetValues(typeof(TestEnum)).Length;
+            var filler = new Filler<Dictionary<TestEnum, string>>();
+            var result = filler.Create();
+
+            Assert.AreEqual(amountOfEnumValues, result.Count);
+        }
+
         private Entity[] GetArray()
         {
             Filler<Entity> of = new Filler<Entity>();
@@ -146,9 +158,7 @@ private Entity[] GetArray()
             entities.Add(of.Create());
             entities.Add(of.Create());
 
-
             return entities.ToArray();
         }
-
     }
 }

ObjectFiller.Test/ObjectFiller.Test.csproj

@@ -82,6 +82,7 @@
     <Compile Include="TestPoco\SimpleList.cs" />
     <Compile Include="SaveFillerSetupTest.cs" />
     <Compile Include="EmailAddressesPluginTest.cs" />
+    <Compile Include="TestPoco\TestEnum.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ObjectFiller\ObjectFiller.csproj">

ObjectFiller.Test/TestPoco/TestEnum.cs

@@ -0,0 +1,13 @@
+namespace ObjectFiller.Test.TestPoco
+{
+    using System;
+
+    [Flags]
+    public enum TestEnum
+    {
+        ValueOne,
+        ValueTwo,
+        ValueThree,
+        ValueFour
+    }
+}

ObjectFiller/Filler.cs

@@ -635,13 +635,30 @@ private IDictionary GetFilledDictionary(
             Type keyType = propertyType.GetGenericArguments()[0];
             Type valueType = propertyType.GetGenericArguments()[1];
 
-            int maxDictionaryItems = Random.Next(
+            int maxDictionaryItems = 0;
+
+            if (keyType.IsEnum)
+            {
+                maxDictionaryItems = Enum.GetValues(keyType).Length;
+            }
+            else
+            {
+                maxDictionaryItems = Random.Next(
                 currentSetupItem.DictionaryKeyMinCount,
                 currentSetupItem.DictionaryKeyMaxCount);
+            }
 
             for (int i = 0; i < maxDictionaryItems; i++)
             {
-                object keyObject = this.CreateAndFillObject(keyType, currentSetupItem, typeTracker);
+                object keyObject = null;
+                if (keyType.IsEnum)
+                {
+                    keyObject = Enum.GetValues(keyType).GetValue(i);
+                }
+                else
+                {
+                    keyObject = this.CreateAndFillObject(keyType, currentSetupItem, typeTracker);
+                }
 
                 if (dictionary.Contains(keyObject))
                 {