projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge
[prosody.git]
/
tests
/
test.lua
diff --git
a/tests/test.lua
b/tests/test.lua
index 1efab37112ae09042c74c6ad93429e476b3b84d3..9ab2cad87d80c827025b0831c0d9e3c6efa36f97 100644
(file)
--- a/
tests/test.lua
+++ b/
tests/test.lua
@@
-1,22
+1,35
@@
--- Prosody IM
v0.3
--- Copyright (C) 2008-20
09
Matthew Wild
--- Copyright (C) 2008-20
09
Waqas Hussain
---
+-- Prosody IM
+-- Copyright (C) 2008-20
10
Matthew Wild
+-- Copyright (C) 2008-20
10
Waqas Hussain
+--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-
+local tests_passed = true;
function run_all_tests()
function run_all_tests()
+ package.loaded["net.connlisteners"] = { get = function () return {} end };
dotest "util.jid"
dotest "util.multitable"
dotest "util.jid"
dotest "util.multitable"
+ dotest "util.rfc6724"
+ dotest "util.http"
dotest "core.stanza_router"
dotest "core.s2smanager"
dotest "core.configmanager"
dotest "core.stanza_router"
dotest "core.s2smanager"
dotest "core.configmanager"
+ dotest "util.ip"
+ dotest "util.json"
dotest "util.stanza"
dotest "util.stanza"
-
+ dotest "util.sasl.scram"
+ dotest "util.cache"
+ dotest "util.throttle"
+ dotest "util.uuid"
+ dotest "util.random"
+ dotest "util.xml"
+ dotest "util.xmppstream"
+
dosingletest("test_sasl.lua", "latin1toutf8");
dosingletest("test_sasl.lua", "latin1toutf8");
+ dosingletest("test_utf8.lua", "valid");
end
local verbosity = tonumber(arg[1]) or 2;
end
local verbosity = tonumber(arg[1]) or 2;
@@
-29,9
+42,13
@@
else
package.cpath = package.cpath..";../?.so";
end
package.cpath = package.cpath..";../?.so";
end
+local _realG = _G;
+
require "util.import"
require "util.import"
-local env_mt = { __index = function (t,k) return rawget(_G, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end };
+local envloadfile = require "util.envload".envloadfile;
+
+local env_mt = { __index = function (t,k) return rawget(_realG, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end };
function testlib_new_env(t)
return setmetatable(t or {}, env_mt);
end
function testlib_new_env(t)
return setmetatable(t or {}, env_mt);
end
@@
-65,32
+82,32
@@
end
function dosingletest(testname, fname)
function dosingletest(testname, fname)
- local tests = setmetatable({}, { __index = _G });
+ local tests = setmetatable({}, { __index = _
real
G });
tests.__unit = testname;
tests.__test = fname;
tests.__unit = testname;
tests.__test = fname;
- local chunk, err =
loadfile(testname
);
+ local chunk, err =
envloadfile(testname, tests
);
if not chunk then
print("WARNING: ", "Failed to load tests for "..testname, err);
return;
end
if not chunk then
print("WARNING: ", "Failed to load tests for "..testname, err);
return;
end
- setfenv(chunk, tests);
local success, err = pcall(chunk);
if not success then
print("WARNING: ", "Failed to initialise tests for "..testname, err);
return;
end
local success, err = pcall(chunk);
if not success then
print("WARNING: ", "Failed to initialise tests for "..testname, err);
return;
end
-
+
if type(tests[fname]) ~= "function" then
error(testname.." has no test '"..fname.."'", 0);
end
if type(tests[fname]) ~= "function" then
error(testname.." has no test '"..fname.."'", 0);
end
-
-
+
+
local line_hook, line_info = new_line_coverage_monitor(testname);
debug.sethook(line_hook, "l")
local success, ret = pcall(tests[fname]);
debug.sethook();
if not success then
local line_hook, line_info = new_line_coverage_monitor(testname);
debug.sethook(line_hook, "l")
local success, ret = pcall(tests[fname]);
debug.sethook();
if not success then
+ tests_passed = false;
print("TEST FAILED! Unit: ["..testname.."] Function: ["..fname.."]");
print(" Location: "..ret:gsub(":%s*\n", "\n"));
line_info(fname, false, report_file);
print("TEST FAILED! Unit: ["..testname.."] Function: ["..fname.."]");
print(" Location: "..ret:gsub(":%s*\n", "\n"));
line_info(fname, false, report_file);
@@
-103,37
+120,48
@@
function dosingletest(testname, fname)
end
function dotest(unitname)
end
function dotest(unitname)
- local tests = setmetatable({}, { __index = _G });
+ local _fakeG = setmetatable({}, {__index = _realG});
+ _fakeG._G = _fakeG;
+ local tests = setmetatable({}, { __index = _fakeG });
tests.__unit = unitname;
tests.__unit = unitname;
- local chunk, err =
loadfile("test_"..unitname:gsub("%.", "_")..".lua"
);
+ local chunk, err =
envloadfile("test_"..unitname:gsub("%.", "_")..".lua", tests
);
if not chunk then
print("WARNING: ", "Failed to load tests for "..unitname, err);
return;
end
if not chunk then
print("WARNING: ", "Failed to load tests for "..unitname, err);
return;
end
- setfenv(chunk, tests);
local success, err = pcall(chunk);
if not success then
print("WARNING: ", "Failed to initialise tests for "..unitname, err);
return;
end
local success, err = pcall(chunk);
if not success then
print("WARNING: ", "Failed to initialise tests for "..unitname, err);
return;
end
-
- local unit = setmetatable({}, { __index = setmetatable({ module = function () end }, { __index = _G }) });
-
+ if tests.env then setmetatable(tests.env, { __index = _realG }); end
+ local unit = setmetatable({}, { __index = setmetatable({ _G = tests.env or _fakeG }, { __index = tests.env or _fakeG }) });
local fn = "../"..unitname:gsub("%.", "/")..".lua";
local fn = "../"..unitname:gsub("%.", "/")..".lua";
- local chunk, err =
loadfile(fn
);
+ local chunk, err =
envloadfile(fn, unit
);
if not chunk then
print("WARNING: ", "Failed to load module: "..unitname, err);
return;
end
if not chunk then
print("WARNING: ", "Failed to load module: "..unitname, err);
return;
end
- setfenv(chunk, unit);
- local success, err = pcall(chunk);
+ local oldmodule, old_M = _fakeG.module, _fakeG._M;
+ _fakeG.module = function ()
+ setmetatable(unit, nil);
+ unit._M = unit;
+ end
+ local success, ret = pcall(chunk);
+ _fakeG.module, _fakeG._M = oldmodule, old_M;
if not success then
if not success then
- print("WARNING: ", "Failed to initialise module: "..unitname,
err
);
+ print("WARNING: ", "Failed to initialise module: "..unitname,
ret
);
return;
end
return;
end
-
+
+ if type(ret) == "table" then
+ for k,v in pairs(ret) do
+ unit[k] = v;
+ end
+ end
+
for name, f in pairs(unit) do
local test = rawget(tests, name);
if type(f) ~= "function" then
for name, f in pairs(unit) do
local test = rawget(tests, name);
if type(f) ~= "function" then
@@
-145,11
+173,15
@@
function dotest(unitname)
print("WARNING: ", unitname.."."..name.." has no test!");
end
else
print("WARNING: ", unitname.."."..name.." has no test!");
end
else
+ if verbosity >= 4 then
+ print("INFO: ", "Testing "..unitname.."."..name);
+ end
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
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
+ tests_passed = false;
print("TEST FAILED! Unit: ["..unitname.."] Function: ["..name.."]");
print(" Location: "..ret:gsub(":%s*\n", "\n"));
line_info(name, false, report_file);
print("TEST FAILED! Unit: ["..unitname.."] Function: ["..name.."]");
print(" Location: "..ret:gsub(":%s*\n", "\n"));
line_info(name, false, report_file);
@@
-169,6
+201,7
@@
function runtest(f, msg)
if success and verbosity >= 2 then
print("SUBTEST PASSED: "..(msg or "(no description)"));
elseif (not success) and verbosity >= 0 then
if success and verbosity >= 2 then
print("SUBTEST PASSED: "..(msg or "(no description)"));
elseif (not success) and verbosity >= 0 then
+ tests_passed = false;
print("SUBTEST FAILED: "..(msg or "(no description)"));
error(ret, 0);
end
print("SUBTEST FAILED: "..(msg or "(no description)"));
error(ret, 0);
end
@@
-177,11
+210,11
@@
end
function new_line_coverage_monitor(file)
local lines_hit, funcs_hit = {}, {};
local total_lines, covered_lines = 0, 0;
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
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")
return function (event, line) -- Line hook
if not lines_hit[line] then
local info = debug.getinfo(2, "fSL")
@@
-206,7
+239,7
@@
function new_line_coverage_monitor(file)
for line, active in pairs(lines_hit) do
if active ~= nil then total_active_lines = total_active_lines + 1; end
if coverage_file then
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");
+ 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
else coverage_file:write(fn, "|", line, "|", name or "", "|", tostring(success), "\n"); end
end
end
@@
-216,3
+249,5
@@
function new_line_coverage_monitor(file)
end
run_all_tests()
end
run_all_tests()
+
+os.exit(tests_passed and 0 or 1);