suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unbreak json tests.

Browse Source 
(cherry picked from commit 9b29dcb9a7)
This commit is contained in:
Sam Tobin-Hochstadt 2013-06-14 16:36:27 -04:00 committed by Ryan Culpepper
parent 7ec1625464
commit ac2c4401f3
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/json/main.rkt
View File

@ -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))

32
collects/json/tests/json.rkt
View File

@ -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)