Test refactoring, cosmetics

(cherry picked from commit 9e999e7)
(cherry picked from commit 95d0321)

Author: michaelklishin

deps/rabbit/test/definition_import_SUITE.erl

@@ -363,34 +363,31 @@ export_import_round_trip_case2(Config) ->
         {skip, "Should not run in mixed version environments"}
     end.
 
-export_import_round_trip_operator_policy(Config) ->
+run_if_not_mixed_versions(Fun) ->
     case rabbit_ct_helpers:is_mixed_versions() of
-      false ->
+        false -> Fun();
+        _ -> {skip, "Should not run in mixed version environments"}
+    end.
+
+export_import_round_trip_operator_policy(Config) ->
+    run_if_not_mixed_versions(fun() ->
         import_file_case(Config, "case23"),
         Defs = export(Config),
         Parameters = maps:get(parameters, Defs, []),
-        OperatorPolicy = lists:filter(
-            fun(P) ->
-                maps:get(<<"component">>, P, undefined) =:= <<"operator_policy">>
-            end,
-            Parameters
-        ),
-        ?assertEqual(1, length(OperatorPolicy)),
-        [OpPol] = OperatorPolicy,
+        [OpPol] = [P || P <- Parameters,
+                        maps:get(<<"component">>, P) =:= <<"operator_policy">>,
+                        maps:get(<<"name">>, P) =:= <<"transient-queue-ttl">>],
         Value = maps:get(<<"value">>, OpPol),
         Definition = maps:get(<<"definition">>, Value),
         ?assert(is_map(Definition)),
         ?assertEqual(1800000, maps:get(<<"expires">>, Definition)),
         ?assertEqual(60000, maps:get(<<"message-ttl">>, Definition)),
         ?assertEqual(1000, maps:get(<<"max-length">>, Definition)),
-        import_parsed(Config, Defs);
-      _ ->
-        {skip, "Should not run in mixed version environments"}
-    end.
+        import_parsed(Config, Defs)
+    end).
 
 export_import_round_trip_vhost_limits(Config) ->
-    case rabbit_ct_helpers:is_mixed_versions() of
-      false ->
+    run_if_not_mixed_versions(fun() ->
         import_file_case(Config, "case6"),
         Defs = export(Config),
         Parameters = maps:get(parameters, Defs, []),
@@ -406,14 +403,11 @@ export_import_round_trip_vhost_limits(Config) ->
         ?assert(is_map(Value)),
         ?assertEqual(456, maps:get(<<"max-queues">>, Value)),
         ?assertEqual(123, maps:get(<<"max-connections">>, Value)),
-        import_parsed(Config, Defs);
-      _ ->
-        {skip, "Should not run in mixed version environments"}
-    end.
+        import_parsed(Config, Defs)
+    end).
 
 export_import_round_trip_operator_policy_all_keys(Config) ->
-    case rabbit_ct_helpers:is_mixed_versions() of
-      false ->
+    run_if_not_mixed_versions(fun() ->
         import_file_case(Config, "case24"),
         Defs = export(Config),
         Parameters = maps:get(parameters, Defs, []),
@@ -428,14 +422,11 @@ export_import_round_trip_operator_policy_all_keys(Config) ->
         ?assertEqual(300000, maps:get(<<"message-ttl">>, Definition)),
         ?assertEqual(10000, maps:get(<<"max-length">>, Definition)),
         ?assertEqual(104857600, maps:get(<<"max-length-bytes">>, Definition)),
-        import_parsed(Config, Defs);
-      _ ->
-        {skip, "Should not run in mixed version environments"}
-    end.
+        import_parsed(Config, Defs)
+    end).
 
 export_import_round_trip_multiple_operator_policies(Config) ->
-    case rabbit_ct_helpers:is_mixed_versions() of
-      false ->
+    run_if_not_mixed_versions(fun() ->
         import_file_case(Config, "case25"),
         Defs = export(Config),
         Parameters = maps:get(parameters, Defs, []),
@@ -449,14 +440,11 @@ export_import_round_trip_multiple_operator_policies(Config) ->
             ?assert(is_map(Definition)),
             ?assert(maps:size(Definition) >= 2)
         end, ExpectedPolicies),
-        import_parsed(Config, Defs);
-      _ ->
-        {skip, "Should not run in mixed version environments"}
-    end.
+        import_parsed(Config, Defs)
+    end).
 
 export_import_round_trip_mixed_parameters(Config) ->
-    case rabbit_ct_helpers:is_mixed_versions() of
-      false ->
+    run_if_not_mixed_versions(fun() ->
         import_file_case(Config, "case26"),
         Defs = export(Config),
         Parameters = maps:get(parameters, Defs, []),
@@ -471,10 +459,8 @@ export_import_round_trip_mixed_parameters(Config) ->
         OpPolValue = maps:get(<<"value">>, OpPol),
         OpPolDefinition = maps:get(<<"definition">>, OpPolValue),
         ?assert(is_map(OpPolDefinition)),
-        import_parsed(Config, Defs);
-      _ ->
-        {skip, "Should not run in mixed version environments"}
-    end.
+        import_parsed(Config, Defs)
+    end).
 
 import_on_a_booting_node_using_classic_local_source(Config) ->
     %% see case5.json

deps/rabbit_common/src/rabbit_data_coercion.erl

@@ -159,4 +159,4 @@ is_proplist_element({Key, _Value}) when is_atom(Key); is_binary(Key); is_list(Ke
 is_proplist_element(Atom) when is_atom(Atom) ->
     true;
 is_proplist_element(_) ->
-    false.
+    false.