Merge pull request #35 from Tynamix/bugfix_missing_default_mappings

added missing mappings for primitive types (unit, decimal?, ...)

Author: Tynamix

ObjectFiller.Test/DefaultDatatypeMappingsTest.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Tynamix.ObjectFiller;
+
+namespace ObjectFiller.Test
+{
+	[TestClass]
+	public class DefaultDatatypeMappingsTest
+	{
+		[TestMethod]
+		public void Ensure_that_each_primitive_datatype_is_mapped_by_default()
+		{
+			var filler = new Filler<MyClass>();
+			var myClasses = filler.Create(100).ToArray();
+			foreach (var myClass in myClasses)
+			{
+				Assert.AreNotEqual(default(Guid), myClass._Guid);
+				Assert.AreNotEqual(default(decimal), myClass._Decimal);
+			}
+		}
+
+		public class MyClass
+		{
+			public byte _byte { get; set; }
+			public char _char { get; set; }
+			public Int16 _i16 { get; set; }
+			public Int32 _i32 { get; set; }
+			public Int64 _i64 { get; set; }
+			public UInt16 _u16 { get; set; }
+			public UInt32 _u32 { get; set; }
+			public UInt64 _u64 { get; set; }
+			public float _float { get; set; }
+			public double _double { get; set; }
+			public decimal _Decimal { get; set; }
+			public IntPtr _IntPtr { get; set; }
+			public DateTime _DateTime { get; set; }
+			public TimeSpan _TimeSpan { get; set; }
+			public Guid _Guid { get; set; }
+			public string _String { get; set; }
+
+			public byte? _n_byte { get; set; }
+			public char? _n_char { get; set; }
+			public Int16? _n_i16 { get; set; }
+			public Int32? _n_i32 { get; set; }
+			public Int64? _n_i64 { get; set; }
+			public UInt16? _n_u16 { get; set; }
+			public UInt32? _n_u32 { get; set; }
+			public UInt64? _n_u64 { get; set; }
+			public float? _n_float { get; set; }
+			public double? _n_double { get; set; }
+			public decimal? _n_Decimal { get; set; }
+			public IntPtr? _n_IntPtr { get; set; }
+			public DateTime? _n_DateTime { get; set; }
+			public TimeSpan? _n_TimeSpan { get; set; }
+			public Guid? _n_Guid { get; set; }
+		}
+	}
+}

ObjectFiller.Test/ObjectFiller.Test.csproj

@@ -47,6 +47,7 @@
   <ItemGroup>
     <Compile Include="AddressFillingTest.cs" />
     <Compile Include="CreateInstanceTest.cs" />
+    <Compile Include="DefaultDatatypeMappingsTest.cs" />
     <Compile Include="EnumTest.cs" />
     <Compile Include="HashStackTests.cs" />
     <Compile Include="LibraryFillingTest.cs" />

ObjectFiller/Setup/FillerSetupItem.cs

@@ -31,18 +31,35 @@ private void SetDefaultRandomizer()
             TypeToRandomFunc[typeof(string)] = mnemonic.GetValue;
             TypeToRandomFunc[typeof(bool)] = () => Random.Next(0, 2) == 1;
             TypeToRandomFunc[typeof(short)] = () => (short)Random.Next(-32767, 32767);
+            TypeToRandomFunc[typeof(short?)] = () => (short)Random.Next(-32767, 32767);
             TypeToRandomFunc[typeof(int)] = () => Random.Next();
             TypeToRandomFunc[typeof(int?)] = () => Random.Next();
-            TypeToRandomFunc[typeof(long)] = () => Random.Next();
-            TypeToRandomFunc[typeof(long?)] = () => Random.Next();
+            TypeToRandomFunc[typeof(long)] = () => (long)Random.Next();
+            TypeToRandomFunc[typeof(long?)] = () => (long)Random.Next();
+            TypeToRandomFunc[typeof(float)] = () => (float)doublePlugin.GetValue();
+            TypeToRandomFunc[typeof(float?)] = () => (float?)doublePlugin.GetValue();
             TypeToRandomFunc[typeof(double)] = () => doublePlugin.GetValue();
             TypeToRandomFunc[typeof(double?)] = () => doublePlugin.GetValue();
-            TypeToRandomFunc[typeof(decimal)] = () => doublePlugin.GetValue();
+			TypeToRandomFunc[typeof(decimal)] = () => (decimal)Random.Next();
+			TypeToRandomFunc[typeof(decimal?)] = () => (decimal)Random.Next();
             TypeToRandomFunc[typeof(Guid)] = () => Guid.NewGuid();
             TypeToRandomFunc[typeof(Guid?)] = () => Guid.NewGuid();
             TypeToRandomFunc[typeof(System.DateTime)] = () => dateTimeRandomizer.GetValue();
             TypeToRandomFunc[typeof(System.DateTime?)] = () => dateTimeRandomizer.GetValue();
-
+			TypeToRandomFunc[typeof(byte)] = () => (byte)Random.Next();
+			TypeToRandomFunc[typeof(byte?)] = () => (byte?)Random.Next();
+			TypeToRandomFunc[typeof(char)] = () => (char)Random.Next();
+			TypeToRandomFunc[typeof(char?)] = () => (char)Random.Next();
+			TypeToRandomFunc[typeof(ushort)] = () => (ushort)Random.Next();
+			TypeToRandomFunc[typeof(ushort?)] = () => (ushort)Random.Next();
+			TypeToRandomFunc[typeof(uint)] = () => (uint)Random.Next();
+			TypeToRandomFunc[typeof(uint?)] = () => (uint)Random.Next();
+			TypeToRandomFunc[typeof(ulong)] = () => (ulong)Random.Next();
+			TypeToRandomFunc[typeof(ulong?)] = () => (ulong)Random.Next();
+			TypeToRandomFunc[typeof(IntPtr)] = () => default(IntPtr);
+			TypeToRandomFunc[typeof(IntPtr?)] = () => default(IntPtr);
+			TypeToRandomFunc[typeof(TimeSpan)] = () => new TimeSpan(Random.Next());
+			TypeToRandomFunc[typeof(TimeSpan?)] = () => new TimeSpan(Random.Next());
         }
 
         /// <summary>