Merge pull request #962 from Quviq/develop-3.0

QuickCheck improvements

Makefile

@@ -1,4 +1,4 @@
-.PHONY: compile rel cover test dialyzer
+.PHONY: compile rel cover test dialyzer eqc
 REBAR=./rebar3
 
 compile:
@@ -7,16 +7,21 @@ compile:
 clean:
 	$(REBAR) clean
 
-cover: test
+cover: 
+	$(REBAR) eunit --cover
 	$(REBAR) cover
 
 test: compile
-	$(REBAR) as test do eunit
+	$(REBAR) eunit
 
 dialyzer:
 	$(REBAR) dialyzer
 
 xref:
 	$(REBAR) xref
 
+eqc:
+	$(REBAR) as test eqc --testing_budget 120
+	$(REBAR) as eqc eunit
+
 check: test dialyzer xref

eqc/bg_manager_eqc.erl

@@ -19,7 +19,6 @@
 
 -module(bg_manager_eqc).
 
--ifdef(TEST).
 -ifdef(EQC).
 
 -include("include/riak_core_bg_manager.hrl").
@@ -858,4 +857,3 @@ prop_bgmgr_parallel() ->
                          end))).
 
 -endif.
--endif.

rebar.config

@@ -36,5 +36,5 @@
 
 {profiles, [
     {test, [{deps, [meck]}, {erl_opts, [nowarn_export_all]}]},
-    {eqc, [{deps, [meck]}, {erl_opts, [nowarn_export_all]}]}
+    {eqc, [{deps, [meck]}, {erl_opts, [{d, 'EQC'}, nowarn_export_all]}]}
 ]}.

src/hashtree.erl

@@ -154,16 +154,14 @@
          run_multiple/2,
          run_remote/0,
          run_remote/1]).
--endif. % TEST
 
 -ifdef(EQC).
 -export([prop_correct/0, prop_sha/0, prop_est/0]).
 -include_lib("eqc/include/eqc.hrl").
 -endif.
 
--ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
--endif.
+-endif. %% TEST
 
 -define(NUM_SEGMENTS, (1024*1024)).
 -define(WIDTH, 1024).
@@ -1584,6 +1582,7 @@ opened_closed_test() ->
 %%% EQC
 %%%===================================================================
 
+-ifdef(TEST).
 -ifdef(EQC).
 prop_sha() ->
     %% NOTE: Generating 1MB (1024 * 1024) size binaries is incredibly slow
@@ -1692,3 +1691,4 @@ prop_est() ->
                 true
             end).
 -endif.
+-endif.

test/riak_core_claim_statem.erl

@@ -244,6 +244,9 @@ weight(_, _, _, _) ->
 -define(QC_OUT(P),
         eqc:on_output(fun(Str, Args) -> io:format(user, Str, Args) end, P)).
 
+claim_test() ->
+    eqc:quickcheck(?QC_OUT(prop_claim(with_ring_size(5)))).
+
 eqc_check(File, Prop) ->
     {ok, Bytes} = file:read_file(File),
     CE = binary_to_term(Bytes),