moved handle_fn_result

sbrl · Oct 18, 2024 · 2354e51 · 2354e51
1 parent 3d205fa
commit 2354e51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...ns_core/utils/format/handle_fn_result.lua → ...ommands/test/helpers/handle_fn_result.lua b/...ns_core/utils/format/handle_fn_result.lua → ...ommands/test/helpers/handle_fn_result.lua
diff --git a/worldeditadditions_commands/commands/test/test.lua b/worldeditadditions_commands/commands/test/test.lua
@@ -7,17 +7,20 @@
 local wea_c = worldeditadditions_core
 local wea_cmd = worldeditadditions_commands
 
-local test_dir = wea_cmd.modpath .. "/commands/test/tests/"
+local test_dir = wea_cmd.modpath .. "/commands/test/"
 
 -- Load tests with init function
-dofile(test_dir .. "init.lua")(test_dir)
+dofile(test_dir .. "tests/init.lua")(test_dir)
 local tests = worldeditadditions.normalize_test.get_registered_tests()
 
 -- Helper functions
 local set_colour = function(colour, text)
 	return minetest.colorize(colour, text)
 end
 
+local handle_fn_result = dofile(test_dir .. "helpers/handle_fn_result.lua")
+
+-- Main command
 wea_c.register_command("test", {
 	params = "list || <testname> <args> || help <testname>",
 	description = "Run a test or list all tests",
@@ -59,7 +62,7 @@ wea_c.register_command("test", {
 					tests[params_text[1]]:help()}, " ")
 			end
 		end
-		return wea_c.format.handle_fn_result(
+		return handle_fn_result(
 			tests[subcommand](name, params_text)
 		)
 	end

diff --git a/worldeditadditions_core/utils/format/init.lua b/worldeditadditions_core/utils/format/init.lua
@@ -4,7 +4,6 @@ local wea_c = worldeditadditions_core
 wea_c.format = {
 	array_2d = dofile(wea_c.modpath.."/utils/format/array_2d.lua"),
 	escape = dofile(wea_c.modpath.."/utils/format/escape.lua"),
-	handle_fn_result = dofile(wea_c.modpath.."/utils/format/handle_fn_result.lua"),
 	human_size = dofile(wea_c.modpath.."/utils/format/human_size.lua"),
 	human_time = dofile(wea_c.modpath.."/utils/format/human_time.lua"),
 	make_ascii_table = dofile(wea_c.modpath.."/utils/format/make_ascii_table.lua"),