removed extra clause from jsx_test.escript, slight modifications so it works with prove
This commit is contained in:
parent
a9ecb733e3
commit
2834404054
1 changed files with 5 additions and 14 deletions
|
@ -24,29 +24,22 @@
|
||||||
|
|
||||||
-mode(compile).
|
-mode(compile).
|
||||||
|
|
||||||
|
main([]) ->
|
||||||
|
test("./test/cases");
|
||||||
|
|
||||||
main([Path]) ->
|
main([Path]) ->
|
||||||
test(Path).
|
test(Path).
|
||||||
|
|
||||||
|
|
||||||
test(Dir) ->
|
test(Dir) ->
|
||||||
code:add_path("ebin"),
|
code:add_path("ebin"),
|
||||||
code:load_file(jsx),
|
|
||||||
code:load_file(jsx_utf8),
|
|
||||||
code:load_file(jsx_utf16),
|
|
||||||
code:load_file(jsx_utf16le),
|
|
||||||
code:load_file(jsx_utf32),
|
|
||||||
code:load_file(jsx_utf32le),
|
|
||||||
|
|
||||||
ValidJSONTests = load_tests(Dir),
|
ValidJSONTests = load_tests(Dir),
|
||||||
|
|
||||||
etap:plan(length(ValidJSONTests) * 5),
|
etap:plan((length(ValidJSONTests) * 10) + 1),
|
||||||
Before = erlang:now(),
|
|
||||||
run_tests(ValidJSONTests),
|
run_tests(ValidJSONTests),
|
||||||
etap:is(multi_decode(multi_json_body(), []), multi_test_result(), "multi terms"),
|
etap:is(multi_decode(multi_json_body(), []), multi_test_result(), "multi terms"),
|
||||||
After = erlang:now(),
|
etap:end_tests().
|
||||||
etap:end_tests(),
|
|
||||||
|
|
||||||
io:format("Elapsed Time: ~p~n", [timer:now_diff(After, Before)]).
|
|
||||||
|
|
||||||
|
|
||||||
load_tests(Dir) ->
|
load_tests(Dir) ->
|
||||||
|
@ -109,8 +102,6 @@ incremental_decode_loop({incomplete, _Next, Force}, <<>>, Acc) ->
|
||||||
end;
|
end;
|
||||||
incremental_decode_loop({event, end_json, Next}, Rest, Acc) ->
|
incremental_decode_loop({event, end_json, Next}, Rest, Acc) ->
|
||||||
incremental_decode_loop(Next(), Rest, lists:reverse(Acc));
|
incremental_decode_loop(Next(), Rest, lists:reverse(Acc));
|
||||||
incremental_decode_loop({event, end_json, _Next}, <<>>, Acc) ->
|
|
||||||
lists:reverse(Acc);
|
|
||||||
incremental_decode_loop({event, Event, Next}, Rest, Acc) ->
|
incremental_decode_loop({event, Event, Next}, Rest, Acc) ->
|
||||||
incremental_decode_loop(Next(), Rest, [Event] ++ Acc).
|
incremental_decode_loop(Next(), Rest, [Event] ++ Acc).
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue