Merge 8e208ca5fd into b30cd375f5

.gitignore

@@ -2,3 +2,6 @@
 *.o
 *.so
 ebin/jiffy.app
+.eunit
+deps
+logs

Makefile

@@ -2,10 +2,16 @@
 all: build
 
 %.beam: %.erl
-	erlc -o test/ $<
+	erlc -o test_etap/ $<
 
 build: c_src/decoder.c
 	./rebar compile
 
-check: test/etap.beam test/util.beam
-	prove test/*.t
+check: test_etap/etap.beam test_etap/util.beam
+	prove test_etap/*.t
+
+clean:
+	rm -rf logs .eunit
+
+eunit:
+	./rebar eunit skip_deps=true

rebar.config

@@ -15,3 +15,10 @@
     {"darwin10.*-32$", "CXXFLAGS", "-m32"},
     {"darwin10.*-32$", "LDFLAGS", "-arch i386"}
 ]}.
+
+{eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.
+
+{deps, [{proper_stdlib, ".*",
+         {git, "https://github.com/spawngrid/proper_stdlib.git", "master"}},
+        {proper, ".*",
+         {git, "https://github.com/manopapad/proper.git", "master"}}]}.

test/proper_tests.erl

@@ -0,0 +1,104 @@
+-module(proper_tests).
+-include_lib("proper/include/proper.hrl").
+-include_lib("eunit/include/eunit.hrl").
+-export([proper_test_/0]).
+
+all() -> proper_ct:testcases(?MODULE).
+
+init_per_testcase(tc_prop_foo, Config) ->
+     [{proper, [{numtests, 1000}]} | Config].
+
+%% Helper funs
+
+escaped_char() ->
+    ?LET(C, char(),
+         case C == $" of
+             true  -> "\\\"";
+             false -> C
+         end).
+
+escaped_utf8_bin() ->
+    ?SUCHTHAT(Bin,
+              ?LET(S, ?SUCHTHAT(L, list(escaped_char()), L /= []),
+                   unicode:characters_to_binary(S, unicode, utf8)),
+              is_binary(Bin)).
+
+%% Atomic types
+json_null() ->
+    null.
+
+json_string() ->
+    escaped_utf8_bin().
+
+json_number() ->
+    oneof([integer(), float()]).
+
+json_boolean() ->
+    oneof([true, false]).
+
+json_atomic() ->
+    oneof([json_null(),
+           json_string(),
+           json_number(),
+           json_boolean()]).
+
+%% Compound types
+json_object() ->
+    ?SIZED(S, json_object(S)).
+json_object(S) when S =< 0 ->
+    json_atomic();
+json_object(S) ->
+    frequency([{1, json_object(0)},
+               {3, ?LAZY(json_list(S))},
+               {3, ?LAZY(
+                      ?LETSHRINK(
+                         [ObjectSize],
+                         [integer(1, S)],
+                         ?LETSHRINK(
+                            [Object],
+                            [{vector(ObjectSize,
+                                     {json_string(),
+                                      json_object(S - ObjectSize)})}],
+                            Object
+                           )))}]).
+
+json_list(S) ->
+    ?LETSHRINK([ListSize],
+               [integer(1, S)],
+               vector(ListSize, json_object(S - ListSize))).
+
+json_list() ->
+    list(json_object()).
+
+prop_encode_decode() ->
+    ?FORALL(Data, json_object(),
+            begin
+%%                io:format(user, "Data: ~p~n", [Data]),
+                Data == jiffy:decode(jiffy:encode(Data))
+            end).
+
+prop_encode_not_crash() ->
+    ?FORALL(Data, any(),
+            begin
+                catch jiffy:encode(Data),
+                true
+            end).
+
+prop_decode_not_crash_bin() ->
+    ?FORALL(Data, binary(),
+            begin
+                catch jiffy:decode(Data),
+                true
+            end).
+
+prop_decode_not_crash_any() ->
+    ?FORALL(Data, any(),
+            begin
+                catch jiffy:decode(Data),
+                true
+            end).
+
+proper_test_() ->
+    {timeout, 3600,
+     ?_assertEqual([], proper:module(proper_tests, [{to_file, user},
+                                                    {numtests, 5000}]))}.

test/001-yajl-tests.t → test_etap/001-yajl-tests.t

@@ -3,7 +3,7 @@
 % See the LICENSE file for more information.
 
 main([]) ->
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
     code:add_pathz("ebin"),
 
     Cases = read_cases(),
@@ -18,7 +18,7 @@ test({Name, Json, Erl}) ->
     etap:is(jiffy:decode(Json), Erl, Name).
 
 read_cases() ->
-    CasesPath = filename:join(["test", "cases", "*.json"]),
+    CasesPath = filename:join(["test_etap", "cases", "*.json"]),
     FileNames = lists:sort(filelib:wildcard(CasesPath)),
     lists:map(fun(F) -> make_pair(F) end, FileNames).
 

test/002-literals.t → test_etap/002-literals.t

@@ -4,7 +4,7 @@
 
 main([]) ->
     code:add_pathz("ebin"),
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
 
     etap:plan(6),
     etap:is(jiffy:decode(<<"true">>), true, "DEC: true -> true"),
@@ -17,5 +17,3 @@ main([]) ->
     etap:is(jiffy:encode(null), <<"null">>, "ENC: null -> null"),
 
     etap:end_tests().
-
-

test/003-numbers.t → test_etap/003-numbers.t

@@ -4,7 +4,7 @@
 
 main([]) ->
     code:add_pathz("ebin"),
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
 
     etap:plan(59),
     util:test_good(good()),

test/004-strings.t → test_etap/004-strings.t

@@ -4,7 +4,7 @@
 
 main([]) ->
     code:add_pathz("ebin"),
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
 
     etap:plan(83),
     util:test_good(good()),

test/005-arrays.t → test_etap/005-arrays.t

@@ -4,7 +4,7 @@
 
 main([]) ->
     code:add_pathz("ebin"),
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
 
     etap:plan(18),
     util:test_good(good()),

test/006-maps.t → test_etap/006-maps.t

@@ -4,7 +4,7 @@
 
 main([]) ->
     code:add_pathz("ebin"),
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
 
     etap:plan(15),
     util:test_good(good()),

test/007-compound.t → test_etap/007-compound.t

@@ -4,7 +4,7 @@
 
 main([]) ->
     code:add_pathz("ebin"),
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
 
     etap:plan(12),
     util:test_good(good()),

test/008-halfword.t → test_etap/008-halfword.t

@@ -4,7 +4,7 @@
 
 main([]) ->
     code:add_pathz("ebin"),
-    code:add_pathz("test"),
+    code:add_pathz("test_etap"),
 
     etap:plan(unknown),
 
@@ -12,4 +12,3 @@ main([]) ->
     etap:is(jiffy:decode(<<"1">>) == 1, true, "1 == 1"),
 
     etap:end_tests().
-