From 0c821cd3bd323fa159b4c202bfca046e40607da5 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Wed, 15 Mar 2023 13:57:42 +0300
Subject: [PATCH] test(ft): inject configs through hocon subsystem

So that relevant parts of config would be initialized with defaults.
---
 apps/emqx_ft/test/emqx_ft_SUITE.erl              | 11 ++++-------
 apps/emqx_ft/test/emqx_ft_api_SUITE.erl          |  5 ++---
 apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl   |  5 ++---
 .../emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl | 16 +++-------------
 apps/emqx_ft/test/emqx_ft_test_helpers.erl       |  7 ++++---
 5 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/apps/emqx_ft/test/emqx_ft_SUITE.erl b/apps/emqx_ft/test/emqx_ft_SUITE.erl
index bb67d3c56..9c9087732 100644
--- a/apps/emqx_ft/test/emqx_ft_SUITE.erl
+++ b/apps/emqx_ft/test/emqx_ft_SUITE.erl
@@ -58,9 +58,8 @@ end_per_suite(_Config) ->
 set_special_configs(Config) ->
     fun
         (emqx_ft) ->
-            ok = emqx_config:put([file_transfer, storage], #{
-                type => local, root => emqx_ft_test_helpers:ft_root(Config, node())
-            });
+            Root = emqx_ft_test_helpers:ft_root(Config, node()),
+            emqx_ft_test_helpers:load_config(#{storage => #{type => local, root => Root}});
         (_) ->
             ok
     end.
@@ -109,10 +108,8 @@ mk_cluster_specs(Config) ->
         {conf, [{[listeners, Proto, default, enabled], false} || Proto <- [ssl, ws, wss]]},
         {env_handler, fun
             (emqx_ft) ->
-                ok = emqx_config:put([file_transfer, storage], #{
-                    type => local,
-                    root => emqx_ft_test_helpers:ft_root(Config, node())
-                });
+                Root = emqx_ft_test_helpers:ft_root(Config, node()),
+                emqx_ft_test_helpers:load_config(#{storage => #{type => local, root => Root}});
             (_) ->
                 ok
         end}
diff --git a/apps/emqx_ft/test/emqx_ft_api_SUITE.erl b/apps/emqx_ft/test/emqx_ft_api_SUITE.erl
index 239edb267..7b191e229 100644
--- a/apps/emqx_ft/test/emqx_ft_api_SUITE.erl
+++ b/apps/emqx_ft/test/emqx_ft_api_SUITE.erl
@@ -41,9 +41,8 @@ end_per_suite(_Config) ->
 set_special_configs(Config) ->
     fun
         (emqx_ft) ->
-            ok = emqx_config:put([file_transfer, storage], #{
-                type => local, root => emqx_ft_test_helpers:ft_root(Config, node())
-            });
+            Root = emqx_ft_test_helpers:ft_root(Config, node()),
+            emqx_ft_test_helpers:load_config(#{storage => #{type => local, root => Root}});
         (_) ->
             ok
     end.
diff --git a/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl b/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl
index 3bda8042c..5551cce27 100644
--- a/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl
+++ b/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl
@@ -48,9 +48,8 @@ end_per_suite(_Config) ->
 set_special_configs(Config) ->
     fun
         (emqx_ft) ->
-            ok = emqx_config:put([file_transfer, storage], #{
-                type => local, root => emqx_ft_test_helpers:ft_root(Config, node())
-            });
+            Root = emqx_ft_test_helpers:ft_root(Config, node()),
+            emqx_ft_test_helpers:load_config(#{storage => #{type => local, root => Root}});
         (_) ->
             ok
     end.
diff --git a/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl b/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl
index a83d915e6..37ac7eedf 100644
--- a/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl
+++ b/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl
@@ -40,19 +40,9 @@ init_per_testcase(TC, Config) ->
     ok = emqx_common_test_helpers:start_app(
         emqx_ft,
         fun(emqx_ft) ->
-            emqx_common_test_helpers:load_config(
-                emqx_ft_schema,
-                iolist_to_binary([
-                    "file_transfer {"
-                    "  storage = {"
-                    "    type = \"local\","
-                    "    root = \"",
-                    mk_root(TC, Config),
-                    "\""
-                    "  }"
-                    "}"
-                ])
-            )
+            emqx_ft_test_helpers:load_config(#{
+                storage => #{type => local, root => mk_root(TC, Config)}
+            })
         end
     ),
     Config.
diff --git a/apps/emqx_ft/test/emqx_ft_test_helpers.erl b/apps/emqx_ft/test/emqx_ft_test_helpers.erl
index f054be762..b756f8034 100644
--- a/apps/emqx_ft/test/emqx_ft_test_helpers.erl
+++ b/apps/emqx_ft/test/emqx_ft_test_helpers.erl
@@ -30,9 +30,7 @@ start_additional_node(Config, Name) ->
             {configure_gen_rpc, true},
             {env_handler, fun
                 (emqx_ft) ->
-                    ok = emqx_config:put([file_transfer, storage], #{
-                        type => local, root => ft_root(Config, node())
-                    });
+                    load_config(#{storage => #{type => local, root => ft_root(Config, node())}});
                 (_) ->
                     ok
             end}
@@ -45,6 +43,9 @@ stop_additional_node(Node) ->
     ok = emqx_common_test_helpers:stop_slave(Node),
     ok.
 
+load_config(Config) ->
+    emqx_common_test_helpers:load_config(emqx_ft_schema, #{file_transfer => Config}).
+
 tcp_port(Node) ->
     {_, Port} = rpc:call(Node, emqx_config, get, [[listeners, tcp, default, bind]]),
     Port.