X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tests%2Ftest.lua;h=ae5b24f03cb6b17e8d761ef16313b3dd5ac83dda;hb=3ed4e3558886c23e81ea262a195d36d5942785d4;hp=0955967d54020cfdad021931540b385a649c6305;hpb=8a6a7668b61b7c7a9a533f407e2610e90aa8a1a5;p=prosody.git

diff --git a/tests/test.lua b/tests/test.lua
index 0955967d..ae5b24f0 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.3
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- 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.
@@ -11,22 +11,31 @@
 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"
-		
+	dotest "util.sasl.scram"
+	
 	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
+
+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
@@ -60,7 +69,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);
@@ -98,7 +107,9 @@ function dosingletest(testname, fname)
 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;
 	local chunk, err = loadfile("test_"..unitname:gsub("%.", "_")..".lua");
 	if not chunk then
@@ -112,18 +123,20 @@ function dotest(unitname)
 		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 chunk, err = loadfile(fn);
 	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, _fakeG._M = oldmodule, old_M;
 	if not success then
 		print("WARNING: ", "Failed to initialise module: "..unitname, err);
 		return;
@@ -140,6 +153,9 @@ function dotest(unitname)
 				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);
@@ -163,7 +179,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
@@ -201,7 +217,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
-					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