Fixed #48

Author: Tynamix

ObjectFiller.Test/EnumTest.cs

@@ -73,6 +73,18 @@ public void Must_support_class_with_enums_as_ctor_out_of_the_box()
             }
         }
 
+        [TestMethod]
+        public void FillNullableEnum()
+        {
+            var filler = new Filler<ClassWithNullableEnum>();
+
+            var c = filler.Create();
+            Assert.IsTrue(
+                c.NullableEnum == StandardEnum.A ||
+                c.NullableEnum == StandardEnum.B ||
+                c.NullableEnum == StandardEnum.C);
+        }
+
 
         public enum StandardEnum
         {
@@ -119,7 +131,7 @@ public class MyClass
 
         public class MyClassWithCstr
         {
-            public MyClassWithCstr(StandardEnum standard ,NumberedEnum numbered, FlagsEnum flags, ManualSetupEnum manual, IgnoredEnum ignored)
+            public MyClassWithCstr(StandardEnum standard, NumberedEnum numbered, FlagsEnum flags, ManualSetupEnum manual, IgnoredEnum ignored)
             {
                 this.Standard = standard;
                 this.Numbered = numbered;
@@ -135,5 +147,10 @@ public MyClassWithCstr(StandardEnum standard ,NumberedEnum numbered, FlagsEnum f
             public ManualSetupEnum Manual { get; set; }
             public IgnoredEnum Ignored { get; set; }
         }
+
+        public class ClassWithNullableEnum
+        {
+            public StandardEnum? NullableEnum { get; set; }
+        }
     }
 }

ObjectFiller/Filler.cs

@@ -300,7 +300,7 @@ private static bool TypeIsClrType(Type type)
         /// </returns>
         private static bool TypeIsValidForObjectFiller(Type type, FillerSetupItem currentSetupItem)
         {
-            var result= HasTypeARandomFunc(type, currentSetupItem)
+            var result = HasTypeARandomFunc(type, currentSetupItem)
                    || (TypeIsList(type) && ListParamTypeIsValid(type, currentSetupItem))
                    || (TypeIsDictionary(type) && DictionaryParamTypesAreValid(type, currentSetupItem))
                    || TypeIsPoco(type)
@@ -342,7 +342,7 @@ private bool CheckForCircularReference(
                     {
                         throw new InvalidOperationException(
                             string.Format(
-                                "The dictionaryType {0} was already encountered before, which probably means you have a circular reference in your model. Either ignore the properties which cause this or specify explicit creation rules for them which do not rely on types.",
+                                "The type {0} was already encountered before, which probably means you have a circular reference in your model. Either ignore the properties which cause this or specify explicit creation rules for them which do not rely on types.",
                                 targetType.Name));
                     }
 
@@ -413,7 +413,7 @@ private object CreateAndFillObject(
                 return this.CreateInstanceOfInterfaceOrAbstractClass(type, currentSetupItem, typeTracker);
             }
 
-            if (TypeIsEnum(type))
+            if (TypeIsEnum(type) || TypeIsNullableEnum(type))
             {
                 return this.GetRandomEnumValue(type);
             }
@@ -467,7 +467,7 @@ private object CreateInstanceOfInterfaceOrAbstractClass(
                 {
                     string message =
                         string.Format(
-                            "ObjectFiller Interface mocker missing and dictionaryType [{0}] not registered",
+                            "ObjectFiller Interface mocker missing and type [{0}] not registered",
                             interfaceType.Name);
                     throw new InvalidOperationException(message);
                 }
@@ -525,7 +525,7 @@ private object CreateInstanceOfType(Type type, FillerSetupItem currentSetupItem,
 
                     if (constructorArgs.Count == 0)
                     {
-                        var message = "Could not found a constructor for dictionaryType [" + type.Name
+                        var message = "Could not found a constructor for type [" + type.Name
                                       + "] where the parameters can be filled with the current objectfiller setup";
                         throw new InvalidOperationException(message);
                     }
@@ -779,7 +779,10 @@ private IEnumerable<PropertyInfo> GetPropertyFromProperties(
         private object GetRandomEnumValue(Type type)
         {
             // performance: Enum.GetValues() is slow due to reflection, should cache it
-            Array values = Enum.GetValues(type);
+
+            var enumType = type.IsEnum ? type : Nullable.GetUnderlyingType(type);
+
+            Array values = Enum.GetValues(enumType);
             if (values.Length > 0)
             {
                 int index = Random.Next() % values.Length;
@@ -816,7 +819,7 @@ private object GetRandomValue(Type propertyType, FillerSetupItem setupItem)
                 return GetDefaultValueOfType(propertyType);
             }
 
-            string message = "The dictionaryType [" + propertyType.Name + "] was not registered in the randomizer.";
+            string message = "The type [" + propertyType.Name + "] was not registered in the randomizer.";
             throw new TypeInitializationException(propertyType.FullName, new Exception(message));
         }
 
@@ -930,6 +933,17 @@ private static bool TypeIsEnum(Type type)
             return type.IsEnum;
         }
 
+        /// <summary>
+        /// Checks if the given <see cref="type"/> is a nullable enum
+        /// </summary>
+        /// <param name="type">Type to check</param>
+        /// <returns>True if the type is a nullable enum</returns>
+        private static bool TypeIsNullableEnum(Type type)
+        {
+            Type u = Nullable.GetUnderlyingType(type);
+            return (u != null) && u.IsEnum;
+        }
+
         #endregion
     }
 }