tests: Have fake module() set _M to satisfy some modules

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index 0d69d08bcc9a25f640736c08a9ccf8d72d98dd8f..4f41cd1db369397cf19834e6fa9b893b10106c23 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,37 +1,34 @@
--- Prosody IM v0.1
--- 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.
 --
 
 
 
 function run_all_tests()
        dotest "util.jid"
+       dotest "util.multitable"
+       dotest "core.modulemanager"
        dotest "core.stanza_router"
        dotest "core.s2smanager"
        dotest "core.configmanager"
-       
+       dotest "util.stanza"
+               
        dosingletest("test_sasl.lua", "latin1toutf8");
 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
 
 require "util.import"
 
@@ -40,14 +37,34 @@ function testlib_new_env(t)
        return setmetatable(t or {}, env_mt);
 end
 
-function assert_equal(a, b, message)
+function assert_equal(a, b, message, level)
        if not (a == b) then
-               error("\n   assert_equal failed: "..tostring(a).." ~= "..tostring(b)..(message and ("\n   Message: "..message) or ""), 2);
+               error("\n   assert_equal failed: "..tostring(a).." ~= "..tostring(b)..(message and ("\n   Message: "..message) or ""), (level or 1) + 1);
        elseif verbosity >= 4 then
                print("assert_equal succeeded: "..tostring(a).." == "..tostring(b));
        end
 end
 
+function assert_table(a, message, level)
+       assert_equal(type(a), "table", message, (level or 1) + 1);
+end
+function assert_function(a, message, level)
+       assert_equal(type(a), "function", message, (level or 1) + 1);
+end
+function assert_string(a, message, level)
+       assert_equal(type(a), "string", message, (level or 1) + 1);
+end
+function assert_boolean(a, message)
+       assert_equal(type(a), "boolean", message);
+end
+function assert_is(a, message)
+       assert_equal(not not a, true, message);
+end
+function assert_is_not(a, message)
+       assert_equal(not not a, false, message);
+end
+
+
 function dosingletest(testname, fname)
        local tests = setmetatable({}, { __index = _G });
        tests.__unit = testname;
@@ -102,7 +119,7 @@ function dotest(unitname)
                return;
        end
        
-       local unit = setmetatable({}, { __index = setmetatable({ module = function () end }, { __index = _G }) });
+       local unit = setmetatable({}, { __index = setmetatable({ module = function () _M = getfenv(2); end }, { __index = _G }) });
 
        local fn = "../"..unitname:gsub("%.", "/")..".lua";
        local chunk, err = loadfile(fn);
@@ -152,7 +169,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