Revert "Corrected Outputting of date string"

This reverts commit 2e465a4.
tpetricek · Nov 30, 2012 · 96b5eee · 96b5eee
1 parent 911a25e
commit 96b5eee
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 63 deletions.
diff --git a/src/FSharpx.Core/JSON.fs b/src/FSharpx.Core/JSON.fs
@@ -96,11 +96,8 @@ type Text(text:string) =
 type Date(date:DateTime) =
     let mutable v = date
 
-    let escape s = 
-        s|> replace "\"" "\\\""
-
     member this.Value with get() = v and set (value) = v <- value
-    override this.ToString() = sprintf "\"%s\"" (v.ToString("o"))
+    override this.ToString() = sprintf "\"%s\"" (v.ToString())
 
     override this.Equals other =
         match other with
@@ -109,7 +106,7 @@ type Date(date:DateTime) =
 
     interface IDocument
     interface Infrastucture with
-        member this.Serialize sb = sb.AppendFormat("\"{0}\"", (escape <| v.ToString("o")))
+        member this.Serialize sb = sb.Append(v.ToString(System.Globalization.CultureInfo.InvariantCulture))
         member this.ToXml() = v :> obj
 
 

diff --git a/tests/FSharpx.Tests/JSON.Serialization.Tests.fs b/tests/FSharpx.Tests/JSON.Serialization.Tests.fs
@@ -1,42 +1,34 @@
-module FSharpx.Tests.JSON.SerializationTests
-
-open NUnit.Framework
-open FSharpx.JSON
-open FSharpx.JSON.DocumentExtensions
-open FsUnit
-
-[<Test>]
-let ``Can serialize empty document``() = 
-    JObject.New().ToString()
-    |> should equal "{}"
-
-[<Test>] 
-let ``Can serialize document with single property``() =
-    JObject
-      .New()
-      .AddTextProperty("firstName","John")
-      .ToString()
-    |> should equal "{\"firstName\":\"John\"}"
-
-[<Test>] 
-let ``Can serialize document with booleans``() =
-    JObject
-      .New()
-      .AddBoolProperty("aa",true)
-      .AddBoolProperty("bb",false)
-      .ToString()
-    |> should equal "{\"aa\":true,\"bb\":false}"
-
-[<Test>]
-let ``Can serialize document with array, null and number``() =
-    let text = "{\"items\":[{\"id\":\"Open\"},null,{\"id\":25}]}"
-    let json = parse text
-    json.ToString() |> should equal text
-
-[<Test>]
-let ``Can serialise document with dates``() =
-    JObject
-        .New()
-        .AddDateProperty("dd", new System.DateTime(1997, 2, 15, 0, 0, 0, System.DateTimeKind.Utc))
-        .ToString()
-    |> should equal "{\"dd\":\"1997-02-15T00:00:00.0000000Z\"}"
+module FSharpx.Tests.JSON.SerializationTests
+
+open NUnit.Framework
+open FSharpx.JSON
+open FSharpx.JSON.DocumentExtensions
+open FsUnit
+
+[<Test>]
+let ``Can serialize empty document``() = 
+    JObject.New().ToString()
+    |> should equal "{}"
+
+[<Test>] 
+let ``Can serialize document with single property``() =
+    JObject
+      .New()
+      .AddTextProperty("firstName","John")
+      .ToString()
+    |> should equal "{\"firstName\":\"John\"}"
+
+[<Test>] 
+let ``Can serialize document with booleans``() =
+    JObject
+      .New()
+      .AddBoolProperty("aa",true)
+      .AddBoolProperty("bb",false)
+      .ToString()
+    |> should equal "{\"aa\":true,\"bb\":false}"
+
+[<Test>]
+let ``Can serialize document with array, null and number``() =
+    let text = "{\"items\":[{\"id\":\"Open\"},null,{\"id\":25}]}"
+    let json = parse text
+    json.ToString() |> should equal text
diff --git a/tests/FSharpx.TypeProviders.Documents.Tests/JSON.Dates.Tests.fs b/tests/FSharpx.TypeProviders.Documents.Tests/JSON.Dates.Tests.fs
@@ -27,19 +27,3 @@ let ``Can parse UTC dates``() =
 let ``Can parse ISO 8601 dates in the correct culture``() =
     let dates = new DateJSON()
     dates.Root.NoTimeZone |> should equal (new DateTime(1997, 7, 16, 19, 20, 30, 00, System.DateTimeKind.Local)) 
-
-type singleDate = StructuredJSON<Schema="""{ "anniversary" : "1990-01-01" }""">
-
-[<Test>]
-let ``Set a Date``() =
-    let dates = new singleDate()
-    dates.Root.Anniversary <- new DateTime(2012, 1, 29, 12, 30, 00, DateTimeKind.Utc)
-    dates.ToString() |>  should equal """{"anniversary":"2012-01-29T12:30:00.0000000Z"}"""
-
-[<Test>]
-let ``Round Trip a Date``() =
-    let dates = new singleDate()
-    dates.Root.Anniversary <- new DateTime(2012, 1, 29, 12, 30, 00, DateTimeKind.Utc)
-    dates.ToString() |>  should equal """{"anniversary":"2012-01-29T12:30:00.0000000Z"}"""
-    let dates2 = singleDate(documentContent=(dates.ToString()))
-    dates2.Root.Anniversary |> should equal (new DateTime(2012, 1, 29, 12, 30, 00, DateTimeKind.Utc))