X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=test%2Fhope_list_SUITE.erl;h=d5ac392513c16e93369a3b75265d8ffb47bdd93e;hb=cf0f905c6b980352e35a8069c4a1a8680803e27d;hp=38d406a3ca1a7518ed6274b7da8a5a2095a723d1;hpb=2a81fbac3178e649d03519f7b1b25e43d7850713;p=hope.git

diff --git a/test/hope_list_SUITE.erl b/test/hope_list_SUITE.erl
index 38d406a..d5ac392 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(
@@ -14,12 +14,17 @@
     , t_hope_list_specs/1
     , t_map_rev/1
     , t_map_slow/1
+    , t_map/1
+    , t_map_3/1
+    , t_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).
 
 
 %% ============================================================================
@@ -35,6 +40,9 @@ groups() ->
         , t_hope_list_specs
         , t_map_rev
         , t_map_slow
+        , t_map
+        , t_map_3
+        , t_map_result
         ],
     Properties = [parallel],
     [{?GROUP, Properties, Tests}].
@@ -45,25 +53,67 @@ groups() ->
 %% =============================================================================
 
 t_map_rev(_Cfg) ->
-    F = fun (N) -> N + 1 end,
-    [4, 3, 2] = hope_list:map_rev([1, 2, 3], F),
-    []        = hope_list:map_rev([], F).
+    ?CHECK(proper_spec_map_rev).
 
 t_map_slow(_Cfg) ->
-    F = fun (N) -> N + 1 end,
-    [2, 3, 4] = hope_list:map_slow([1, 2, 3], F),
-    []        = hope_list:map_slow([], F).
+    ?CHECK(proper_spec_map_slow).
 
-t_unique_preserve_order(_Cfg) ->
-    ?PROPTEST(prop_unique_preserve_order).
+t_map(_Cfg) ->
+    ?CHECK(proper_spec_map).
 
-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).
+t_map_3(_Cfg) ->
+    ?CHECK(proper_spec_map_3).
 
-t_hope_list_specs(_) ->
+t_unique_preserve_order(_Cfg) ->
+    ?CHECK(proper_spec_prop_unique_preserve_order).
+
+t_hope_list_specs(_Cfg) ->
     [] = 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).
+
+%% ============================================================================
+%% PropEr test specs
+%% ============================================================================
+
+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()).