Fix for when one DateTimeKind is unspecified. https://github.com/Greg…

…Finzer/Compare-Net-Objects/issues/259
GregFinzer · Apr 7, 2022 · f2f32a3 · f2f32a3
1 parent 80bd7eb
commit f2f32a3
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/Compare-NET-Objects-Tests/CompareDateTimeTests.cs b/Compare-NET-Objects-Tests/CompareDateTimeTests.cs
@@ -64,14 +64,27 @@ public void CompareDateTimeAFewMillisecondsOffIgnore()
         [Test]
         public void TestUtcvsLocalDates()
         {
-            var dateTimeUtcNow = DateTime.UtcNow;
-            var dateTimeNow = dateTimeUtcNow.ToLocalTime();
+            DateTime dateTimeUtcNow = DateTime.UtcNow;
+            DateTime dateTimeNow = dateTimeUtcNow.ToLocalTime();
             CompareLogic compareLogic = new CompareLogic();
 
             ComparisonResult result = compareLogic.Compare(dateTimeNow, dateTimeUtcNow);
 
             Assert.IsTrue(result.AreEqual);
         }
+
+        [Test]
+        public void DateTimeKindUnspecifiedDifferent()
+        {
+            DateTime nowUtc = DateTime.UtcNow.Date;
+            DateTime nowUtcParsed;
+            DateTime.TryParse(nowUtc.ToString("yyyy-MM-dd"), out nowUtcParsed);
+
+            CompareLogic compareLogic = new CompareLogic();
+            var result = compareLogic.Compare(nowUtc, nowUtcParsed);
+            Console.WriteLine(result.DifferencesString);
+            Assert.IsTrue(result.AreEqual);
+        }
         #endregion
     }
 }
diff --git a/Compare-NET-Objects/ComparisonConfig.cs b/Compare-NET-Objects/ComparisonConfig.cs
@@ -544,21 +544,38 @@ public Action<Difference> DifferenceCallback
 #endif
         public decimal DecimalPrecision { get; set; }
 
+        /// <summary>
+        /// When comparing Fields and Properties the types have to be the same.  If IgnoreConcretTypes is true then they will be ignored.  The default is false.
+        /// </summary>
 #if !NETSTANDARD
         [DataMember]
 #endif
         public bool IgnoreConcreteTypes { get; set; }
 
+
         /// <summary>
         /// If true, properties that are defined in the actual object but missing in the expected object will not be flagged as differences. Default is true.
         /// </summary>
+#if !NETSTANDARD
+        [DataMember]
+#endif        
         public bool IgnoreMissingProperties { get; set; }
 
         /// <summary>
         /// If true, fields that are defined in the actual object but missing in the expected object will not be flagged as differences. Default is true.
         /// </summary>
+#if !NETSTANDARD
+        [DataMember]
+#endif
         public bool IgnoreMissingFields { get; set; }
 
+        /// <summary>
+        /// Specify a DateTimeKind to use when it is unspecified.  The default is DateTimeKind.Utc.  If null is specified it will not be defaulted.
+        /// </summary>
+#if !NETSTANDARD
+        [DataMember]
+#endif
+        public DateTimeKind? DateTimeKindToUseWhenUnspecified { get; set; }
         #endregion
 
         #region Methods
@@ -644,6 +661,7 @@ public void Reset()
             IgnoreStringLeadingTrailingWhitespace = false;
             IgnoreMissingProperties = true;
             IgnoreMissingFields = true;
+            DateTimeKindToUseWhenUnspecified = DateTimeKind.Utc; 
         }
 #endregion
     }

diff --git a/Compare-NET-Objects/TypeComparers/DateComparer.cs b/Compare-NET-Objects/TypeComparers/DateComparer.cs
@@ -41,6 +41,12 @@ public override void CompareType(CompareParms parms)
 
             if (date1.Kind != date2.Kind)
             {
+                if (date1.Kind == DateTimeKind.Unspecified && parms.Config.DateTimeKindToUseWhenUnspecified != null)
+                    date1 = DateTime.SpecifyKind(date1, parms.Config.DateTimeKindToUseWhenUnspecified.Value);
+
+                if (date2.Kind == DateTimeKind.Unspecified && parms.Config.DateTimeKindToUseWhenUnspecified != null)
+                    date2 = DateTime.SpecifyKind(date2, parms.Config.DateTimeKindToUseWhenUnspecified.Value);
+
                 date1 = date1.ToUniversalTime();
                 date2 = date2.ToUniversalTime();
             }