Handle AssumeUtc DateTime with 3f or 7f seconds

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -24,7 +24,6 @@ public static class DateTimeSerializer
         public const string CondensedDateTimeFormat = "yyyyMMdd";                             //8
         public const string ShortDateTimeFormat = "yyyy-MM-dd";                               //11
         public const string DefaultDateTimeFormat = "dd/MM/yyyy HH:mm:ss";                    //20
-        public const string DefaultDateTimeFormatWithFraction = "dd/MM/yyyy HH:mm:ss.fff";    //24
         public const string XsdDateTimeFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";               //29
         public const string XsdDateTimeFormat3F = "yyyy-MM-ddTHH:mm:ss.fffZ";                 //25
         public const string XsdDateTimeFormatSeconds = "yyyy-MM-ddTHH:mm:ssZ";                //21
@@ -92,15 +91,6 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                     return unspecifiedDate.Prepare();
                 }
 
-                if (dateTimeStr.Length == DefaultDateTimeFormatWithFraction.Length)
-                {
-                    var unspecifiedDate = JsConfig.AssumeUtc    
-                        ? DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal)
-                        : DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture);
-
-                    return unspecifiedDate.Prepare();
-                }
-
                 switch (JsConfig.DateHandler)
                 {
                     case DateHandler.UnixTime:
@@ -149,7 +139,8 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
 
                 try
                 {
-                    var dateTime = DateTime.Parse(dateTimeStr, null, DateTimeStyles.AssumeLocal);
+                    var assumeKind = JsConfig.AssumeUtc ? DateTimeStyles.AssumeUniversal : DateTimeStyles.AssumeLocal;
+                    var dateTime = DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture, assumeKind);
                     return dateTime.Prepare();
                 }
                 catch (FormatException)

tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs

@@ -707,5 +707,24 @@ public void Does_serialize_Dates_without_time_as_UTC_when_AssumeUtc()
             Assert.That(date.Kind, Is.EqualTo(DateTimeKind.Utc));
             Assert.That(date.ToString("yyyy-MM-dd"), Is.EqualTo("2000-01-01"));
         }
+
+        [Test]
+        public void Does_parse_unspecified_date_with_7sec_fraction_as_UTC()
+        {
+            JsConfig.AssumeUtc = true;
+            JsConfig.AlwaysUseUtc = true;
+
+            // var dateStr = "2014-08-27T14:30:23.123"; // Parsed OK
+            var dateStr = "2014-08-27T14:30:23.1230000";
+            var dateTime = dateStr.FromJson<DateTime>();
+
+            Assert.That(dateTime.Kind, Is.EqualTo(DateTimeKind.Utc));
+            Assert.That(dateTime.Hour, Is.EqualTo(14));
+            Assert.That(dateTime.Minute, Is.EqualTo(30));
+            Assert.That(dateTime.Second, Is.EqualTo(23));
+            Assert.That(dateTime.Millisecond, Is.EqualTo(123));
+
+            JsConfig.Reset();
+        }
     }
 }