Merge 0.10->trunk

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index de1e40fd8bb96166154cf78f16a6ccc08d2dac81..d6aa3b31937cca3de906fc75c03bc003590c2fc6 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,26 +1,35 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- 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()
        package.loaded["net.connlisteners"] = { get = function () return {} end };
        dotest "util.jid"
        dotest "util.multitable"
-       dotest "util.rfc3484"
-       dotest "net.http"
-       dotest "core.modulemanager"
+       dotest "util.rfc6724"
+       dotest "util.http"
        dotest "core.stanza_router"
        dotest "core.s2smanager"
        dotest "core.configmanager"
+       dotest "util.ip"
+       dotest "util.json"
        dotest "util.stanza"
        dotest "util.sasl.scram"
-       
+       dotest "util.async"
+       dotest "util.cache"
+       dotest "util.throttle"
+       dotest "util.uuid"
+       dotest "util.random"
+       dotest "util.xml"
+       dotest "util.xmppstream"
+       dotest "net.http.parser"
+
        dosingletest("test_sasl.lua", "latin1toutf8");
        dosingletest("test_utf8.lua", "valid");
 end
@@ -39,6 +48,8 @@ local _realG = _G;
 
 require "util.import"
 
+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);
@@ -76,29 +87,29 @@ function dosingletest(testname, fname)
        local tests = setmetatable({}, { __index = _realG });
        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
 
-       setfenv(chunk, tests);
        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
-       
-       
+
+
        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);
@@ -115,13 +126,12 @@ function dotest(unitname)
        _fakeG._G = _fakeG;
        local tests = setmetatable({}, { __index = _fakeG });
        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
 
-       setfenv(chunk, tests);
        local success, err = pcall(chunk);
        if not success then
                print("WARNING: ", "Failed to initialise tests for "..unitname, err);
@@ -130,22 +140,30 @@ function dotest(unitname)
        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 chunk, err = loadfile(fn);
+       local chunk, err = envloadfile(fn, unit);
        if not chunk then
                print("WARNING: ", "Failed to load module: "..unitname, err);
                return;
        end
-       
+
        local oldmodule, old_M = _fakeG.module, _fakeG._M;
-       _fakeG.module = function () _M = _G end
-       setfenv(chunk, unit);
-       local success, err = pcall(chunk);
+       _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
-               print("WARNING: ", "Failed to initialise module: "..unitname, err);
+               print("WARNING: ", "Failed to initialise module: "..unitname, ret);
                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
@@ -165,6 +183,7 @@ function dotest(unitname)
                        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);
@@ -184,6 +203,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
+               tests_passed = false;
                print("SUBTEST FAILED: "..(msg or "(no description)"));
                error(ret, 0);
        end
@@ -192,11 +212,11 @@ end
 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")
@@ -231,3 +251,5 @@ function new_line_coverage_monitor(file)
 end
 
 run_all_tests()
+
+os.exit(tests_passed and 0 or 1);