test(dashboard): reuse `emqx_mgmt_api_test_util` in testsuites

To reduce the init / teardown complexity.
This commit is contained in:
Andrew Mayorov 2023-03-23 15:23:42 +03:00
parent b14a420885
commit 40f7fd691e
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
8 changed files with 20 additions and 102 deletions

View File

@ -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_mgmt_api_test_util:init_suite([emqx_management]),
[emqx_management, emqx_dashboard],
fun set_special_configs/1
),
Config. Config.
end_per_suite(_Config) -> end_per_suite(_Config) ->
mnesia:clear_table(?ADMIN), emqx_mgmt_api_test_util:end_suite([emqx_management]).
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.
t_overview(_) -> t_overview(_) ->
mnesia:clear_table(?ADMIN), mnesia:clear_table(?ADMIN),

View File

@ -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(), emqx_mgmt_api_test_util:init_suite([emqx_conf]),
application:load(emqx_dashboard),
emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
Config. Config.
set_special_configs(emqx_dashboard) -> end_per_suite(_Config) ->
emqx_dashboard_api_test_helpers:set_default_config(), emqx_mgmt_api_test_util:end_suite([emqx_conf]).
ok;
set_special_configs(_) ->
ok.
end_per_suite(Config) ->
end_suite(),
Config.
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">>,

View File

@ -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_per_suite(_Config) ->
end_suite(),
Config.
end_suite() ->
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(_) ->

View File

@ -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(), emqx_mgmt_api_test_util:init_suite([emqx_conf]),
application:load(emqx_dashboard),
emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
Config. Config.
set_special_configs(emqx_dashboard) -> end_per_suite(_Config) ->
emqx_dashboard_api_test_helpers:set_default_config(), emqx_mgmt_api_test_util:end_suite([emqx_conf]).
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]).
t_all_code(_) -> t_all_code(_) ->
HrlDef = ?ERROR_CODES, HrlDef = ?ERROR_CODES,

View File

@ -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_mgmt_api_test_util:init_suite([emqx_management], fun set_special_configs/1),
[emqx_management, emqx_dashboard],
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) -> end_per_suite(_Config) ->
application:unload(emqx_management), emqx_mgmt_api_test_util:end_suite([emqx_management]).
mnesia:clear_table(?ADMIN),
emqx_common_test_helpers:stop_apps([emqx_dashboard, emqx_management]),
mria:stop(),
Config.
t_status(_Config) -> t_status(_Config) ->
ProxyInfo = #{ ProxyInfo = #{

View File

@ -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), emqx_mgmt_api_test_util:init_suite([]),
mria:start(),
mnesia:clear_table(?ADMIN),
emqx_common_test_helpers:start_apps([emqx_dashboard], fun set_special_configs/1),
Config. Config.
end_per_suite(Config) -> end_per_suite(_Config) ->
mnesia:clear_table(?ADMIN), emqx_mgmt_api_test_util:end_suite([]).
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.
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),

View File

@ -63,25 +63,12 @@ groups() ->
]. ].
init_per_suite(Config) -> init_per_suite(Config) ->
mria:start(), emqx_mgmt_api_test_util:init_suite([emqx_conf]),
application:load(emqx_dashboard),
emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
emqx_dashboard:init_i18n(), emqx_dashboard:init_i18n(),
Config. Config.
set_special_configs(emqx_dashboard) -> end_per_suite(_Config) ->
emqx_dashboard_api_test_helpers:set_default_config(), emqx_mgmt_api_test_util:end_suite([emqx_conf]).
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]).
t_in_path(_Config) -> t_in_path(_Config) ->
Expect = Expect =

View File

@ -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(), emqx_mgmt_api_test_util:init_suite([emqx_conf]),
application:load(emqx_dashboard),
emqx_common_test_helpers:start_apps([emqx_conf, emqx_dashboard], fun set_special_configs/1),
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",