From 801e99fcbbfd667fb3d8779782a6d9fb214d1685 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 18 Nov 2008 22:41:04 +0000 Subject: We have SRV resolving \o/ --- tests/test.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') diff --git a/tests/test.lua b/tests/test.lua index c028e859..aa0275d4 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -83,3 +83,4 @@ end dotest "util.jid" dotest "core.stanza_router" +dotest "core.s2smanager" -- cgit v1.2.3 From 9a9a31d0f260ef43efff76a765c4b296fe262e90 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 Nov 2008 21:02:49 +0000 Subject: Update unit testing to output coverage reports --- tests/reports/empty | 1 + tests/test.lua | 67 ++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 tests/reports/empty (limited to 'tests') diff --git a/tests/reports/empty b/tests/reports/empty new file mode 100644 index 00000000..0e3c9a08 --- /dev/null +++ b/tests/reports/empty @@ -0,0 +1 @@ +This file was intentionally left blank. diff --git a/tests/test.lua b/tests/test.lua index aa0275d4..b3d53589 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -1,4 +1,11 @@ +function run_all_tests() + dotest "util.jid" + dotest "core.stanza_router" + dotest "core.s2smanager" + dotest "core.configmanager" +end + local verbosity = tonumber(arg[1]) or 2; package.path = package.path..";../?.lua"; @@ -36,7 +43,8 @@ function dotest(unitname) local unit = setmetatable({}, { __index = setmetatable({ module = function () end }, { __index = _G }) }); - local chunk, err = loadfile("../"..unitname:gsub("%.", "/")..".lua"); + local fn = "../"..unitname:gsub("%.", "/")..".lua"; + local chunk, err = loadfile(fn); if not chunk then print("WARNING: ", "Failed to load module: "..unitname, err); return; @@ -50,21 +58,29 @@ function dotest(unitname) end for name, f in pairs(unit) do + local test = rawget(tests, name); if type(f) ~= "function" then if verbosity >= 3 then print("INFO: ", "Skipping "..unitname.."."..name.." because it is not a function"); end - elseif type(tests[name]) ~= "function" then + elseif type(test) ~= "function" then if verbosity >= 1 then print("WARNING: ", unitname.."."..name.." has no test!"); end else - local success, ret = pcall(tests[name], f, unit); + local line_hook, line_info = new_line_coverage_monitor(fn); + debug.sethook(line_hook, "l") + local success, ret = pcall(test, f, unit); + debug.sethook(); if not success then print("TEST FAILED! Unit: ["..unitname.."] Function: ["..name.."]"); print(" Location: "..ret:gsub(":%s*\n", "\n")); + line_info(name, false); elseif verbosity >= 2 then print("TEST SUCCEEDED: ", unitname, name); + print(string.format("TEST COVERED %d/%d lines", line_info(name, true))); + else + line_info(name, success); end end end @@ -81,6 +97,45 @@ function runtest(f, msg) end end -dotest "util.jid" -dotest "core.stanza_router" -dotest "core.s2smanager" +function new_line_coverage_monitor(file) + local lines_hit, funcs_hit = {}, {}; + local total_lines, covered_lines = 0, 0; + + for line in io.lines(file) do + total_lines = total_lines + 1; + end + + return function (event, line) -- Line hook + if not lines_hit[line] then + local info = debug.getinfo(2, "fSL") + if not info.source:find(file) then return; end + if not funcs_hit[info.func] and info.activelines then + funcs_hit[info.func] = true; + for line in pairs(info.activelines) do + lines_hit[line] = false; -- Marks it as hittable, but not hit yet + end + end + if lines_hit[line] == false then + --print("New line hit: "..line.." in "..debug.getinfo(2, "S").source); + lines_hit[line] = true; + covered_lines = covered_lines + 1; + end + end + end, + function (test_name, success) -- Get info + local fn = file:gsub("^%W*", ""); + local total_active_lines = 0; + local coverage_file = io.open("reports/coverage_"..fn:gsub("%W+", "_")..".report", "a+"); + for line, active in pairs(lines_hit) do + if active ~= nil then total_active_lines = total_active_lines + 1; end + if coverage_file then + if active == false then coverage_file:write(fn, "|", line, "|", name or "", "|miss\n"); + else coverage_file:write(fn, "|", line, "|", name or "", "|", tostring(success), "\n"); end + end + end + if coverage_file then coverage_file:close(); end + return covered_lines, total_active_lines, lines_hit; + end +end + +run_all_tests() -- cgit v1.2.3 From 662dd712f25c9d4643ac27d21e3bb8395b875645 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 Nov 2008 21:04:46 +0000 Subject: Add run_tests.sh --- tests/run_tests.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 tests/run_tests.sh (limited to 'tests') diff --git a/tests/run_tests.sh b/tests/run_tests.sh new file mode 100755 index 00000000..d93cd39b --- /dev/null +++ b/tests/run_tests.sh @@ -0,0 +1,3 @@ +#!/bin/sh +rm reports/*.report +lua test.lua $* -- cgit v1.2.3 From 08f20e796a3f8e94eabccd8215abe1b402b6203a Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 Nov 2008 21:06:27 +0000 Subject: Oops, never added the tests for s2smanager to the repo --- tests/test_core_s2smanager.lua | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tests/test_core_s2smanager.lua (limited to 'tests') diff --git a/tests/test_core_s2smanager.lua b/tests/test_core_s2smanager.lua new file mode 100644 index 00000000..69715b26 --- /dev/null +++ b/tests/test_core_s2smanager.lua @@ -0,0 +1,38 @@ +function compare_srv_priorities(csp) + local r1 = { priority = 10, weight = 0 } + local r2 = { priority = 100, weight = 0 } + local r3 = { priority = 1000, weight = 2 } + local r4 = { priority = 1000, weight = 2 } + local r5 = { priority = 1000, weight = 5 } + + assert_equal(csp(r1, r1), false); + assert_equal(csp(r1, r2), true); + assert_equal(csp(r1, r3), true); + assert_equal(csp(r1, r4), true); + assert_equal(csp(r1, r5), true); + + assert_equal(csp(r2, r1), false); + assert_equal(csp(r2, r2), false); + assert_equal(csp(r2, r3), true); + assert_equal(csp(r2, r4), true); + assert_equal(csp(r2, r5), true); + + assert_equal(csp(r3, r1), false); + assert_equal(csp(r3, r2), false); + assert_equal(csp(r3, r3), false); + assert_equal(csp(r3, r4), false); + assert_equal(csp(r3, r5), true); + + assert_equal(csp(r4, r1), false); + assert_equal(csp(r4, r2), false); + assert_equal(csp(r4, r3), false); + assert_equal(csp(r4, r4), false); + assert_equal(csp(r4, r5), true); + + assert_equal(csp(r5, r1), false); + assert_equal(csp(r5, r2), false); + assert_equal(csp(r5, r3), false); + assert_equal(csp(r5, r4), false); + assert_equal(csp(r5, r5), false); + +end -- cgit v1.2.3 From 48e7f5ea649e858d59afdf5331cd6f30364abe80 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 21 Nov 2008 05:02:53 +0000 Subject: Improve jid.split() and jid.bare() to pass new test cases with invalid JIDs --- tests/test_util_jid.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'tests') diff --git a/tests/test_util_jid.lua b/tests/test_util_jid.lua index 1dbd72b7..7a616008 100644 --- a/tests/test_util_jid.lua +++ b/tests/test_util_jid.lua @@ -11,4 +11,24 @@ function split(split) test("server", nil, "server", nil ); test("server/resource", nil, "server", "resource" ); test(nil, nil, nil , nil ); + + test("node@/server", nil, nil, nil , nil ); +end + +function bare(bare) + assert_equal(bare("user@host"), "user@host", "bare JID remains bare"); + assert_equal(bare("host"), "host", "Host JID remains host"); + assert_equal(bare("host/resource"), "host", "Host JID with resource becomes host"); + assert_equal(bare("user@host/resource"), "user@host", "user@host JID with resource becomes user@host"); + assert_equal(bare("user@/resource"), nil, "invalid JID is nil"); + assert_equal(bare("@/resource"), nil, "invalid JID is nil"); + assert_equal(bare("@/"), nil, "invalid JID is nil"); + assert_equal(bare("/"), nil, "invalid JID is nil"); + assert_equal(bare(""), nil, "invalid JID is nil"); + assert_equal(bare("@"), nil, "invalid JID is nil"); + assert_equal(bare("user@"), nil, "invalid JID is nil"); + assert_equal(bare("user@@"), nil, "invalid JID is nil"); + assert_equal(bare("user@@host"), nil, "invalid JID is nil"); + assert_equal(bare("user@@host/resource"), nil, "invalid JID is nil"); + assert_equal(bare("user@host/"), nil, "invalid JID is nil"); end -- cgit v1.2.3 From 44545470c0eaf520763107c5d1d298bc872c802f Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 21 Nov 2008 05:46:15 +0000 Subject: Update test.lua with a work-in-progress --- tests/test.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/test.lua b/tests/test.lua index b3d53589..33af3e98 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -75,12 +75,12 @@ function dotest(unitname) if not success then print("TEST FAILED! Unit: ["..unitname.."] Function: ["..name.."]"); print(" Location: "..ret:gsub(":%s*\n", "\n")); - line_info(name, false); + line_info(name, false, report_file); elseif verbosity >= 2 then print("TEST SUCCEEDED: ", unitname, name); - print(string.format("TEST COVERED %d/%d lines", line_info(name, true))); + print(string.format("TEST COVERED %d/%d lines", line_info(name, true, report_file))); else - line_info(name, success); + line_info(name, success, report_file); end end end -- cgit v1.2.3 From ede1bd83a82243ffd64b44bd4fda445f8eb97a2c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 21 Nov 2008 05:47:27 +0000 Subject: Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) --- tests/test_core_configmanager.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/test_core_configmanager.lua (limited to 'tests') diff --git a/tests/test_core_configmanager.lua b/tests/test_core_configmanager.lua new file mode 100644 index 00000000..099ff3c3 --- /dev/null +++ b/tests/test_core_configmanager.lua @@ -0,0 +1,28 @@ + +function get(get, config) + config.set("example.com", "test", "testkey", 123); + assert_equal(get("example.com", "test", "testkey"), 123, "Retrieving a set key"); + + config.set("*", "test", "testkey1", 321); + assert_equal(get("*", "test", "testkey1"), 321, "Retrieving a set global key"); + assert_equal(get("example.com", "test", "testkey1"), 321, "Retrieving a set key of undefined host, of which only a globally set one exists"); + + config.set("example.com", "test", ""); -- Creates example.com host in config + assert_equal(get("example.com", "test", "testkey1"), 321, "Retrieving a set key, of which only a globally set one exists"); + + assert_equal(get(), nil, "No parameters to get()"); + assert_equal(get("undefined host"), nil, "Getting for undefined host"); + assert_equal(get("undefined host", "undefined section"), nil, "Getting for undefined host & section"); + assert_equal(get("undefined host", "undefined section", "undefined key"), nil, "Getting for undefined host & section & key"); + + assert_equal(get("example.com", "undefined section", "testkey"), nil, "Defined host, undefined section"); +end + +function set(set, u) + assert_equal(set("*"), false, "Set with no section/key"); + assert_equal(set("*", "set_test"), false, "Set with no key"); + + assert_equal(set("*", "set_test", "testkey"), true, "Setting a nil global value"); + assert_equal(set("*", "set_test", "testkey", 123), true, "Setting a global value"); +end + -- cgit v1.2.3