Unbreak json tests.

frenchy64 · Jun 14, 2013 · 9b29dcb · 9b29dcb
1 parent 95aed53
commit 9b29dcb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/collects/json/main.rkt b/collects/json/main.rkt
@@ -193,7 +193,7 @@
 (provide string->jsexpr bytes->jsexpr)
 (define (string->jsexpr str #:null [jsnull (json-null)])
   (unless (string? str) (raise-type-error 'string->jsexpr "string" str))
-  (read-json (open-input-string str) #:null jsnull #:function string->jsexpr))
+  (read-json (open-input-string str) #:null jsnull #:function 'string->jsexpr))
 (define (bytes->jsexpr str #:null [jsnull (json-null)])
   (unless (bytes? str) (raise-type-error 'bytes->jsexpr "bytes" str))
-  (read-json (open-input-bytes str) #:null jsnull #:function bytes->jsexpr))
+  (read-json (open-input-bytes str) #:null jsnull #:function 'bytes->jsexpr))
diff --git a/collects/json/tests/json.rkt b/collects/json/tests/json.rkt
@@ -104,8 +104,8 @@
                                   @T{ 1 [2,3] "four" }))])
           je)
         => '(1 (2 3) "four")
-        (string->jsexpr "]") =error> "read-json:"
-        (string->jsexpr "foo") =error> "read-json:"
+        (string->jsexpr "]") =error> "string->jsexpr:"
+        (string->jsexpr "foo") =error> "string->jsexpr:"
         (string->jsexpr "") => eof
         (string->jsexpr " \t\r\n") => eof
 
@@ -117,20 +117,20 @@
         (string->jsexpr @T{ "/" }) => "/"
         (string->jsexpr @T{ "\/" }) => "/"
         ;; More error tests:
-        (string->jsexpr @T{ [1,2,,3] }) =error> "read-json:"
-        (string->jsexpr @T{ [1,2,3,] }) =error> "read-json:"
-        (string->jsexpr @T{ {42 : "bad-key!"} }) =error> "read-json:"
-        (string->jsexpr @T{ {'no-colon' , ""} }) =error> "read-json:"
-        (string->jsexpr @T{ {"x":1,,"y":2} }) =error> "read-json:"
-        (string->jsexpr @T{ {x:1, y:2} }) =error> "read-json:"
-        (string->jsexpr " {x:1, y:2] ") =error> "read-json:"
-        (string->jsexpr " [\"x\",1, \"y\",2} ") =error> "read-json:"
-        (string->jsexpr @T{ truelove }) =error> "read-json:"
-        (string->jsexpr @T{ truebred }) =error> "read-json:"
-        (string->jsexpr @T{ falsehood }) =error> "read-json:"
-        (string->jsexpr @T{ falsetto }) =error> "read-json:"
-        (string->jsexpr @T{ nullity }) =error> "read-json:"
-        (string->jsexpr @T{ nulliparous }) =error> "read-json:"
+        (string->jsexpr @T{ [1,2,,3] }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ [1,2,3,] }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ {42 : "bad-key!"} }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ {'no-colon' , ""} }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ {"x":1,,"y":2} }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ {x:1, y:2} }) =error> "string->jsexpr:"
+        (string->jsexpr " {x:1, y:2] ") =error> "string->jsexpr:"
+        (string->jsexpr " [\"x\",1, \"y\",2} ") =error> "string->jsexpr:"
+        (string->jsexpr @T{ truelove }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ truebred }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ falsehood }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ falsetto }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ nullity }) =error> "string->jsexpr:"
+        (string->jsexpr @T{ nulliparous }) =error> "string->jsexpr:"
         ))
 
 (test do (pred-tests)