X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=test%2Fhope_list_SUITE.erl;h=8601cf984af0fb13626de38625ec683cc297fcf0;hb=2fa2f0266468d1b726aae16141671fed267eab53;hp=9557aab7d96c2786f038ada909eb93a3bc19f731;hpb=fad0cddcfc72f2251a7510bde34e6105c01c5ebe;p=hope.git

diff --git a/test/hope_list_SUITE.erl b/test/hope_list_SUITE.erl
index 9557aab..8601cf9 100644
--- a/test/hope_list_SUITE.erl
+++ b/test/hope_list_SUITE.erl
@@ -1,6 +1,6 @@
 -module(hope_list_SUITE).
 
--include_lib("proper/include/proper.hrl").
+-include_lib("proper/include/proper_common.hrl").
 
 %% Callbacks
 -export(
@@ -10,18 +10,21 @@
 
 %% Test cases
 -export(
-    [ t_unique_preserve_order/1
-    , t_hope_list_specs/1
-    , t_map_rev/1
-    , t_map_slow/1
-    , t_map/1
-    , t_map_3/1
+    [ t_auto_hope_list_specs/1
+    , t_auto_map/1
+    , t_auto_map_3/1
+    , t_auto_map_rev/1
+    , t_auto_map_slow/1
+    , t_auto_unique_preserve_order/1
+    , t_manual_map_result/1
     ]).
 
 
 -define(GROUP , hope_list).
 
--define(PROPTEST(A), true = proper:quickcheck(A())).
+-define(CHECK(F), true = proper:quickcheck(F())).
+
+-define(type, proper_types).
 
 
 %% ============================================================================
@@ -33,59 +36,87 @@ all() ->
 
 groups() ->
     Tests =
-        [ t_unique_preserve_order
-        , t_hope_list_specs
-        , t_map_rev
-        , t_map_slow
-        , t_map
-        , t_map_3
+        [ t_auto_hope_list_specs
+        , t_auto_map
+        , t_auto_map_3
+        , t_auto_map_rev
+        , t_auto_map_slow
+        , t_auto_unique_preserve_order
+        , t_manual_map_result
         ],
     Properties = [parallel],
     [{?GROUP, Properties, Tests}].
 
-
 %% =============================================================================
-%%  Test cases
+%%  Manual test cases
 %% =============================================================================
 
-t_map_rev(_Cfg) ->
-    ?PROPTEST(map_rev).
-
-map_rev() ->
-    ?FORALL({L, F}, {list(integer()), function([integer()], term())},
-            hope_list:map_rev(L, F) == lists:reverse(lists:map(F, L))).
+t_manual_map_result(_Cfg) ->
+    AssertPositive =
+        fun (I) when I > 0 -> {ok, I}; (_) -> {error, negative} end,
+    AllPositives = lists:seq(1, 5),
+    AllNegatives = lists:seq(-5, -1),
+    Mixed = lists:seq(-5, 5),
+    {ok, AllPositives} = hope_list:map_result(AllPositives, AssertPositive),
+    {error, negative}  = hope_list:map_result(AllNegatives, AssertPositive),
+    {error, negative}  = hope_list:map_result(Mixed, AssertPositive).
 
-t_map_slow(_Cfg) ->
-    ?PROPTEST(map_slow).
+%% =============================================================================
+%%  Generated test cases
+%% =============================================================================
 
-map_slow() ->
-    ?FORALL({L, F}, {list(integer()), function([integer()], term())},
-            hope_list:map_slow(L, F) == lists:map(F, L)).
+t_auto_map_rev(_Cfg) ->
+    ?CHECK(proper_spec_map_rev).
 
-t_map(_Cfg) ->
-    ?PROPTEST(map).
+t_auto_map_slow(_Cfg) ->
+    ?CHECK(proper_spec_map_slow).
 
-map() ->
-    ?FORALL({L, F}, {list(integer()), function([integer()], term())},
-            hope_list:map(L, F) == lists:map(F, L)).
+t_auto_map(_Cfg) ->
+    ?CHECK(proper_spec_map).
 
-t_map_3(_Cfg) ->
-    ?PROPTEST(map_3).
+t_auto_map_3(_Cfg) ->
+    ?CHECK(proper_spec_map_3).
 
-map_3() ->
-    ?FORALL({L, F, N}, {list(integer()), function([integer()], term()), non_neg_integer()},
-            hope_list:map(L, F, N) == lists:map(F, L)).
+t_auto_unique_preserve_order(_Cfg) ->
+    ?CHECK(proper_spec_prop_unique_preserve_order).
 
-t_unique_preserve_order(_Cfg) ->
-    ?PROPTEST(prop_unique_preserve_order).
+t_auto_hope_list_specs(_Cfg) ->
+    [] = proper:check_specs(hope_list).
 
-prop_unique_preserve_order() ->
-    ?FORALL(L, list(),
-            begin
-                Duplicates = L -- lists:usort(L),
-                hope_list:unique_preserve_order(L) ==
-                    lists:reverse(lists:reverse(L) -- Duplicates)
-            end).
+%% ============================================================================
+%% PropEr test specs
+%% ============================================================================
 
-t_hope_list_specs(_) ->
-    [] = proper:check_specs(hope_list).
+proper_spec_map_rev() ->
+    ?FORALL({L, F}, {type_l(), type_f()},
+        hope_list:map_rev(L, F) == lists:reverse(lists:map(F, L))
+    ).
+
+proper_spec_map_slow() ->
+    ?FORALL({L, F}, {type_l(), type_f()},
+        hope_list:map_slow(L, F) == lists:map(F, L)
+    ).
+
+proper_spec_map() ->
+    ?FORALL({L, F}, {type_l(), type_f()},
+        hope_list:map(L, F) == lists:map(F, L)
+    ).
+
+proper_spec_map_3() ->
+    ?FORALL({L, F, N}, {type_l(), type_f(), ?type:non_neg_integer()},
+        hope_list:map(L, F, N) == lists:map(F, L)
+    ).
+
+proper_spec_prop_unique_preserve_order() ->
+    ?FORALL(L, ?type:list(),
+    begin
+        Duplicates = L -- lists:usort(L),
+        hope_list:unique_preserve_order(L) ==
+            lists:reverse(lists:reverse(L) -- Duplicates)
+    end).
+
+type_l() ->
+    ?type:list(?type:integer()).
+
+type_f() ->
+    ?type:function([?type:integer()], ?type:term()).