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

diff --git a/test/hope_list_SUITE.erl b/test/hope_list_SUITE.erl
index 8601cf9..29b1b38 100644
--- a/test/hope_list_SUITE.erl
+++ b/test/hope_list_SUITE.erl
@@ -16,13 +16,16 @@
     , t_auto_map_rev/1
     , t_auto_map_slow/1
     , t_auto_unique_preserve_order/1
+    , t_manual_map/1
     , t_manual_map_result/1
+    , t_manual_map_rev/1
+    , t_manual_map_slow/1
     ]).
 
 
 -define(GROUP , hope_list).
 
--define(CHECK(F), true = proper:quickcheck(F())).
+-define(TEST(TestSpec), true = proper:quickcheck(TestSpec)).
 
 -define(type, proper_types).
 
@@ -42,7 +45,10 @@ groups() ->
         , t_auto_map_rev
         , t_auto_map_slow
         , t_auto_unique_preserve_order
+        , t_manual_map
         , t_manual_map_result
+        , t_manual_map_rev
+        , t_manual_map_slow
         ],
     Properties = [parallel],
     [{?GROUP, Properties, Tests}].
@@ -51,6 +57,13 @@ groups() ->
 %%  Manual test cases
 %% =============================================================================
 
+t_manual_map(_Cfg) ->
+    F = fun (N) -> N + 1 end,
+    Xs = lists:seq(1, 5010),
+    Ys = lists:map(F, Xs),
+    Ys = hope_list:map(Xs, F),
+    [] = hope_list:map([], F).
+
 t_manual_map_result(_Cfg) ->
     AssertPositive =
         fun (I) when I > 0 -> {ok, I}; (_) -> {error, negative} end,
@@ -61,60 +74,55 @@ t_manual_map_result(_Cfg) ->
     {error, negative}  = hope_list:map_result(AllNegatives, AssertPositive),
     {error, negative}  = hope_list:map_result(Mixed, AssertPositive).
 
+t_manual_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).
+
+t_manual_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).
+
 %% =============================================================================
 %%  Generated test cases
 %% =============================================================================
 
 t_auto_map_rev(_Cfg) ->
-    ?CHECK(proper_spec_map_rev).
+    ?TEST(?FORALL({L, F}, {type_l(), type_f()},
+        hope_list:map_rev(L, F) == lists:reverse(lists:map(F, L))
+    )).
 
 t_auto_map_slow(_Cfg) ->
-    ?CHECK(proper_spec_map_slow).
+    ?TEST(?FORALL({L, F}, {type_l(), type_f()},
+        hope_list:map_slow(L, F) == lists:map(F, L)
+    )).
 
 t_auto_map(_Cfg) ->
-    ?CHECK(proper_spec_map).
+    ?TEST(?FORALL({L, F}, {type_l(), type_f()},
+        hope_list:map(L, F) == lists:map(F, L)
+    )).
 
 t_auto_map_3(_Cfg) ->
-    ?CHECK(proper_spec_map_3).
+    ?TEST(?FORALL({L, F, N}, {type_l(), type_f(), ?type: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).
+    ?TEST(?FORALL(L, ?type:list(),
+    begin
+        Duplicates = L -- lists:usort(L),
+        hope_list:unique_preserve_order(L) ==
+            lists:reverse(lists:reverse(L) -- Duplicates)
+    end)).
 
 t_auto_hope_list_specs(_Cfg) ->
     [] = proper:check_specs(hope_list).
 
 %% ============================================================================
-%% PropEr test specs
+%% Common types
 %% ============================================================================
 
-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()).