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

diff --git a/test/hope_list_SUITE.erl b/test/hope_list_SUITE.erl
index 9557aab..8994868 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(
@@ -16,6 +16,7 @@
     , t_map_slow/1
     , t_map/1
     , t_map_3/1
+    , t_map_result/1
     ]).
 
 
@@ -23,6 +24,8 @@
 
 -define(PROPTEST(A), true = proper:quickcheck(A())).
 
+-define(type, proper_types).
+
 
 %% ============================================================================
 %% Common Test callbacks
@@ -39,6 +42,7 @@ groups() ->
         , t_map_slow
         , t_map
         , t_map_3
+        , t_map_result
         ],
     Properties = [parallel],
     [{?GROUP, Properties, Tests}].
@@ -52,35 +56,35 @@ t_map_rev(_Cfg) ->
     ?PROPTEST(map_rev).
 
 map_rev() ->
-    ?FORALL({L, F}, {list(integer()), function([integer()], term())},
+    ?FORALL({L, F}, {?type:list(?type:integer()), ?type:function([?type:integer()], ?type:term())},
             hope_list:map_rev(L, F) == lists:reverse(lists:map(F, L))).
 
 t_map_slow(_Cfg) ->
     ?PROPTEST(map_slow).
 
 map_slow() ->
-    ?FORALL({L, F}, {list(integer()), function([integer()], term())},
+    ?FORALL({L, F}, {?type:list(?type:integer()), ?type:function([?type:integer()], ?type:term())},
             hope_list:map_slow(L, F) == lists:map(F, L)).
 
 t_map(_Cfg) ->
     ?PROPTEST(map).
 
 map() ->
-    ?FORALL({L, F}, {list(integer()), function([integer()], term())},
+    ?FORALL({L, F}, {?type:list(?type:integer()), ?type:function([?type:integer()], ?type:term())},
             hope_list:map(L, F) == lists:map(F, L)).
 
 t_map_3(_Cfg) ->
     ?PROPTEST(map_3).
 
 map_3() ->
-    ?FORALL({L, F, N}, {list(integer()), function([integer()], term()), non_neg_integer()},
+    ?FORALL({L, F, N}, {?type:list(?type:integer()), ?type:function([?type:integer()], ?type:term()), ?type:non_neg_integer()},
             hope_list:map(L, F, N) == lists:map(F, L)).
 
 t_unique_preserve_order(_Cfg) ->
     ?PROPTEST(prop_unique_preserve_order).
 
 prop_unique_preserve_order() ->
-    ?FORALL(L, list(),
+    ?FORALL(L, ?type:list(),
             begin
                 Duplicates = L -- lists:usort(L),
                 hope_list:unique_preserve_order(L) ==
@@ -89,3 +93,13 @@ prop_unique_preserve_order() ->
 
 t_hope_list_specs(_) ->
     [] = proper:check_specs(hope_list).
+
+t_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).