# HG changeset patch # User Matthew Wild # Date 1228071443 0 # Node ID 32899c8a6fe5911348e74e15dfec6f8aec7c4791 # Parent 4fd60ae97535ca877246daba98b586ea379c099c Add test for latin1toutf8 (which passes) diff -r 4fd60ae97535 -r 32899c8a6fe5 tests/test.lua --- a/tests/test.lua Sun Nov 30 17:34:47 2008 +0100 +++ b/tests/test.lua Sun Nov 30 18:57:23 2008 +0000 @@ -4,6 +4,8 @@ dotest "core.stanza_router" dotest "core.s2smanager" dotest "core.configmanager" + + dosingletest("test_sasl.lua", "latin1toutf8"); end local verbosity = tonumber(arg[1]) or 2; @@ -26,6 +28,44 @@ end end +function dosingletest(testname, fname) + local tests = setmetatable({}, { __index = _G }); + tests.__unit = testname; + tests.__test = fname; + local chunk, err = loadfile(testname); + 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 + print("TEST FAILED! Unit: ["..testname.."] Function: ["..fname.."]"); + print(" Location: "..ret:gsub(":%s*\n", "\n")); + line_info(fname, false, report_file); + elseif verbosity >= 2 then + print("TEST SUCCEEDED: ", testname, fname); + print(string.format("TEST COVERED %d/%d lines", line_info(fname, true, report_file))); + else + line_info(name, success, report_file); + end +end + function dotest(unitname) local tests = setmetatable({}, { __index = _G }); tests.__unit = unitname; diff -r 4fd60ae97535 -r 32899c8a6fe5 tests/test_sasl.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test_sasl.lua Sun Nov 30 18:57:23 2008 +0000 @@ -0,0 +1,36 @@ +--- WARNING! --- +-- This file contains a mix of encodings below. +-- Many editors will unquestioningly convert these for you. +-- Please be careful :( (I recommend Scite) +--------------------------------- + +local gmatch = string.gmatch; +local t_concat, t_insert = table.concat, table.insert; +local to_byte, to_char = string.byte, string.char; + +local function _latin1toutf8(str) + if not str then return str; end + local p = {}; + for ch in gmatch(str, ".") do + ch = to_byte(ch); + if (ch < 0x80) then + t_insert(p, to_char(ch)); + elseif (ch < 0xC0) then + t_insert(p, to_char(0xC2, ch)); + else + t_insert(p, to_char(0xC3, ch - 64)); + end + end + return t_concat(p); + end + +function latin1toutf8() + local function assert_utf8(latin, utf8) + assert_equal(_latin1toutf8(latin), utf8, "Incorrect UTF8 from Latin1: "..tostring(latin)); + end + + assert_utf8("", "") + assert_utf8("test", "test") + assert_utf8(nil, nil) + assert_utf8("foobar.råkat.se", "foobar.rÃ¥kat.se") +end