X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tests%2Ftest.lua;h=78f2b234e3b3b5d5c6c2c76dfbc0981210ccad2e;hb=e79fcdc14be15b1625b0730499b40c4fc214e252;hp=b6728061e7ed9332cfb62a53c1495ebb259df917;hpb=144a8fcd7ebdecc38249ef76af97df4807bbeef5;p=prosody.git diff --git a/tests/test.lua b/tests/test.lua index b6728061..78f2b234 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -1,7 +1,7 @@ -- 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. -- @@ -20,8 +20,9 @@ function run_all_tests() dotest "util.ip" dotest "util.stanza" dotest "util.sasl.scram" - + dosingletest("test_sasl.lua", "latin1toutf8"); + dosingletest("test_utf8.lua", "valid"); end local verbosity = tonumber(arg[1]) or 2; @@ -87,12 +88,12 @@ function dosingletest(testname, fname) 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]); @@ -134,7 +135,7 @@ function dotest(unitname) print("WARNING: ", "Failed to load module: "..unitname, err); return; end - + local oldmodule, old_M = _fakeG.module, _fakeG._M; _fakeG.module = function () _M = unit end setfenv(chunk, unit); @@ -144,7 +145,7 @@ function dotest(unitname) print("WARNING: ", "Failed to initialise module: "..unitname, err); return; end - + if type(ret) == "table" then for k,v in pairs(ret) do unit[k] = v; @@ -197,11 +198,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")