From 73e563c88323425923f2263252d54f0670213dfc Mon Sep 17 00:00:00 2001
From: wwhai <cnwwhai@gmail.com>
Date: Fri, 16 Apr 2021 15:12:13 +0800
Subject: [PATCH] test(mgmt): remove macro switch

---
 apps/emqx_management/src/emqx_mgmt_data_backup.erl | 10 ----------
 apps/emqx_management/test/test_utils.erl           |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/apps/emqx_management/src/emqx_mgmt_data_backup.erl b/apps/emqx_management/src/emqx_mgmt_data_backup.erl
index a89f08da7..0417bf211 100644
--- a/apps/emqx_management/src/emqx_mgmt_data_backup.erl
+++ b/apps/emqx_management/src/emqx_mgmt_data_backup.erl
@@ -234,13 +234,6 @@ import_resource(#{<<"id">> := Id,
                                        config => Config,
                                        created_at => NCreatedAt,
                                        description => Desc}).
-
--ifdef(EMQX_ENTERPRISE).
-import_resources_and_rules(Resources, Rules, _FromVersion) ->
-    import_resources(Resources),
-    import_rules(Rules).
--else.
-
 import_resources_and_rules(Resources, Rules, FromVersion)
   when FromVersion =:= "4.0" orelse
        FromVersion =:= "4.1" orelse
@@ -356,7 +349,6 @@ apply_new_config([Action = #{<<"args">> := #{<<"$resource">> := ResourceId,
                      <<"forward_topic">> => ForwardTopic},
             apply_new_config(More, Configs, [Action#{<<"args">> := Args} | Acc]).
 
--endif.
 
 actions_to_prop_list(Actions) ->
     [action_to_prop_list(Act) || Act <- Actions].
@@ -663,14 +655,12 @@ do_import_extra_data(Data, _Version) ->
 do_import_extra_data(_Data, _Version) -> ok.
 -endif.
 
--ifndef(EMQX_ENTERPRISE).
 covert_empty_headers([]) -> #{};
 covert_empty_headers(Other) -> Other.
 
 flag_to_boolean(<<"on">>) -> true;
 flag_to_boolean(<<"off">>) -> false;
 flag_to_boolean(Other) -> Other.
--endif.
 
 -ifndef(EMQX_ENTERPRISE).
 is_version_supported(Data, Version) ->
diff --git a/apps/emqx_management/test/test_utils.erl b/apps/emqx_management/test/test_utils.erl
index 01a34a159..337a9499b 100644
--- a/apps/emqx_management/test/test_utils.erl
+++ b/apps/emqx_management/test/test_utils.erl
@@ -1,5 +1,5 @@
-%% @author: 
-%% @description: 
+%% @author:
+%% @description:
 -module(test_utils).
 %% ====================================================================
 %% API functions
@@ -14,6 +14,6 @@
 %% ====================================================================
 resource_is_alive(Id) ->
     {ok, #resource_params{status = #{is_alive := Alive}} = Params} = emqx_rule_registry:find_resource_params(Id),
-    ct:print("Id: ~p, Alive: ~p, Resource ===> :~p~n", [Id, Alive, Params]),
+    ct:pal("Id: ~p, Alive: ~p, Resource ===> :~p~n", [Id, Alive, Params]),
     ?assertEqual(true, Alive),
-    Alive.
\ No newline at end of file
+    Alive.