Просмотр исходного кода

test(dashboard): reuse `emqx_mgmt_api_test_util` in testsuites

To reduce the init / teardown complexity.
Andrew Mayorov 2 лет назад
Родитель
Сommit
40f7fd691e

+ 2 - 13
apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl

@@ -57,22 +57,11 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
     emqx_common_test_helpers:all(?MODULE).
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    emqx_common_test_helpers:start_apps(
-        [emqx_management, emqx_dashboard],
-        fun set_special_configs/1
-    ),
+    emqx_mgmt_api_test_util:init_suite([emqx_management]),
     Config.
     Config.
 
 
 end_per_suite(_Config) ->
 end_per_suite(_Config) ->
-    mnesia:clear_table(?ADMIN),
-    emqx_common_test_helpers:stop_apps([emqx_dashboard, emqx_management]),
-    mria:stop().
-
-set_special_configs(emqx_dashboard) ->
-    emqx_dashboard_api_test_helpers:set_default_config(),
-    ok;
-set_special_configs(_) ->
-    ok.
+    emqx_mgmt_api_test_util:end_suite([emqx_management]).
 
 
 t_overview(_) ->
 t_overview(_) ->
     mnesia:clear_table(?ADMIN),
     mnesia:clear_table(?ADMIN),

+ 3 - 17
apps/emqx_dashboard/test/emqx_dashboard_admin_SUITE.erl

@@ -19,36 +19,22 @@
 -compile(export_all).
 -compile(export_all).
 
 
 -include("emqx_dashboard.hrl").
 -include("emqx_dashboard.hrl").
--include_lib("emqx/include/http_api.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 
 all() ->
 all() ->
     emqx_common_test_helpers:all(?MODULE).
     emqx_common_test_helpers:all(?MODULE).
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    mria:start(),
-    application:load(emqx_dashboard),
-    emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
+    emqx_mgmt_api_test_util:init_suite([emqx_conf]),
     Config.
     Config.
 
 
-set_special_configs(emqx_dashboard) ->
-    emqx_dashboard_api_test_helpers:set_default_config(),
-    ok;
-set_special_configs(_) ->
-    ok.
-
-end_per_suite(Config) ->
-    end_suite(),
-    Config.
+end_per_suite(_Config) ->
+    emqx_mgmt_api_test_util:end_suite([emqx_conf]).
 
 
 end_per_testcase(_, _Config) ->
 end_per_testcase(_, _Config) ->
     All = emqx_dashboard_admin:all_users(),
     All = emqx_dashboard_admin:all_users(),
     [emqx_dashboard_admin:remove_user(Name) || #{username := Name} <- All].
     [emqx_dashboard_admin:remove_user(Name) || #{username := Name} <- All].
 
 
-end_suite() ->
-    application:unload(emqx_management),
-    emqx_common_test_helpers:stop_apps([emqx_dashboard]).
-
 t_check_user(_) ->
 t_check_user(_) ->
     Username = <<"admin1">>,
     Username = <<"admin1">>,
     Password = <<"public_1">>,
     Password = <<"public_1">>,

+ 1 - 6
apps/emqx_dashboard/test/emqx_dashboard_bad_api_SUITE.erl

@@ -31,15 +31,10 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
     emqx_common_test_helpers:all(?MODULE).
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    mria:start(),
     emqx_mgmt_api_test_util:init_suite([emqx_conf]),
     emqx_mgmt_api_test_util:init_suite([emqx_conf]),
     Config.
     Config.
 
 
-end_per_suite(Config) ->
-    end_suite(),
-    Config.
-
-end_suite() ->
+end_per_suite(_Config) ->
     emqx_mgmt_api_test_util:end_suite([emqx_conf]).
     emqx_mgmt_api_test_util:end_suite([emqx_conf]).
 
 
 t_bad_api_path(_) ->
 t_bad_api_path(_) ->

+ 3 - 16
apps/emqx_dashboard/test/emqx_dashboard_error_code_SUITE.erl

@@ -29,24 +29,11 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
     emqx_common_test_helpers:all(?MODULE).
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    mria:start(),
-    application:load(emqx_dashboard),
-    emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
+    emqx_mgmt_api_test_util:init_suite([emqx_conf]),
     Config.
     Config.
 
 
-set_special_configs(emqx_dashboard) ->
-    emqx_dashboard_api_test_helpers:set_default_config(),
-    ok;
-set_special_configs(_) ->
-    ok.
-
-end_per_suite(Config) ->
-    end_suite(),
-    Config.
-
-end_suite() ->
-    application:unload(emqx_management),
-    emqx_common_test_helpers:stop_apps([emqx_dashboard]).
+end_per_suite(_Config) ->
+    emqx_mgmt_api_test_util:end_suite([emqx_conf]).
 
 
 t_all_code(_) ->
 t_all_code(_) ->
     HrlDef = ?ERROR_CODES,
     HrlDef = ?ERROR_CODES,

+ 3 - 10
apps/emqx_dashboard/test/emqx_dashboard_haproxy_SUITE.erl

@@ -26,10 +26,7 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
     emqx_common_test_helpers:all(?MODULE).
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    emqx_common_test_helpers:start_apps(
-        [emqx_management, emqx_dashboard],
-        fun set_special_configs/1
-    ),
+    emqx_mgmt_api_test_util:init_suite([emqx_management], fun set_special_configs/1),
     Config.
     Config.
 
 
 set_special_configs(emqx_dashboard) ->
 set_special_configs(emqx_dashboard) ->
@@ -38,12 +35,8 @@ set_special_configs(emqx_dashboard) ->
 set_special_configs(_) ->
 set_special_configs(_) ->
     ok.
     ok.
 
 
-end_per_suite(Config) ->
-    application:unload(emqx_management),
-    mnesia:clear_table(?ADMIN),
-    emqx_common_test_helpers:stop_apps([emqx_dashboard, emqx_management]),
-    mria:stop(),
-    Config.
+end_per_suite(_Config) ->
+    emqx_mgmt_api_test_util:end_suite([emqx_management]).
 
 
 t_status(_Config) ->
 t_status(_Config) ->
     ProxyInfo = #{
     ProxyInfo = #{

+ 3 - 14
apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl

@@ -31,22 +31,11 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
     emqx_common_test_helpers:all(?MODULE).
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    application:load(emqx_dashboard),
-    mria:start(),
-    mnesia:clear_table(?ADMIN),
-    emqx_common_test_helpers:start_apps([emqx_dashboard], fun set_special_configs/1),
+    emqx_mgmt_api_test_util:init_suite([]),
     Config.
     Config.
 
 
-end_per_suite(Config) ->
-    mnesia:clear_table(?ADMIN),
-    emqx_common_test_helpers:stop_apps([emqx_dashboard]),
-    Config.
-
-set_special_configs(emqx_dashboard) ->
-    emqx_dashboard_api_test_helpers:set_default_config(),
-    ok;
-set_special_configs(_) ->
-    ok.
+end_per_suite(_Config) ->
+    emqx_mgmt_api_test_util:end_suite([]).
 
 
 t_monitor_samplers_all(_Config) ->
 t_monitor_samplers_all(_Config) ->
     timer:sleep(?DEFAULT_SAMPLE_INTERVAL * 2 * 1000 + 20),
     timer:sleep(?DEFAULT_SAMPLE_INTERVAL * 2 * 1000 + 20),

+ 3 - 16
apps/emqx_dashboard/test/emqx_swagger_parameter_SUITE.erl

@@ -63,25 +63,12 @@ groups() ->
     ].
     ].
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    mria:start(),
-    application:load(emqx_dashboard),
-    emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
+    emqx_mgmt_api_test_util:init_suite([emqx_conf]),
     emqx_dashboard:init_i18n(),
     emqx_dashboard:init_i18n(),
     Config.
     Config.
 
 
-set_special_configs(emqx_dashboard) ->
-    emqx_dashboard_api_test_helpers:set_default_config(),
-    ok;
-set_special_configs(_) ->
-    ok.
-
-end_per_suite(Config) ->
-    end_suite(),
-    Config.
-
-end_suite() ->
-    application:unload(emqx_management),
-    emqx_common_test_helpers:stop_apps([emqx_dashboard]).
+end_per_suite(_Config) ->
+    emqx_mgmt_api_test_util:end_suite([emqx_conf]).
 
 
 t_in_path(_Config) ->
 t_in_path(_Config) ->
     Expect =
     Expect =

+ 2 - 10
apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl

@@ -32,25 +32,17 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 
 init_per_suite(Config) ->
 init_per_suite(Config) ->
-    mria:start(),
-    application:load(emqx_dashboard),
-    emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
+    emqx_mgmt_api_test_util:init_suite([emqx_conf]),
     emqx_dashboard:init_i18n(),
     emqx_dashboard:init_i18n(),
     Config.
     Config.
 
 
-set_special_configs(emqx_dashboard) ->
-    emqx_dashboard_api_test_helpers:set_default_config(),
-    ok;
-set_special_configs(_) ->
-    ok.
-
 end_per_suite(Config) ->
 end_per_suite(Config) ->
     end_suite(),
     end_suite(),
     Config.
     Config.
 
 
 end_suite() ->
 end_suite() ->
     application:unload(emqx_management),
     application:unload(emqx_management),
-    emqx_common_test_helpers:stop_apps([emqx_dashboard]).
+    emqx_mgmt_api_test_util:end_suite([emqx_conf]).
 
 
 t_simple_binary(_config) ->
 t_simple_binary(_config) ->
     Path = "/simple/bin",
     Path = "/simple/bin",