rewrote test harness to use eunit and make it easier to add future tests

src/jsx.erl

@@ -1,17 +1,26 @@
 -module(jsx).
 
--export([decoder/0, decoder/1]).
+-export([decoder/0, decoder/2]).
 
 -include("jsx_common.hrl").
 
 decoder() ->
-    decoder([]).
+    decoder(none, []).
 
-decoder(OptsList) ->
-    OptsRec = parse_opts(OptsList),
-    case OptsRec#opts.encoding of
+decoder(Callbacks, OptsList) ->
+    Opts = parse_opts(OptsList),   
+    case Opts#opts.encoding of
         utf8 -> 
-            fun(Stream) -> jsx_utf8:start(Stream, [], [], OptsRec) end
+            fun(Stream) -> jsx_utf8:start(Stream, [], init_callbacks(Callbacks), Opts) end
+        ; utf16-big ->
+            fun(Stream) -> jsx_utf16b:start(Stream, [], init_callbacks(Callbacks), Opts) end
+        ; utf16-little ->
+            fun(Stream) -> jsx_utf16l:start(Stream, [], init_callbacks(Callbacks), Opts) end
+        ; utf32-big ->
+            fun(Stream) -> jsx_utf32b:start(Stream, [], init_callbacks(Callbacks), Opts) end
+        ; utf32-little ->
+            fun(Stream) -> jsx_utf32l:start(Stream, [], init_callbacks(Callbacks), Opts) end
+        ; 
     end.
 
     
@@ -30,5 +39,13 @@ parse_opts([{naked_values, Value}|Rest], Opts) ->
     true = lists:member(Value, [true, false]),
     parse_opts(Rest, Opts#opts{naked_values = Value});
 parse_opts([{encoding, Value}|Rest], Opts) ->
-    true = lists:member(Value, [utf8]),
-    parse_opts(Rest, Opts#opts{encoding = Value}).
+    true = lists:member(Value, [auto, utf8, utf16-big, utf16-little, utf32-big, utf32-little]),
+    parse_opts(Rest, Opts#opts{encoding = Value}).
+    
+init_callbacks(none) ->
+    {none, []};
+init_callbacks({M, S}) when is_atom(M) ->
+    {M, S};
+init_callbacks({F, S}) when is_function(F) ->
+    {F, S}.
+

src/jsx_utf8.erl

@@ -3,21 +3,15 @@
 -export([start/4]).
 
 -include("jsx_common.hrl").
-
-
-callback(eof, Callbacks) ->
-    lists:reverse(Callbacks);
-callback(Event, Callbacks) ->
-    [Event] ++ Callbacks.
     
 
 %% this code is mostly autogenerated and mostly ugly. apologies. for more insight on
-%%   Callbacks or Opts, see the comments accompanying callback/2 (in this file) and
-%%   parse_opts/1 (in jsx.erl). Stack is a stack of flags used to track depth and to
-%%   keep track of whether we are returning from a value or a key inside objects. all
-%%   pops, peeks and pushes are inlined. the code that handles naked values and comments
-%%   is not optimized by the compiler for efficient matching, but you shouldn't be using
-%%   naked values or comments anyways, they are horrible and contrary to the spec.
+%%   Callbacks or Opts, see the comments accompanying decoder/2 (in jsx.erl). Stack 
+%%   is a stack of flags used to track depth and to keep track of whether we are 
+%%   returning from a value or a key inside objects. all pops, peeks and pushes are 
+%%   inlined. the code that handles naked values and comments is not optimized by the 
+%%   compiler for efficient matching, but you shouldn't be using naked values or comments 
+%%   anyways, they are horrible and contrary to the spec.
 
 start(<<?start_object/utf8, Rest/binary>>, Stack, Callbacks, Opts) ->
     object(Rest, [key|Stack], callback(start_object, Callbacks), Opts);
@@ -204,7 +198,7 @@ escaped_unicode(<<D/utf8, Rest/binary>>, Stack, Callbacks, Opts, String, [C, B,
             string(Rest, Stack, Callbacks, Opts, [X] ++ String)
         ; codepoint ->
             string(Rest, Stack, Callbacks, Opts, [X] ++ String)
-        ; none ->
+        ; _ ->
             string(Rest, Stack, Callbacks, Opts, [?rsolidus, $u, A, B, C, D] ++ String)
     end;
 escaped_unicode(<<S/utf8, Rest/binary>>, Stack, Callbacks, Opts, String, Acc) when ?is_hex(S) ->
@@ -422,6 +416,18 @@ maybe_comment_done(<<?solidus/utf8, Rest/binary>>, Resume) ->
     Resume(Rest);
 maybe_comment_done(<<>>, Resume) ->
     fun(Stream) -> maybe_comment_done(Stream, Resume) end.
+    
+
+%% helper function for dispatching of parser events    
+
+callback(eof, {none, Callbacks}) ->
+    lists:reverse(Callbacks);
+callback(Event, {none, Callbacks}) ->
+    {none, [Event] ++ Callbacks};
+callback(Event, {Mod, State}) when is_atom(Mod) ->
+    {Mod, Mod:jsx_event(Event, State)};
+callback(Event, {F, State}) when is_function(F) ->
+    {F, F(Event, State)}.
 
     
 

test/cases/array.json

@@ -0,0 +1 @@
+["foo","bar", "baz",true,false,null,{"key":"value"},[null,null,null,[]],"\n\r\\"]

test/cases/array.test

@@ -0,0 +1 @@
+[start_array, {string, "foo"}, {string, "bar"}, {string, "baz"}, {literal, true}, {literal, false}, {literal, null}, start_object, {key, "key"}, {string, "value"}, end_object, start_array, {literal, null}, {literal, null}, {literal, null}, start_array, end_array, end_array, {string, "\n\r\\"}, end_array].

test/cases/comments.json

@@ -0,0 +1 @@
+[/*array open comment*/ "a string"/*string comment*/, 1/*number comment*/, {/*object open comment*/"key"/*post key comment*/:/*colon comment*/[]/*object close comment*/}, true/*literal comment*/]

test/cases/comments.test

@@ -0,0 +1,2 @@
+[start_array, {string, "a string"}, {number, "1"}, start_object, {key, "key"}, start_array, end_array, end_object, {literal, true}, end_array].
+[{comments, true}].

test/cases/deep_array.json

@@ -0,0 +1 @@
+[[[]]]

test/cases/deep_array.test

@@ -0,0 +1 @@
+[start_array, start_array, start_array, end_array, end_array, end_array].

test/cases/empty_array.json

@@ -0,0 +1 @@
+[]

test/cases/empty_array.test

@@ -0,0 +1 @@
+[start_array, end_array].

test/cases/empty_array_with_comment.json

@@ -0,0 +1 @@
+[ /* this is a comment and should be ignored */ ]

test/cases/empty_array_with_comment.test

@@ -0,0 +1,3 @@
+[start_array, end_array].
+
+[{comments, true}].

test/cases/empty_object.json

@@ -0,0 +1 @@
+{}

test/cases/empty_object.test

@@ -0,0 +1 @@
+[start_object, end_object].

test/cases/empty_object_with_comment.json

@@ -0,0 +1 @@
+{/*comment*/}

test/cases/empty_object_with_comment.test

@@ -0,0 +1,3 @@
+[start_object, end_object].
+
+[{comments, true}].

test/cases/naked_false.json

@@ -0,0 +1 @@
+false

test/cases/naked_false.test

@@ -0,0 +1,2 @@
+[{literal, false}].
+[{naked_values, true}].

test/cases/naked_null.json

@@ -0,0 +1 @@
+null

test/cases/naked_null.test

@@ -0,0 +1,2 @@
+[{literal, null}].
+[{naked_values, true}].

test/cases/naked_number.json

@@ -0,0 +1 @@
+42

test/cases/naked_number.test

@@ -0,0 +1,2 @@
+[{number, "42"}].
+[{naked_values, true}].

test/cases/naked_string.json

@@ -0,0 +1 @@
+"this is a naked string"

test/cases/naked_string.test

@@ -0,0 +1,2 @@
+[{string, "this is a naked string"}].
+[{naked_values, true}].

test/cases/naked_true.json

@@ -0,0 +1 @@
+true

test/cases/naked_true.test

@@ -0,0 +1,2 @@
+[{literal, true}].
+[{naked_values, true}].

test/cases/numbers.json

@@ -0,0 +1 @@
+[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 42, 127, 99999999999999999999999999999, 1e1, 1E1, 1.0e1, 1.325e478534, -1, -1e-1, 3.7e-57834235 ]

test/cases/numbers.test

@@ -0,0 +1 @@
+[ start_array, {number, "1"}, {number, "2"}, {number, "3"}, {number, "4"}, {number, "5"}, {number, "6"}, {number, "7"}, {number, "8"}, {number, "9"}, {number, "42"}, {number, "127"}, {number, "99999999999999999999999999999"}, {number, "1e1"}, {number, "1e1"}, {number, "1.0e1"}, {number, "1.325e478534"}, {number, "-1"}, {number, "-1e-1"}, {number, "3.7e-57834235"}, end_array ].

test/cases/string.json

@@ -0,0 +1 @@
+[ "this is a random string with \n embedded\u0020escapes in it" ]

test/cases/string.test

@@ -0,0 +1 @@
+[start_array, {string, "this is a random string with \n embedded escapes in it"}, end_array].

test/cases/string_escapes.json

@@ -0,0 +1 @@
+["\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t"]

test/cases/string_escapes.test

@@ -0,0 +1,3 @@
+[start_array, {string, "\""}, {string, "\\"}, {string, "/"}, {string, "\b"}, {string, "\f"}, {string, "\n"}, {string, "\r"}, {string, "\t"}, end_array].
+
+

test/cases/unicode.json

@@ -0,0 +1 @@
+[ "arabic letter alef: ", "\u0627" ]

test/cases/unicode.test

@@ -0,0 +1,2 @@
+[start_array, {string, "arabic letter alef: "}, {string, [16#0627]}, end_array].
+[{escaped_unicode, codepoint}].

test/jsx_test.erl

@@ -1,66 +1,36 @@
 -module(jsx_test).
 
--export([test/2]).
+-export([test/1]).
 
-test(TestsDir, Opts) ->
-    {ok, MaybeTests} = file:list_dir(TestsDir),
-    
-    TestSpecs = lists:map(fun(X) -> 
-            filename:basename(X, ".test") end, 
-            lists:filter(fun(X) -> 
-                    case filename:extension(X) of 
-                        ".test" -> true
-                        ; _ -> false 
-                    end 
-                end, 
-                MaybeTests)),
-      
-    Results = test(TestSpecs, TestsDir, {[], [], []}),
-    
-    output(Results, Opts).
-    
-test([], _, Results) ->
-    Results;    
-test([Test|Rest], Dir, {Pass, Fail, Discard}) ->
-    {DecoderOpts, Expected} = case file:consult(filename:nativename(Dir ++ "/" ++ Test ++ ".test")) of
-        {ok, [Result]} when is_list(Result) -> {[], Result}
-        ; {ok, {Opts, Result}} -> {Opts, Result}
-    end,
-    
-    try decode(Test, Dir, DecoderOpts) of
-        Object ->
-            case Object == Expected of
-                true -> test(Rest, Dir, {[Test] ++ Pass, Fail, Discard})
-                ; false -> test(Rest, Dir, {Pass, [Test] ++ Fail, Discard})
-            end
-    catch
-        error:function_clause ->
-            test(Rest, Dir, {Pass, Fail, [Test] ++ Discard})
-        ; error:enoent ->
-            test(Rest, Dir, {Pass, Fail, [Test] ++ Discard})
-    end.  
+-include_lib("eunit/include/eunit.hrl").
 
 
-decode(Test, Dir, DecoderOpts) ->
-    Decoder = jsx:decoder(DecoderOpts),
-    {ok, JSON} = file:read_file(filename:nativename(Dir ++ "/" ++ Test ++ ".json")),
-    
-    Decoder(JSON).
-        
-    
-output({Pass, Fail, Discard}, Opts) ->
-    Passes = length(Pass),
-    Failures = length(Fail),
-    Discards = length(Discard),
-    
-    Total = Passes + Failures + Discards,
-    
-    io:format("***~p total tests run, ~p passes, ~p failures, ~p discarded~n    Failed:~n", [Total, Passes, Failures, Discards]),
-    lists:foreach(fun(X) -> io:format("       ~p~n", [X]) end, Fail).
-    
+test(Dir) ->
+    Tests = gen_tests(Dir),
+    eunit:test(Tests).
+
+gen_tests(Dir) ->
+    TestSpecs = filelib:wildcard("*.test", Dir),
+    gen_tests(TestSpecs, Dir, []).
+    
+gen_tests([], _, Acc) ->
+    lists:reverse(Acc); 
+    
+gen_tests([Test|Rest], Dir, Acc) ->
+    gen_tests(Rest, Dir, test_body(Test, Dir) ++ Acc).
+    
+test_body(TestSpec, Dir) ->
+    try
+        TestName = filename:basename(TestSpec, ".test"),
+        {ok, JSON} = file:read_file(Dir ++ "/" ++ TestName ++ ".json"),
+        case file:consult(Dir ++ "/" ++ TestSpec) of
+            {ok, [Events]} ->
+                Decoder = jsx:decoder(),
+                [{TestName, ?_assertEqual(Decoder(JSON), Events)}]
+            ; {ok, [Events, Flags]} ->
+                Decoder = jsx:decoder(none, Flags),
+                [{TestName, ?_assertEqual(Decoder(JSON), Events)}]
+        end
+    catch _:_ -> []
+    end.
 
-          
-        
-        
-        
-