Simplify policy validation tests

2 files changed, 10 insertions, 34 deletions

diff --git a/src/rabbit_runtime_parameters_test.erl b/src/rabbit_runtime_parameters_test.erl
index 63e604907b..d4d7271e90 100644
--- a/src/rabbit_runtime_parameters_test.erl
+++ b/src/rabbit_runtime_parameters_test.erl
@@ -53,31 +53,16 @@ unregister_policy_validator() ->
     rabbit_registry:unregister(policy_validator, <<"testpos">>).
 
 validate_policy([{<<"testeven">>, Terms}]) when is_list(Terms) ->
-    case check_even(Terms) of
+    case  length(Terms) rem 2 =:= 0 of
         true  -> ok;
         false -> {error, "meh", []}
     end;
 
 validate_policy([{<<"testpos">>, Terms}]) when is_list(Terms) ->
-    case check_pos(Terms) of
+    case lists:all(fun (N) -> is_integer(N) andalso N > 0 end, Terms) of
         true  -> ok;
         false -> {error, "meh", []}
     end;
 
-validate_policy([{Tag1, Arg1}, {Tag2, Arg2}])
-  when is_list(Arg1), is_list(Arg2) ->
-    case [Tag1, Tag2] -- [<<"testpos">>, <<"testeven">>] of
-        [] -> case check_pos (Arg1) andalso check_pos (Arg2) andalso
-                   check_even(Arg1) andalso check_even(Arg2) of
-                  true -> ok;
-                  _    -> {error, "meh", []}
-              end;
-        _  -> {error, "meh", []}
-   end;
-
 validate_policy(_) ->
     {error, "meh", []}.
-
-check_even(Terms) -> length(Terms) rem 2 =:= 0.
-check_pos(Terms)  -> lists:all(fun (N) -> is_integer(N) andalso
-                                          N > 0 end, Terms).
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index a4cc89a0cb..2c416c76c5 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1032,29 +1032,20 @@ test_runtime_parameters() ->
 test_policy_validation() ->
     rabbit_runtime_parameters_test:register_policy_validator(),
     SetPol =
-        fun (TagValList) ->
-                Frag = lists:foldl(
-                         fun ({Pol, Val}, Acc) ->
-                               [rabbit_misc:format("\"~s\":~p", [Pol, Val]) |
-                                Acc]
-                         end, "", TagValList),
+        fun (Tag, Val) ->
                 control_action(
                   set_policy,
-                  ["name", ".*", "{" ++ string:join(Frag, ",") ++ "}"])
+                  ["name", ".*", rabbit_misc:format("{\"~s\":~p}", [Tag, Val])])
         end,
 
-    ok                 = SetPol([{"testeven", []}]),
-    ok                 = SetPol([{"testeven", [1, 2]}]),
-    ok                 = SetPol([{"testeven", [1, 2, 3, 4]}]),
-    ok                 = SetPol([{"testpos",  [2, 3, 5, 562]}]),
+    ok                 = SetPol("testeven", []),
+    ok                 = SetPol("testeven", [1, 2]),
+    ok                 = SetPol("testeven", [1, 2, 3, 4]),
+    ok                 = SetPol("testpos",  [2, 5, 5678]),
 
-    {error_string, _}  = SetPol([{"testpos",  [-1, 0, 1]}]),
-    {error_string, _}  = SetPol([{"testeven", [ 1, 2, 3]}]),
+    {error_string, _}  = SetPol("testpos",  [-1, 0, 1]),
+    {error_string, _}  = SetPol("testeven", [ 1, 2, 3]),
 
-    ok                 = SetPol([{"testpos",  [2, 16]},     {"testeven", [12, 24]}]),
-    {error_string, _}  = SetPol([{"testpos",  [2, 16, 32]}, {"testeven", [12, 24]}]),
-    {error_string, _}  = SetPol([{"testpos",  [2, 16]},     {"testeven", [12, -2]}]),
-    {error_string, _}  = SetPol([{"not_registered", []}]),
     rabbit_runtime_parameters_test:unregister_policy_validator(),
     passed.