Sepcify DateTime Kind and add more tests verifying deserialization of LocalTime

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -80,8 +80,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                 || dateTimeStr.Length == DefaultDateTimeFormatWithFraction.Length)
             {
                 var unspecifiedDate = DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture);
-                if (JsConfig.AssumeUtc)
-                    unspecifiedDate = DateTime.SpecifyKind(unspecifiedDate, DateTimeKind.Utc);
+                unspecifiedDate = DateTime.SpecifyKind(unspecifiedDate, DateTimeKind.Utc);
 
                 return unspecifiedDate.Prepare();
             }
@@ -118,7 +117,8 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
 
             try
             {
-                return DateTime.Parse(dateTimeStr, null, DateTimeStyles.AssumeLocal).Prepare();
+                var dateTime = DateTime.Parse(dateTimeStr, null, DateTimeStyles.AssumeLocal);
+                return dateTime.Prepare();
             }
             catch (FormatException)
             {
@@ -446,7 +446,7 @@ public static DateTime ParseWcfJsonDate(string wcfJsonDate)
 
             var offset = timeZone.FromTimeOffsetString();
             var date = unixTime.FromUnixTimeMs(offset);
-            return new DateTimeOffset(date, offset).DateTime;
+            return date;
         }
 
         public static TimeZoneInfo GetLocalTimeZoneInfo()
@@ -478,7 +478,7 @@ public static void WriteWcfJsonDate(TextWriter writer, DateTime dateTime)
 
             if (JsConfig.DateHandler == DateHandler.RFC1123)
             {
-                writer.Write(dateTime.ToString("R", CultureInfo.InvariantCulture));
+                writer.Write(dateTime.ToUniversalTime().ToString("R", CultureInfo.InvariantCulture));
                 return;
             }
 

src/ServiceStack.Text/DateTimeExtensions.cs

@@ -88,12 +88,12 @@ public static DateTime FromUnixTimeMs(this long msSince1970)
 
         public static DateTime FromUnixTimeMs(this long msSince1970, TimeSpan offset)
         {
-            return UnixEpochDateTimeUnspecified + TimeSpan.FromMilliseconds(msSince1970) + offset;
+            return DateTime.SpecifyKind(UnixEpochDateTimeUnspecified + TimeSpan.FromMilliseconds(msSince1970) + offset, DateTimeKind.Local);
         }
 
         public static DateTime FromUnixTimeMs(this double msSince1970, TimeSpan offset)
         {
-            return UnixEpochDateTimeUnspecified + TimeSpan.FromMilliseconds(msSince1970) + offset;
+            return DateTime.SpecifyKind(UnixEpochDateTimeUnspecified + TimeSpan.FromMilliseconds(msSince1970) + offset, DateTimeKind.Local);
         }
 
         public static DateTime FromUnixTimeMs(string msSince1970)

tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs

@@ -384,6 +384,15 @@ public void Can_serialize_nullable_DateTime()
 
             JsConfig.Reset();
         }
+
+        [Test]
+        public void Can_deserialize_LocalTime_using_ISO8601()
+        {
+            var date = DateTime.Now;
+            var dateStr = date.ToJson();
+            var fromDate = dateStr.FromJson<DateTime>();
+            Assert.AreEqual(date.ToLocalTime().RoundToSecond(), fromDate.ToLocalTime().RoundToSecond());
+        }
     }
 
     [TestFixture]
@@ -436,6 +445,15 @@ public void DateTime_Is_Serialized_As_Utc_and_Deserialized_as_local()
                 Assert.AreEqual(DateTimeKind.Utc, TypeSerializer.DeserializeFromString<TestObject>(TypeSerializer.SerializeToString<TestObject>(testObject)).Date.Kind);
             }
         }
+
+        [Test]
+        public void Can_deserialize_LocalTime_using_RFC1123()
+        {
+            var date = DateTime.Now;
+            var dateStr = date.ToJson();
+            var fromDate = dateStr.FromJson<DateTime>();
+            Assert.AreEqual(date.ToLocalTime().RoundToSecond(), fromDate.ToLocalTime().RoundToSecond());
+        }
     }
 
     [TestFixture]
@@ -483,6 +501,15 @@ public void Can_serialize_UnixEpoch_DateTimes(int whichDate)
             var nearestSec = TimeSpan.FromSeconds(1);
             Assert.That(fromJson.Date.RoundToSecond(), Is.EqualTo(dateTime.RoundToSecond()));
         }
+
+        [Test]
+        public void Can_deserialize_LocalTime_using_UnixTime()
+        {
+            var date = DateTime.Now;
+            var dateStr = date.ToJson();
+            var fromDate = dateStr.FromJson<DateTime>();
+            Assert.AreEqual(date.ToLocalTime().RoundToSecond(), fromDate.ToLocalTime().RoundToSecond());
+        }
     }
 
     [TestFixture]
@@ -531,4 +558,17 @@ public void Can_serialize_UnixEpochMs_DateTimes(int whichDate)
             Assert.That(fromJson.Date.RoundToMs(), Is.EqualTo(dateTime.RoundToMs()));
         }
     }
+
+    public class DefaultDateTimeests
+    {
+        [Test]
+        public void Can_deserialize_LocalTime_using_default_DateHandler()
+        {
+            var date = DateTime.Now;
+            var dateStr = date.ToJson();
+            var fromDate = dateStr.FromJson<DateTime>();
+            Assert.AreEqual(date.ToLocalTime().RoundToSecond(), fromDate.ToLocalTime().RoundToSecond());
+        }        
+    }
+
 }