Fix #129

Author: rmla

Tynamix.ObjectFiller.Test/BugfixTests/Bug129WrongDateTimeGeneration.cs

@@ -15,17 +15,23 @@ public class TestEntity
         public void InvalidDateTimeValuesDueToDaylightSavingsTime()
         {
             Filler<TestEntity> filler = new Filler<TestEntity>();
+            var timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+            filler.Setup().OnType<DateTime>().Use(new DateTimeRange(new DateTime(2007, 3, 11, 1, 0, 0, DateTimeKind.Unspecified), new DateTime(2007, 3, 11, 4, 00, 0, DateTimeKind.Unspecified), timeZoneInfo));
 
-            filler.Setup().OnType<DateTime>().Use(new DateTimeRange(new DateTime(2007, 3, 11, 1, 0, 0, DateTimeKind.Unspecified), new DateTime(2007, 3, 11, 4, 00, 0, DateTimeKind.Unspecified)));
-            
             for (int i = 0; i < 1000; i++)
             {
                 var result = filler.Create();
-                Assert.IsFalse(TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time").IsInvalidTime(result.Date));
+                Assert.IsFalse(timeZoneInfo.IsInvalidTime(result.Date));
             }
 
+            filler = new Filler<TestEntity>();
+            filler.Setup().OnType<DateTime>().Use(new DateTimeRange(new DateTime(2022, 3, 27, 1, 0, 0, DateTimeKind.Unspecified), new DateTime(2022, 3, 27, 4, 00, 0, DateTimeKind.Unspecified)));
 
-
+            for (int i = 0; i < 1000; i++)
+            {
+                var result = filler.Create();
+                Assert.IsFalse(TimeZoneInfo.Local.IsInvalidTime(result.Date));
+            }
         }
     }
 }

Tynamix.ObjectFiller/Plugins/DateTime/DateTimeRange.cs

@@ -17,11 +17,27 @@ public class DateTimeRange : IRandomizerPlugin<DateTime>, IRandomizerPlugin<Date
         /// </summary>
         private readonly DateTime latestDate;
 
+        /// <summary>
+        /// The target timezone to generate only valid date times
+        /// </summary>
+        private readonly TimeZoneInfo timeZoneInfo;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DateTimeRange"/> class.
         /// </summary>
         public DateTimeRange()
-            : this(DateTime.MinValue)
+            : this(TimeZoneInfo.Local)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DateTimeRange"/> class.
+        /// </summary>
+        /// <param name="timeZoneInfo">
+        /// The target timezone to generate only valid date times
+        /// </param>
+        public DateTimeRange(TimeZoneInfo timeZoneInfo)
+            : this(DateTime.MinValue, timeZoneInfo)
         {
         }
 
@@ -32,10 +48,26 @@ public DateTimeRange()
         /// The earliest date.
         /// </param>
         public DateTimeRange(DateTime earliestDate)
-            : this(earliestDate, DateTime.Now)
+            : this(earliestDate, TimeZoneInfo.Local)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DateTimeRange"/> class.
+        /// </summary>
+        /// <param name="earliestDate">
+        /// The earliest date.
+        /// </param>
+        /// <param name="timeZoneInfo">
+        /// The target timezone to generate only valid date times
+        /// </param>
+        public DateTimeRange(DateTime earliestDate, TimeZoneInfo timeZoneInfo)
+            : this(earliestDate, DateTime.Now, timeZoneInfo)
         {
+
         }
 
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DateTimeRange"/> class.
         /// </summary>
@@ -46,7 +78,26 @@ public DateTimeRange(DateTime earliestDate)
         /// The latest date.
         /// </param>
         public DateTimeRange(DateTime earliestDate, DateTime latestDate)
+             : this(earliestDate, latestDate, TimeZoneInfo.Local)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DateTimeRange"/> class.
+        /// </summary>
+        /// <param name="earliestDate">
+        /// The earliest date.
+        /// </param>
+        /// <param name="latestDate">
+        /// The latest date.
+        /// </param>
+        /// <param name="timeZoneInfo">
+        /// The target timezone to generate only valid date times
+        /// </param>
+        public DateTimeRange(DateTime earliestDate, DateTime latestDate, TimeZoneInfo timeZoneInfo)
         {
+            this.timeZoneInfo = timeZoneInfo;
             if (earliestDate > latestDate)
             {
                 this.latestDate = earliestDate;
@@ -75,7 +126,9 @@ public DateTime GetValue()
             var diff = Random.NextLong(0, timeSpan.Ticks);
 
             var generatedDate = this.latestDate.AddTicks(diff * -1);
-            return TimeZoneInfo.Utc.IsInvalidTime(generatedDate) ? GetValue() : generatedDate;
+            return this.timeZoneInfo.IsInvalidTime(generatedDate) 
+                ? GetValue() 
+                : generatedDate;
         }
 
         /// <summary>