Merge branch 'master' into FEATURE_Enumerator_Plugin

Author: gokTyBalD

ObjectFiller.Test/EnumTest.cs

@@ -0,0 +1,88 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Tynamix.ObjectFiller;
+
+namespace ObjectFiller.Test
+{
+	[TestClass]
+	public class EnumTest
+	{
+		[TestMethod]
+		public void Must_support_enums_out_of_the_box()
+		{
+			var filler = new Filler<MyClass>();
+			filler.Setup()
+				.OnProperty(x => x.Manual).Use(() => ManualSetupEnum.B)
+				.OnProperty(x => x.Ignored).IgnoreIt();
+
+			for (int n = 0; n < 1000; n++)
+			{
+				var c = filler.Create();
+
+				Assert.IsTrue(
+					c.Standard == StandardEnum.A || 
+					c.Standard == StandardEnum.B || 
+					c.Standard == StandardEnum.C);
+
+				Assert.IsTrue(
+					c.Numbered == NumberedEnum.A ||
+					c.Numbered == NumberedEnum.B ||
+					c.Numbered == NumberedEnum.C);
+
+				Assert.IsTrue(
+					c.Flags == FlagsEnum.A ||
+					c.Flags == FlagsEnum.B ||
+					c.Flags == FlagsEnum.C);
+
+				Assert.IsTrue((int)c.Nasty == 0);
+
+				Assert.IsTrue(c.Manual == ManualSetupEnum.B);
+
+				Assert.IsTrue((int)c.Ignored == 0);
+			}
+		}
+
+		public enum StandardEnum
+		{
+			A, B, C
+		}
+
+		public enum NumberedEnum
+		{
+			A=1,B=3,C=5
+		}
+
+		[Flags]
+		public enum FlagsEnum
+		{
+			A = 0x01,
+			B = 0x02,
+			C = A | B,
+		}
+
+		[Flags]
+		public enum NastyEmptyEnum
+		{
+		}
+
+		public enum ManualSetupEnum
+		{
+			A, B, C
+		}
+
+		public enum IgnoredEnum
+		{
+			A, B, C
+		}
+
+		public class MyClass
+		{
+			public StandardEnum Standard { get; set; }
+			public NumberedEnum Numbered { get; set; }
+			public FlagsEnum Flags { get; set; }
+			public NastyEmptyEnum Nasty { get; set; }
+			public ManualSetupEnum Manual { get; set; }
+			public IgnoredEnum Ignored { get; set; }
+		}
+	}
+}

ObjectFiller.Test/LibraryFillingTest.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using ObjectFiller.Test.TestPoco.Library;
 using Tynamix.ObjectFiller;
@@ -62,6 +64,22 @@ public void TestFillLibraryWithPocoOfABook()
             Assert.AreEqual(1, filledLib.Books.Count);
         }
 
+        [TestMethod]
+        public void TestFillLibraryWithConfiguredPocoOfABook()
+        {
+            Filler<LibraryConstructorPoco> lib = new Filler<LibraryConstructorPoco>();
+            lib.Setup()
+                .OnProperty(x => x.Books).IgnoreIt()
+                .SetupFor<Book>()
+                .OnProperty(x => x.Name).Use(() => "ABook");
+            
+
+            var l = lib.Create();
+
+            Assert.AreEqual("ABook", ((Book)l.Books.ToList()[0]).Name);
+
+        }
+
         [TestMethod]
         public void TestFillLibraryWithDictionary()
         {

ObjectFiller.Test/ObjectFiller.Test.csproj

@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AddressFillingTest.cs" />
+    <Compile Include="EnumTest.cs" />
     <Compile Include="LibraryFillingTest.cs" />
     <Compile Include="ListFillingTest.cs" />
     <Compile Include="LoremIpsumPluginTest.cs" />

ObjectFiller/Filler.cs

@@ -254,11 +254,33 @@ private object GetFilledObject(Type type, ObjectFillerSetup currentSetup)
                 return GetFilledPoco(type, currentSetup);
             }
 
+	        if (TypeIsEnum(type))
+	        {
+				return GetRandomEnumValue(type);
+			}
+
             object newValue = GetRandomValue(type, currentSetup);
             return newValue;
         }
 
-        private object GetFilledPoco(Type type, ObjectFillerSetup currentSetup)
+
+
+	    private object GetRandomEnumValue(Type type)
+	    {
+			// performance: Enum.GetValues() is slow due to reflection, should cache it
+			Array values = Enum.GetValues(type); 
+			if (values.Length > 0)
+			{
+				int index = Random.Next() % values.Length;
+				return values.GetValue(index);
+			}
+			else
+			{
+				return 0; 
+			}
+	    }
+
+	    private object GetFilledPoco(Type type, ObjectFillerSetup currentSetup)
         {
             object result = CreateInstanceOfType(type, currentSetup);
 
@@ -430,5 +452,10 @@ private static bool TypeIsList(Type type)
                       && (type.GetGenericTypeDefinition() == typeof(IEnumerable<>)
                         || type.GetInterfaces().Any(x => x == typeof(IEnumerable)));
         }
-    }
+
+		private static bool TypeIsEnum(Type type)
+		{
+			return type.IsEnum;
+		}
+	}
 }

ObjectFiller/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]