From 50133ffefdd309d9501a195de041a027f2847078 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 5 Feb 2013 21:07:38 -0800 Subject: [PATCH] remove various tests from encoder and parser --- src/jsx_encoder.erl | 211 +------------------------------------------- src/jsx_parser.erl | 172 ------------------------------------ 2 files changed, 2 insertions(+), 381 deletions(-) diff --git a/src/jsx_encoder.erl b/src/jsx_encoder.erl index 92a2281..fa722ae 100644 --- a/src/jsx_encoder.erl +++ b/src/jsx_encoder.erl @@ -23,7 +23,7 @@ -module(jsx_encoder). --export([encoder/3]). +-export([encoder/3, pre_encode/2]). -spec encoder(Handler::module(), State::any(), Opts::jsx:opts()) -> jsx:encoder(). @@ -120,7 +120,7 @@ list([], {Handler, State}, _Opts) -> Handler:handle_event(end_array, State); list(Term, Handler, Opts) -> ?error([Term, Handler, Opts]). -pre_encode(Value, #opts{pre_encode=false}) -> Value; +pre_encode(Value, #opts{pre_encode=false}) -> io:format("~p~n", [Value]), Value; pre_encode(Value, Opts) -> (Opts#opts.pre_encode)(Value). @@ -136,211 +136,4 @@ clean_string(Bin, Opts) -> jsx_utils:clean_string(Bin, Opts). -include_lib("eunit/include/eunit.hrl"). -encode(Term) -> encode(Term, []). - -encode(Term, Opts) -> - try (encoder(jsx, [], Opts))(Term) - catch _:_ -> {error, badarg} - end. - - -encode_test_() -> - [ - {"naked string", ?_assertEqual(encode(<<"a string\n">>), [{string, <<"a string\n">>}, end_json])}, - {"escaped naked string", ?_assertEqual(encode(<<"a string\n">>, [escaped_strings]), [{string, <<"a string\\n">>}, end_json])}, - {"naked integer", ?_assertEqual(encode(123), [{integer, 123}, end_json])}, - {"naked float", ?_assertEqual(encode(1.23), [{float, 1.23}, end_json])}, - {"naked literal", ?_assertEqual(encode(null), [{literal, null}, end_json])}, - {"empty object", ?_assertEqual(encode([{}]), [start_object, end_object, end_json])}, - {"empty list", ?_assertEqual(encode([]), [start_array, end_array, end_json])}, - {"simple list", ?_assertEqual( - encode([1,2,3,true,false]), - [ - start_array, - {integer, 1}, - {integer, 2}, - {integer, 3}, - {literal, true}, - {literal, false}, - end_array, - end_json - ] - ) - }, - {"simple object", ?_assertEqual( - encode([{<<"a">>, true}, {<<"b">>, false}]), - [ - start_object, - {key, <<"a">>}, - {literal, true}, - {key, <<"b">>}, - {literal, false}, - end_object, - end_json - ] - ) - }, - {"complex term", ?_assertEqual( - encode([ - {<<"a">>, true}, - {<<"b">>, false}, - {<<"c">>, [1,2,3]}, - {<<"d">>, [{<<"key">>, <<"value">>}]} - ]), - [ - start_object, - {key, <<"a">>}, - {literal, true}, - {key, <<"b">>}, - {literal, false}, - {key, <<"c">>}, - start_array, - {integer, 1}, - {integer, 2}, - {integer, 3}, - end_array, - {key, <<"d">>}, - start_object, - {key, <<"key">>}, - {string, <<"value">>}, - end_object, - end_object, - end_json - ] - ) - }, - {"atom keys", ?_assertEqual( - encode([{key, <<"value">>}]), - [start_object, {key, <<"key">>}, {string, <<"value">>}, end_object, end_json] - ) - } - ]. - - -pre_encoders_test_() -> - Term = [ - {<<"object">>, [ - {<<"literals">>, [true, false, null]}, - {<<"strings">>, [<<"foo">>, <<"bar">>, <<"baz">>]}, - {<<"numbers">>, [1, 1.0, 1.0e0]} - ]} - ], - [ - {"no pre encode", ?_assertEqual( - encode(Term, []), - [ - start_object, - {key, <<"object">>}, start_object, - {key, <<"literals">>}, start_array, - {literal, true}, {literal, false}, {literal, null}, - end_array, - {key, <<"strings">>}, start_array, - {string, <<"foo">>}, {string, <<"bar">>}, {string, <<"baz">>}, - end_array, - {key, <<"numbers">>}, start_array, - {integer, 1}, {float, 1.0}, {float, 1.0}, - end_array, - end_object, - end_object, - end_json - ] - )}, - {"replace lists with empty lists", ?_assertEqual( - encode(Term, [{pre_encode, fun(V) -> case V of [{_,_}|_] -> V; [{}] -> V; V when is_list(V) -> []; _ -> V end end}]), - [ - start_object, - {key, <<"object">>}, start_object, - {key, <<"literals">>}, start_array, end_array, - {key, <<"strings">>}, start_array, end_array, - {key, <<"numbers">>}, start_array, end_array, - end_object, - end_object, - end_json - ] - )}, - {"replace objects with empty objects", ?_assertEqual( - encode(Term, [{pre_encode, fun(V) -> case V of [{_,_}|_] -> [{}]; _ -> V end end}]), - [ - start_object, - end_object, - end_json - ] - )}, - {"replace all non-list and non_tuple values with false", ?_assertEqual( - encode(Term, [{pre_encode, fun(V) when is_list(V); is_tuple(V) -> V; (_) -> false end}]), - [ - start_object, - {key, <<"object">>}, start_object, - {key, <<"literals">>}, start_array, - {literal, false}, {literal, false}, {literal, false}, - end_array, - {key, <<"strings">>}, start_array, - {literal, false}, {literal, false}, {literal, false}, - end_array, - {key, <<"numbers">>}, start_array, - {literal, false}, {literal, false}, {literal, false}, - end_array, - end_object, - end_object, - end_json - ] - )}, - {"replace all atoms with atom_to_list", ?_assertEqual( - encode(Term, [{pre_encode, fun(V) when is_atom(V) -> unicode:characters_to_binary(atom_to_list(V)); (V) -> V end}]), - [ - start_object, - {key, <<"object">>}, start_object, - {key, <<"literals">>}, start_array, - {string, <<"true">>}, {string, <<"false">>}, {string, <<"null">>}, - end_array, - {key, <<"strings">>}, start_array, - {string, <<"foo">>}, {string, <<"bar">>}, {string, <<"baz">>}, - end_array, - {key, <<"numbers">>}, start_array, - {integer, 1}, {float, 1.0}, {float, 1.0}, - end_array, - end_object, - end_object, - end_json - ] - )}, - {"pre_encode tuple", ?_assertEqual( - encode({1, 2, 3}, [{pre_encode, fun(Tuple) when is_tuple(Tuple) -> tuple_to_list(Tuple); (V) -> V end}]), - [ - start_array, - {integer, 1}, {integer, 2}, {integer, 3}, - end_array, - end_json - ] - )}, - {"pre_encode 2-tuples", ?_assertEqual( - encode([{two, 1}, {three, 2}], [{pre_encode, fun({K, V}) -> {K, V + 1}; (V) -> V end}]), - [ - start_object, - {key, <<"two">>}, {integer, 2}, {key, <<"three">>}, {integer, 3}, - end_object, - end_json - ] - )}, - {"pre_encode one field record", ?_assertEqual( - encode([{foo, bar}], [{pre_encode, fun({foo, V}) -> {V, undefined}; (undefined) -> false; (V) -> V end}]), - [ - start_object, - {key, <<"bar">>}, {literal, false}, - end_object, - end_json - ] - )}, - {"pre_encode list", ?_assertEqual( - encode([1,2,3], [{pre_encode, fun(X) when is_integer(X) -> X + 1; (V) -> V end}]), - [ - start_array, - {integer, 2}, {integer, 3}, {integer, 4}, - end_array, - end_json - ] - )} - ]. - - -endif. \ No newline at end of file diff --git a/src/jsx_parser.erl b/src/jsx_parser.erl index e00bc2c..adf8126 100644 --- a/src/jsx_parser.erl +++ b/src/jsx_parser.erl @@ -169,176 +169,4 @@ clean_string(Bin, Opts) -> jsx_utils:clean_string(Bin, Opts). -include_lib("eunit/include/eunit.hrl"). -incomplete_test_() -> - F = parser(jsx, [], []), - [ - {"incomplete test", ?_assertEqual( - begin - {incomplete, A} = F(start_object), - {incomplete, B} = A(key), - {incomplete, C} = B(true), - {incomplete, D} = C(end_object), - D(end_json) - end, - [start_object, {key, <<"key">>}, {literal, true}, end_object, end_json] - )} - ]. - -encode(Term) -> encode(Term, []). - -encode(Term, Opts) -> - try (parser(jsx, [], Opts))(Term) - catch error:badarg -> {error, badarg} - end. - - -encode_test_() -> - [ - {"naked string", ?_assertEqual( - encode([{string, <<"a string\n">>}, end_json]), [{string, <<"a string\n">>}, end_json] - )}, - {"naked integer - simple rep", ?_assertEqual( - encode([123, end_json]), [{integer, 123}, end_json] - )}, - {"naked integer - alt rep", ?_assertEqual( - encode([{number, 123}, end_json]), [{integer, 123}, end_json] - )}, - {"naked integer - full rep", ?_assertEqual( - encode([{integer, 123}, end_json]), [{integer, 123}, end_json] - )}, - {"naked float - simple rep", ?_assertEqual( - encode([1.23, end_json]), [{float, 1.23}, end_json] - )}, - {"naked float - alt rep", ?_assertEqual( - encode([{number, 1.23}, end_json]), [{float, 1.23}, end_json] - )}, - {"naked float - full rep", ?_assertEqual( - encode([{float, 1.23}, end_json]), [{float, 1.23}, end_json] - )}, - {"naked literal - simple rep", ?_assertEqual( - encode([null, end_json]), [{literal, null}, end_json] - )}, - {"naked literal - full rep", ?_assertEqual( - encode([{literal, null}, end_json]), [{literal, null}, end_json] - )}, - {"empty object", ?_assertEqual( - encode([start_object, end_object, end_json]), [start_object, end_object, end_json] - )}, - {"empty list", ?_assertEqual( - encode([start_array, end_array, end_json]), [start_array, end_array, end_json] - )}, - {"simple list", ?_assertEqual( - encode([ - start_array, - {integer, 1}, - {integer, 2}, - {integer, 3}, - {literal, true}, - {literal, false}, - end_array, - end_json - ]), - [ - start_array, - {integer, 1}, - {integer, 2}, - {integer, 3}, - {literal, true}, - {literal, false}, - end_array, - end_json - ] - ) - }, - {"simple object", ?_assertEqual( - encode([ - start_object, - {key, <<"a">>}, - {literal, true}, - {key, <<"b">>}, - {literal, false}, - end_object, - end_json - ]), - [ - start_object, - {key, <<"a">>}, - {literal, true}, - {key, <<"b">>}, - {literal, false}, - end_object, - end_json - ] - ) - }, - {"complex term", ?_assertEqual( - encode([ - start_object, - {key, <<"a">>}, - {literal, true}, - {key, <<"b">>}, - {literal, false}, - {key, <<"c">>}, - start_array, - {integer, 1}, - {integer, 2}, - {integer, 3}, - end_array, - {key, <<"d">>}, - start_object, - {key, <<"key">>}, - {string, <<"value">>}, - end_object, - end_object, - end_json - ]), - [ - start_object, - {key, <<"a">>}, - {literal, true}, - {key, <<"b">>}, - {literal, false}, - {key, <<"c">>}, - start_array, - {integer, 1}, - {integer, 2}, - {integer, 3}, - end_array, - {key, <<"d">>}, - start_object, - {key, <<"key">>}, - {string, <<"value">>}, - end_object, - end_object, - end_json - ] - ) - }, - {"atom keys", ?_assertEqual( - encode([start_object, {key, key}, {string, <<"value">>}, end_object, end_json]), - [start_object, {key, <<"key">>}, {string, <<"value">>}, end_object, end_json] - )} - ]. - -encode_failures_test_() -> - [ - {"unwrapped values", ?_assertEqual( - {error, badarg}, - encode([{string, <<"a string\n">>}, {string, <<"a string\n">>}, end_json]) - )}, - {"unbalanced array", ?_assertEqual( - {error, badarg}, - encode([start_array, end_array, end_array, end_json]) - )}, - {"premature finish", ?_assertEqual( - {error, badarg}, - encode([start_object, {key, <<"key">>, start_array, end_json}]) - )}, - {"really premature finish", ?_assertEqual( - {error, badarg}, - encode([end_json]) - )} - ]. - - -endif. \ No newline at end of file