Merge pull request #49 from Tynamix/BUGFIX_DateRange

DateTime Range fix, random generator for long implemented

Author: Tynamix

ObjectFiller.Test/DateTimeRangeTest.cs

@@ -0,0 +1,59 @@
+namespace ObjectFiller.Test
+{
+    using System;
+    using System.Linq;
+
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    using Tynamix.ObjectFiller;
+
+    public class DateRangeTestClass
+    {
+        public DateTime Date { get; set; }
+    }
+
+    [TestClass]
+    public class DateTimeRangeTest
+    {
+        [TestMethod]
+        public void WhenGettingDatesBetweenNowAnd31DaysAgo()
+        {
+            Filler<DateRangeTestClass> filler = new Filler<DateRangeTestClass>();
+
+            filler.Setup().OnType<DateTime>().Use(
+                new DateTimeRange(DateTime.Now.AddDays(-31)));
+
+            var d = filler.Create(1000);
+
+            Assert.IsTrue(d.All(x => x.Date < DateTime.Now && x.Date > DateTime.Now.AddDays(-31)));
+        }
+
+        [TestMethod]
+        public void WhenStartDateIsBiggerThenEndDateTheDatesShouldBeSwitched()
+        {
+            Filler<DateRangeTestClass> filler = new Filler<DateRangeTestClass>();
+
+            filler.Setup().OnType<DateTime>().Use(
+                new DateTimeRange(DateTime.Now, DateTime.Now.AddDays(-31)));
+
+            var d = filler.Create(1000);
+
+            Assert.IsTrue(d.All(x => x.Date < DateTime.Now && x.Date > DateTime.Now.AddDays(-31)));
+        }
+
+        [TestMethod]
+        public void WhenStartDateAndEndDateIsSetItShouldFindOnlyDatesInBetweenThisTwoDates()
+        {
+            var startDate = new DateTime(2000, 11, 10);
+            var endDate = new DateTime(2006, 1, 30);
+
+            Filler<DateRangeTestClass> filler = new Filler<DateRangeTestClass>();
+
+            filler.Setup().OnType<DateTime>().Use(new DateTimeRange(startDate, endDate));
+
+            var d = filler.Create(1000);
+            d.ToList().ForEach(x => Console.WriteLine(x.Date));
+            Assert.IsTrue(d.All(x => x.Date < endDate && x.Date > startDate));
+        }
+    }
+}

ObjectFiller.Test/ObjectFiller.Test.csproj

@@ -49,6 +49,7 @@
     <Compile Include="CountryNamesPlugin.cs" />
     <Compile Include="CityNamesPluginTest.cs" />
     <Compile Include="CreateInstanceTest.cs" />
+    <Compile Include="DateTimeRangeTest.cs" />
     <Compile Include="DefaultDatatypeMappingsTest.cs" />
     <Compile Include="EnumTest.cs" />
     <Compile Include="StreetNamesPluginTest.cs" />

ObjectFiller/Plugins/DateTime/DateTimeRange.cs

@@ -14,20 +14,23 @@ public DateTimeRange(DateTime earliestDate)
 
         public DateTimeRange(DateTime earliestDate, DateTime latestDate)
         {
+            if (earliestDate > latestDate)
+            {
+                var latestD = latestDate;
+                latestDate = earliestDate;
+                earliestDate = latestD;
+            }
             _earliestDate = earliestDate;
             _latestDate = latestDate;
         }
 
         public DateTime GetValue()
         {
-            int seconds = Random.Next(0, 60);
-            int minute = Random.Next(0, 60);
-            int hour = Random.Next(0, 24);
-            int month = Random.Next(_earliestDate.Month, _latestDate.Month + 1);
-            int day = Random.Next(_earliestDate.Day, month == 2 && _latestDate.Day > 28 ? 29 : _latestDate.Day);
-            int year = Random.Next(_earliestDate.Year, _latestDate.Year + 1);
+            var timeSpan = _latestDate.Subtract(_earliestDate);
 
-            return new DateTime(year, month, day, hour, minute, seconds);
+            var diff = Random.NextLong(0, timeSpan.Ticks);
+
+             return _latestDate.AddTicks(diff * -1);
         }
 
         DateTime? IRandomizerPlugin<DateTime?>.GetValue()

ObjectFiller/Random.cs

@@ -10,6 +10,8 @@
 
 namespace Tynamix.ObjectFiller
 {
+    using System;
+
     /// <summary>
     /// Class wraps the <see cref="System.Random"/> class. 
     /// This is to have a static instance of the random class
@@ -92,5 +94,30 @@ internal static void NextByte(byte[] buffer)
         {
             Rnd.NextBytes(buffer);
         }
+
+        /// <summary>
+        /// Gets a random value between to source long values
+        /// </summary>
+        /// <param name="min">Min long value</param>
+        /// <param name="max">Max long value</param>
+        /// <returns>A Long between <see cref="min"/> and <see cref="max"/></returns>
+        internal static long NextLong(long min, long max)
+        {
+            long longRand = NextLong();
+            return (Math.Abs(longRand % (max - min)) + min);
+        }
+
+        /// <summary>
+        /// Gets a random value between to source long values
+        /// </summary>
+        /// <param name="min">Min long value</param>
+        /// <param name="max">Max long value</param>
+        /// <returns>A Long between <see cref="min"/> and <see cref="max"/></returns>
+        internal static long NextLong()
+        {
+            byte[] buf = new byte[8];
+            Rnd.NextBytes(buf);
+            return BitConverter.ToInt64(buf, 0);
+        }
     }
 }

ObjectFiller/Setup/FillerSetupItem.cs

@@ -120,8 +120,8 @@ private void SetDefaultRandomizer()
             this.TypeToRandomFunc[typeof(short?)] = () => (short)Random.Next(-32767, 32767);
             this.TypeToRandomFunc[typeof(int)] = () => Random.Next();
             this.TypeToRandomFunc[typeof(int?)] = () => Random.Next();
-            this.TypeToRandomFunc[typeof(long)] = () => (long)Random.Next();
-            this.TypeToRandomFunc[typeof(long?)] = () => (long)Random.Next();
+            this.TypeToRandomFunc[typeof(long)] = () => Random.NextLong();
+            this.TypeToRandomFunc[typeof(long?)] = () => Random.NextLong();
             this.TypeToRandomFunc[typeof(float)] = () => (float)doublePlugin.GetValue();
             this.TypeToRandomFunc[typeof(float?)] = () => (float?)doublePlugin.GetValue();
             this.TypeToRandomFunc[typeof(double)] = () => doublePlugin.GetValue();