Test on newer releases

[hope.git] / test / hope_option_SUITE.erl

diff --git a/test/hope_option_SUITE.erl b/test/hope_option_SUITE.erl
index 370cf24..e7d14dc 100644 (file)
--- a/test/hope_option_SUITE.erl
+++ b/test/hope_option_SUITE.erl
@@ -9,12 +9,13 @@
 %% Test cases
 -export(
     [ t_of_result/1
-    , t_of_undefined/1
+    , t_undefined/1
     , t_put/1
     , t_get/1
     , t_map/1
     , t_iter/1
     , t_pipe/1
+    , t_validate/1
     ]).
 
 
@@ -32,12 +33,13 @@ all() ->
 groups() ->
     Tests =
         [ t_of_result
-        , t_of_undefined
+        , t_undefined
         , t_put
         , t_get
         , t_map
         , t_iter
         , t_pipe
+        , t_validate
         ],
     Properties = [parallel],
     [ {?GROUP, Properties, Tests}
@@ -64,12 +66,12 @@ t_map(_Cfg) ->
 
 t_iter(_Cfg) ->
     Key = key,
-    Put = fun (Val) -> _ = put(Key, Val), ok end,
+    Put = fun (Val) -> put(Key, Val) end,
     Get = fun () -> get(Key) end,
     Val = foo,
-    ok = hope_option:iter(none       , Put),
+    {} = hope_option:iter(none       , Put),
     undefined = Get(),
-    ok = hope_option:iter({some, Val}, Put),
+    {} = hope_option:iter({some, Val}, Put),
     Val = Get().
 
 t_of_result(_Cfg) ->
@@ -91,11 +93,15 @@ t_pipe(_Cfg) ->
     none      = hope_option:pipe(Steps, 2),
     none      = hope_option:pipe(Steps, 3).
 
-t_of_undefined(_Cfg) ->
-    Foo = foo,
-    Bar = bar,
-    Baz = baz,
-    {some, Foo} = hope_option:of_undefined(Foo),
-    {some, Bar} = hope_option:of_undefined(Bar),
-    {some, Baz} = hope_option:of_undefined(Baz),
-    none        = hope_option:of_undefined(undefined).
+t_undefined(_Cfg) ->
+    X         = foo,
+    {some, X} = hope_option:of_undefined(X),
+    X         = hope_option:to_undefined({some, X}),
+    none      = hope_option:of_undefined(undefined),
+    undefined = hope_option:to_undefined(none).
+
+t_validate(_Cfg) ->
+    IsFoo = fun (X) -> X =:= foo end,
+    none = hope_option:validate(none, IsFoo),
+    none = hope_option:validate({some, bar}, IsFoo),
+    {some, foo} = hope_option:validate({some, foo}, IsFoo).