umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

discovered and fixed a couple more broken tests

Browse source
This commit is contained in:
alisdair sullivan 2011-08-03 00:15:18 -07:00
parent 12eb6c6c08
commit 5cd967b26d
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jsx.erl
View file

@ -199,7 +199,7 @@ load_tests([Test|Rest], Dir, Acc) ->
ParsedTest = parse_tests(TestSpec, Dir), ParsedTest = parse_tests(TestSpec, Dir),
load_tests(Rest, Dir, [ParsedTest] ++ Acc) load_tests(Rest, Dir, [ParsedTest] ++ Acc)
; {error, _Reason} -> ; {error, _Reason} ->
load_tests(Rest, Dir, Acc) erlang:error(Test)
end. end.

2
src/jsx_decoder.hrl
View file

@ -630,7 +630,7 @@ low_surrogate(<<D/?utfx, Rest/binary>>, Stack, Opts, String, [C, B, A], H)
string(Rest, string(Rest,
Stack, Stack,
Opts, Opts,
<<String/binary, 16#fffd/utf8, 16#fffd/utf8>> [16#fffd, 16#fffd] ++ String
) )
; false -> ; false ->
{error, {badjson, <<D/?utfx, Rest/binary>>}} {error, {badjson, <<D/?utfx, Rest/binary>>}}

2
test/cases/encoded_surrogates.test
View file

@ -1,3 +1,3 @@
{name, "encoded_surrogates"}. {name, "encoded_surrogates"}.
{jsx, [start_array,{string,66560]},end_array,end_json]}. {jsx, [start_array,{string,[66560]},end_array,end_json]}.
{json, "encoded_surrogates.json"}. {json, "encoded_surrogates.json"}.

2
test/cases/noncharacter_replaced.test
View file

@ -1,4 +1,4 @@
{name, "noncharacter replaced"}. {name, "noncharacter replaced"}.
{jsx, [{string,[16#fffd/utf8]},end_json]}. {jsx, [{string,[16#fffd]},end_json]}.
{json, "noncharacter_replaced.json"}. {json, "noncharacter_replaced.json"}.
{jsx_flags, [loose_unicode]}. {jsx_flags, [loose_unicode]}.

2
test/cases/unpaired_surrogate_replaced.test
View file

@ -1,4 +1,4 @@
{name, "unpaired surrogate replaced"}. {name, "unpaired surrogate replaced"}.
{jsx, [start_array,{string,16#fffd/utf8 ++ "blah"},end_array,end_json]}. {jsx, [start_array,{string,[65533,$b,$l,$a,$h]},end_array,end_json]}.
{json, "unpaired_surrogate_replaced.json"}. {json, "unpaired_surrogate_replaced.json"}.
{jsx_flags, [loose_unicode]}. {jsx_flags, [loose_unicode]}.