Merge with 0.6

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index bc1e19793bf68ec69dbd7ec4c05286e39079c360..f5976a0285b0d99c984a61b71da54503759d74aa 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
@@ -22,6 +11,7 @@
 function run_all_tests()
        dotest "util.jid"
        dotest "util.multitable"
+       dotest "core.modulemanager"
        dotest "core.stanza_router"
        dotest "core.s2smanager"
        dotest "core.configmanager"
@@ -32,12 +22,19 @@ end
 
 local verbosity = tonumber(arg[1]) or 2;
 
-package.path = package.path..";../?.lua";
-package.cpath = package.cpath..";../?.so";
+if os.getenv("WINDIR") then
+       package.path = package.path..";..\\?.lua";
+       package.cpath = package.cpath..";..\\?.dll";
+else
+       package.path = package.path..";../?.lua";
+       package.cpath = package.cpath..";../?.so";
+end
+
+local _realG = _G;
 
 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 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
@@ -71,7 +68,7 @@ end
 
 
 function dosingletest(testname, fname)
-       local tests = setmetatable({}, { __index = _G });
+       local tests = setmetatable({}, { __index = _realG });
        tests.__unit = testname;
        tests.__test = fname;
        local chunk, err = loadfile(testname);
@@ -109,7 +106,7 @@ function dosingletest(testname, fname)
 end
 
 function dotest(unitname)
-       local tests = setmetatable({}, { __index = _G });
+       local tests = setmetatable({}, { __index = _realG });
        tests.__unit = unitname;
        local chunk, err = loadfile("test_"..unitname:gsub("%.", "_")..".lua");
        if not chunk then
@@ -124,8 +121,9 @@ function dotest(unitname)
                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 _G }, { __index = tests.env or _G }) });
+       unit._G = unit; _realG._G = unit;
        local fn = "../"..unitname:gsub("%.", "/")..".lua";
        local chunk, err = loadfile(fn);
        if not chunk then
@@ -174,7 +172,7 @@ function runtest(f, msg)
        local success, ret = pcall(f);
        if success and verbosity >= 2 then
                print("SUBTEST PASSED: "..(msg or "(no description)"));
-       elseif (not success) and verbosity >= 1 then
+       elseif (not success) and verbosity >= 0 then
                print("SUBTEST FAILED: "..(msg or "(no description)"));
                error(ret, 0);
        end