better modify n show tests

Author: cryi

src/am.lua

@@ -239,10 +239,9 @@ function am.modify_file(mode, file, path, value)
 
 	-- try parse value as json/hjson
 	if type(value) == "string" then
-		local parsed_value, _ = hjson.parse(value)
-		if parsed_value ~= nil then
-			value = parsed_value
-		end
+		local parsed_value, err = hjson.parse(value)
+		ami_assert(err == nil, "failed to parse value: " .. tostring(err), EXIT_MODIFY_ERROR)
+		value = parsed_value
 	end
 
 	local ok, err = ami_util.modify_file(mode, file, path_parts, value)

src/ami/internals/util.lua

@@ -167,9 +167,10 @@ local function modify_add(current_value, new_value)
 end
 
 local function modify_remove(current_value, value_to_remove)
+	local equals = require"eli.util".equals
     if type(current_value) == "table" and table.is_array(current_value) then
         for i, v in ipairs(current_value) do
-            if v == value_to_remove then
+            if equals(v, value_to_remove, true) then
                 table.remove(current_value, i)
                 return current_value
             end
@@ -240,7 +241,10 @@ function util.modify_file(mode, file, path, value)
 	local new_value, err = modify_handlers[mode](current_value, value)
     if not new_value and err then return nil, "modification failed: " .. tostring(err) end
 
-	local result = table.set(content, path, new_value)
+	local result, err = table.set(content, path, new_value)
+	if err == "cannot set nested value on a non-table object" then
+		return nil, "cannot set nested value on a non-table value at path: " .. table.concat(path, ".")
+	end
     if not result then return nil, "failed to set new value in configuration" end
 
 	local new_raw_content, err = hjson.stringify(result, { indent = "\t", sort_keys = true })

tests/all.lua

@@ -14,6 +14,7 @@ require"tests.test.am-app"
 require"tests.test.cache"
 require"tests.test.ami"
 require"tests.test.interfaces"
+require"tests.test.modify_n_show"
 
 local ntests, nfailed = test.result()
 test.summary()

tests/test/ami.lua

@@ -45,72 +45,6 @@ local function init_ami_test(testDir, configPath, options)
     error_called = false
 end
 
-local function add_modify_and_show_test(test, mode, file, set_path, value)
-    test["modify and show: ".. tostring(mode or "--set") ..", ".. tostring(file) ..", ".. tostring(set_path) ..", ".. tostring(value)] = function()
-        local test_dir = "tests/tmp/ami_test_modify"
-        init_ami_test(test_dir, "tests/app/configs/ami_test_app@latest.hjson", { cleanupTestDir = true })
-
-        os.chdir(default_cwd)
-        if type(file) == "string" then
-            local file = path.combine(test_dir, file)
-            if not fs.exists(file) then
-                fs.write_file(file, "{}")
-            end
-        end
-
-        local cwd = os.cwd() or "."
-        local args = { "--log-level=error", "--path="..test_dir, "modify", set_path, value }
-        if type(file) == "string" then
-            table.insert(args, 4, "--file="..file)
-        end
-        if type(mode) == "string" then
-            table.insert(args, 4, "--"..mode)
-        end
-        ami(table.unpack(args))
-        os.chdir(cwd) -- restore cwd
-        local original_print = print
-        local printed = ""
-        print = function(...)
-            for _, v in ipairs({...}) do
-                printed = printed .. tostring(v) .. "\t"
-            end
-            printed = printed .. "\n"
-        end
-
-        local show_args = { "--log-level=error", "--path="..test_dir, "show"}
-        if type(file) == "string" then
-            table.insert(show_args, 4, "--file="..file)
-        end
-        ami(table.unpack(show_args))
-        print = original_print
-        os.chdir(default_cwd)
-        test.assert(not error_called)
-
-        local value_as_string = type(value) == "string" and value or hjson.stringify(value, { indent = false, sort_keys = true, invalid_objects_as_type = true })
-        if mode == "unset" or mode == "remove" then
-            test.assert(printed:match("null") or printed:match(value_as_string) == nil, "Unexpected value '" .. tostring(value) .. "' found in output: " .. printed)
-        else
-            test.assert(printed:match(value_as_string) ~= nil, "Expected value '" .. tostring(value) .. "' not found in output: " .. printed)
-        end
-    end
-end
-
-add_modify_and_show_test(test, "set", nil, "test", "123")
-add_modify_and_show_test(test, nil, nil, "test.new_value", "123")
-add_modify_and_show_test(test, "unset", nil, "test.new_value", nil)
-add_modify_and_show_test(test, "add", nil, "test", "item3")
-add_modify_and_show_test(test, "add", nil, "test.list", "item4")
-add_modify_and_show_test(test, "remove", nil, "test.list", "item4")
-add_modify_and_show_test(test, "remove", nil, "configuration.TEST_CONFIGURATION", "bool2")
-
-add_modify_and_show_test(test, "set", "test.hjson", "test", "123")
-add_modify_and_show_test(test, nil, "test.hjson", "test.new_value", "123")
-add_modify_and_show_test(test, "unset", "test.hjson", "test.new_value", nil)
-add_modify_and_show_test(test, "add", "test.hjson", "test", "item3")
-add_modify_and_show_test(test, "add", "test.hjson", "test.list", "item4")
-add_modify_and_show_test(test, "remove", "test.hjson", "test.list", "item4")
-add_modify_and_show_test(test, "remove", "test.hjson", "configuration.TEST_CONFIGURATION", "bool2")
-
 test["shallow"] = function()
     local test_dir = "tests/tmp/ami_test_shallow"
     init_ami_test(test_dir, "tests/app/configs/ami_test_app@latest.hjson", { cleanupTestDir = true })