integrating rebar with eunit

moving etap tests to special directory

moving proper tests to eunit running

fixing obsolete Makefile line

updating rebar

Makefile

@@ -2,16 +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
 
-ct:
-	./rebar ct skip_deps=true verbose=1
+eunit:
+	./rebar eunit skip_deps=true

rebar.config

@@ -16,7 +16,7 @@
     {"darwin10.*-32$", "LDFLAGS", "-arch i386"}
 ]}.
 
-{eunit_opts, [{file, "test/props.erl"}]}.
+{eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.
 
 {deps, [{proper_stdlib, ".*",
          {git, "https://github.com/spawngrid/proper_stdlib.git", "master"}},

test/jiffy_SUITE.erl

@@ -1,25 +0,0 @@
--module(jiffy_SUITE).
--include_lib("proper/include/proper.hrl").
--include_lib("proper_stdlib/include/proper_ct.hrl").
--compile(export_all).
-
-all() -> proper_ct:testcases(?MODULE).
-
-init_per_testcase(tc_prop_foo, Config) ->
-     [{proper, [{numtests, 1000}]} | Config].
-
--type json_any()    :: json_list()
-                     | json_dict()
-                     | json_number()
-                     | json_string()
-                     | json_null().
--type json_list()   :: list(json_any()).
--type json_dict()   :: {[{json_key(), json_any()}]}.
--type json_key()    :: binary().
--type json_number() :: integer() | float().
--type json_string() :: binary().
--type json_null()   :: null.
-
-prop_foo() ->
-    ?FORALL(Data, json_any(),
-            Data == jiffy:decode(jiffy:encode(Data))).

test/proper_tests.erl

@@ -0,0 +1,89 @@
+-module(proper_tests).
+-include_lib("proper/include/proper.hrl").
+%%-include_lib("proper_stdlib/include/proper_ct.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].
+
+-type json_any()    :: json_list()
+                     | json_dict()
+                     | json_number()
+                     | json_string()
+                     | json_null().
+-type json_list()   :: list(json_any()).
+-type json_dict()   :: {[{json_key(), json_any()}]}.
+-type json_key()    :: binary().
+-type json_number() :: integer() | float().
+-type json_string() :: binary().
+-type json_null()   :: null.
+
+%% Atomic types
+json_null() ->
+    null.
+
+json_string() ->
+    ?LET(Str, proper_stdgen:utf8_bin(),
+         binary:replace(Str, <<"\"">>, <<"\\\"">>, [global])). %good enough
+
+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(0) ->
+    json_atomic();
+json_object(S) ->
+    frequency([{1, json_object(0)},
+               {3, json_list()},
+               {9, ?LAZY(
+                      ?LETSHRINK(
+                         [Node],
+                         [{list({json_string(), json_object(S - 1)})}],
+                         Node
+                        ))}]).
+
+json_list() ->
+    list(json_object()).
+
+tree(G) ->
+  ?SIZED(S, tree(S, G)).
+tree(0, _) ->
+    leaf;
+tree(S, G) ->
+    frequency([
+               {1, tree(0, G)},
+               {9, ?LAZY(
+                      ?LETSHRINK(
+                         [L, R],
+                         [tree(S div 2, G), tree(S div 2, G)],
+                         {node, G, L, R}
+                        ))}
+              ]).
+
+prop_foo() ->
+%%    ?FORALL(Data, json_any(),
+%%            Data == jiffy:decode(jiffy:encode(Data))).
+    ?FORALL(Data, json_object(),
+            begin
+                %io:format(user, "Data: ~p~n", [Data]),
+                Data == jiffy:decode(jiffy:encode(Data))
+            end).
+
+proper_test_() ->
+    {timeout, 600,
+     ?_assertEqual([], proper:module(proper_tests, [{to_file, user},
+                                                    {numtests, 10}]))}.

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().
-