test for incorred deserialization of datetime without milliseconds using the TypeSerializer + fix

davybrion · davybrion · commit b2a6e03c5eb0 · 2013-04-09T15:48:25.000+02:00
diff --git a/src/ServiceStack.Text/Common/DateTimeSerializer.cs b/src/ServiceStack.Text/Common/DateTimeSerializer.cs
@@ -71,7 +71,8 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                                            DateTimeStyles.AdjustToUniversal);
 
             if (dateTimeStr.Length >= XsdDateTimeFormat3F.Length
-                && dateTimeStr.Length <= XsdDateTimeFormat.Length)
+                && dateTimeStr.Length <= XsdDateTimeFormat.Length
+                && dateTimeStr.EndsWith("Z"))
             {
 #if NETFX_CORE
                 var dateTimeType = JsConfig.DateHandler != JsonDateHandler.ISO8601
@@ -80,11 +81,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
 
                 return XmlConvert.ToDateTimeOffset(dateTimeStr, dateTimeType).DateTime.Prepare();
 #else
-                var dateTimeType = JsConfig.DateHandler != JsonDateHandler.ISO8601
-                    ? XmlDateTimeSerializationMode.Local
-                    : XmlDateTimeSerializationMode.RoundtripKind;
-
-                return XmlConvert.ToDateTime(dateTimeStr, dateTimeType).Prepare();
+                return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc).Prepare();
 #endif
             }
 
@@ -190,13 +187,24 @@ public static string ToShortestXsdDateTimeString(DateTime dateTime)
         {
             var timeOfDay = dateTime.TimeOfDay;
 
-            if (timeOfDay.Ticks == 0)
-                return dateTime.ToString(ShortDateTimeFormat);
+            string xsdDateTimeString;
 
-            if (timeOfDay.Milliseconds == 0)
-                return dateTime.ToStableUniversalTime().ToString(XsdDateTimeFormatSeconds);
+            if (timeOfDay.Ticks == 0)
+            {
+                xsdDateTimeString = dateTime.ToString(ShortDateTimeFormat);
+            }
+            else if (timeOfDay.Milliseconds == 0)
+            {
+                xsdDateTimeString = dateTime.Kind != DateTimeKind.Utc
+                                        ? dateTime.ToString("yyyy-MM-ddTHH:mm:sszzz")
+                                        : dateTime.ToString(XsdDateTimeFormatSeconds);
+            }
+            else
+            {
+                xsdDateTimeString = dateTime.Kind != DateTimeKind.Utc ? dateTime.ToString("yyyy-MM-ddTHH:mm:ss.fffffffzzz") : ToXsdDateTimeString(dateTime);
+            }
 
-            return ToXsdDateTimeString(dateTime);
+            return xsdDateTimeString;
         }
 
 
diff --git a/tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs b/tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs
@@ -111,6 +111,29 @@ public void TestSqlServerDateTime()
 			Assert.That(result, Is.Not.Null);
 		}
 
+        [Test]
+        public void DateTimeWithoutMilliseconds_should_always_be_deserialized_correctly_by_TypeSerializer()
+        {
+            var dateWithoutMillisecondsUtc = new DateTime(2013, 4, 9, 15, 20, 0, DateTimeKind.Utc);
+            var dateWithoutMillisecondsLocal = new DateTime(2013, 4, 9, 15, 20, 0, DateTimeKind.Local);
+            var dateWithoutMillisecondsUnspecified = new DateTime(2013, 4, 9, 15, 20, 0, DateTimeKind.Unspecified);
+
+            string serialized = null;
+            DateTime deserialized;
+
+            serialized = TypeSerializer.SerializeToString(dateWithoutMillisecondsUtc);
+            deserialized = TypeSerializer.DeserializeFromString<DateTime>(serialized);
+            Assert.AreEqual(dateWithoutMillisecondsUtc, deserialized);
+
+            serialized = TypeSerializer.SerializeToString(dateWithoutMillisecondsLocal);
+            deserialized = TypeSerializer.DeserializeFromString<DateTime>(serialized);
+            Assert.AreEqual(dateWithoutMillisecondsLocal, deserialized);
+
+            serialized = TypeSerializer.SerializeToString(dateWithoutMillisecondsUnspecified);
+            deserialized = TypeSerializer.DeserializeFromString<DateTime>(serialized);
+            Assert.AreEqual(dateWithoutMillisecondsUnspecified, deserialized);
+        }
+
 		[Test, Ignore("Don't pre-serialize into Utc")]
 		public void UtcDateTime_Is_Deserialized_As_Kind_Utc()
 		{
