Fri, 05 Dec 2008 05:28:16 +0000
Fix the last couple of places where we send strings from mod_dialback
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
1 | -- Prosody IM v0.1 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
2 | -- Copyright (C) 2008 Matthew Wild |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
3 | -- Copyright (C) 2008 Waqas Hussain |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
4 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
5 | -- This program is free software; you can redistribute it and/or |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
6 | -- modify it under the terms of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
7 | -- as published by the Free Software Foundation; either version 2 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
8 | -- of the License, or (at your option) any later version. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
9 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
10 | -- This program is distributed in the hope that it will be useful, |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
11 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
12 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
13 | -- GNU General Public License for more details. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
14 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
15 | -- You should have received a copy of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
16 | -- along with this program; if not, write to the Free Software |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
17 | -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
18 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
19 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
509
diff
changeset
|
20 | |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
21 | |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
22 | function run_all_tests() |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
23 | dotest "util.jid" |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
24 | dotest "core.stanza_router" |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
25 | dotest "core.s2smanager" |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
26 | dotest "core.configmanager" |
509
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
27 | |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
28 | dosingletest("test_sasl.lua", "latin1toutf8"); |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
29 | end |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
30 | |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
31 | local verbosity = tonumber(arg[1]) or 2; |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 | |
271
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
33 | package.path = package.path..";../?.lua"; |
470
2f9d42fdeffa
Also look for binary modules in the parent directory when running tests
Matthew Wild <mwild1@gmail.com>
parents:
370
diff
changeset
|
34 | package.cpath = package.cpath..";../?.so"; |
271
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
35 | |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
36 | require "util.import" |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
37 | |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
38 | local env_mt = { __index = function (t,k) return rawget(_G, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end }; |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
39 | function testlib_new_env(t) |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
40 | return setmetatable(t or {}, env_mt); |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
41 | end |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
42 | |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
43 | function assert_equal(a, b, message) |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
44 | if not (a == b) then |
271
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
45 | error("\n assert_equal failed: "..tostring(a).." ~= "..tostring(b)..(message and ("\n Message: "..message) or ""), 2); |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
46 | elseif verbosity >= 4 then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 | print("assert_equal succeeded: "..tostring(a).." == "..tostring(b)); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
48 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
49 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
50 | |
509
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
51 | function dosingletest(testname, fname) |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
52 | local tests = setmetatable({}, { __index = _G }); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
53 | tests.__unit = testname; |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
54 | tests.__test = fname; |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
55 | local chunk, err = loadfile(testname); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
56 | if not chunk then |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
57 | print("WARNING: ", "Failed to load tests for "..testname, err); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
58 | return; |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
59 | end |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
60 | |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
61 | setfenv(chunk, tests); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
62 | local success, err = pcall(chunk); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
63 | if not success then |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
64 | print("WARNING: ", "Failed to initialise tests for "..testname, err); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
65 | return; |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
66 | end |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
67 | |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
68 | if type(tests[fname]) ~= "function" then |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
69 | error(testname.." has no test '"..fname.."'", 0); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
70 | end |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
71 | |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
72 | |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
73 | local line_hook, line_info = new_line_coverage_monitor(testname); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
74 | debug.sethook(line_hook, "l") |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
75 | local success, ret = pcall(tests[fname]); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
76 | debug.sethook(); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
77 | if not success then |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
78 | print("TEST FAILED! Unit: ["..testname.."] Function: ["..fname.."]"); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
79 | print(" Location: "..ret:gsub(":%s*\n", "\n")); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
80 | line_info(fname, false, report_file); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
81 | elseif verbosity >= 2 then |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
82 | print("TEST SUCCEEDED: ", testname, fname); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
83 | print(string.format("TEST COVERED %d/%d lines", line_info(fname, true, report_file))); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
84 | else |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
85 | line_info(name, success, report_file); |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
86 | end |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
87 | end |
32899c8a6fe5
Add test for latin1toutf8 (which passes)
Matthew Wild <mwild1@gmail.com>
parents:
470
diff
changeset
|
88 | |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
89 | function dotest(unitname) |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
90 | local tests = setmetatable({}, { __index = _G }); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
91 | tests.__unit = unitname; |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
92 | local chunk, err = loadfile("test_"..unitname:gsub("%.", "_")..".lua"); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
93 | if not chunk then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
94 | print("WARNING: ", "Failed to load tests for "..unitname, err); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
95 | return; |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
96 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
97 | |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
98 | setfenv(chunk, tests); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
99 | local success, err = pcall(chunk); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
100 | if not success then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
101 | print("WARNING: ", "Failed to initialise tests for "..unitname, err); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
102 | return; |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
103 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
104 | |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
105 | local unit = setmetatable({}, { __index = setmetatable({ module = function () end }, { __index = _G }) }); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
106 | |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
107 | local fn = "../"..unitname:gsub("%.", "/")..".lua"; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
108 | local chunk, err = loadfile(fn); |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
109 | if not chunk then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
110 | print("WARNING: ", "Failed to load module: "..unitname, err); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
111 | return; |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
112 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
113 | |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
114 | setfenv(chunk, unit); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
115 | local success, err = pcall(chunk); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
116 | if not success then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
117 | print("WARNING: ", "Failed to initialise module: "..unitname, err); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
118 | return; |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
119 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
120 | |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
121 | for name, f in pairs(unit) do |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
122 | local test = rawget(tests, name); |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
123 | if type(f) ~= "function" then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
124 | if verbosity >= 3 then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
125 | print("INFO: ", "Skipping "..unitname.."."..name.." because it is not a function"); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
126 | end |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
127 | elseif type(test) ~= "function" then |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
128 | if verbosity >= 1 then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
129 | print("WARNING: ", unitname.."."..name.." has no test!"); |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
130 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
131 | else |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
132 | local line_hook, line_info = new_line_coverage_monitor(fn); |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
133 | debug.sethook(line_hook, "l") |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
134 | local success, ret = pcall(test, f, unit); |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
135 | debug.sethook(); |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
136 | if not success then |
271
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
137 | print("TEST FAILED! Unit: ["..unitname.."] Function: ["..name.."]"); |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
138 | print(" Location: "..ret:gsub(":%s*\n", "\n")); |
370
9ade55e059ea
Update test.lua with a work-in-progress
Matthew Wild <mwild1@gmail.com>
parents:
361
diff
changeset
|
139 | line_info(name, false, report_file); |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
140 | elseif verbosity >= 2 then |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
141 | print("TEST SUCCEEDED: ", unitname, name); |
370
9ade55e059ea
Update test.lua with a work-in-progress
Matthew Wild <mwild1@gmail.com>
parents:
361
diff
changeset
|
142 | print(string.format("TEST COVERED %d/%d lines", line_info(name, true, report_file))); |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
143 | else |
370
9ade55e059ea
Update test.lua with a work-in-progress
Matthew Wild <mwild1@gmail.com>
parents:
361
diff
changeset
|
144 | line_info(name, success, report_file); |
28
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
145 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
146 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
147 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
148 | end |
4a238233f278
Adding initial unit testing scripts
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
149 | |
271
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
150 | function runtest(f, msg) |
301
fcb7e63630ae
Warn when subtest function does not exist
Matthew Wild <mwild1@gmail.com>
parents:
271
diff
changeset
|
151 | if not f then print("SUBTEST NOT FOUND: "..(msg or "(no description)")); return; end |
271
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
152 | local success, ret = pcall(f); |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
153 | if success and verbosity >= 2 then |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
154 | print("SUBTEST PASSED: "..(msg or "(no description)")); |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
155 | elseif (not success) and verbosity >= 1 then |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
156 | print("SUBTEST FAILED: "..(msg or "(no description)")); |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
157 | error(ret, 0); |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
158 | end |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
159 | end |
396edd2f9d2e
Some fixes for our test runner
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
160 | |
361
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
161 | function new_line_coverage_monitor(file) |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
162 | local lines_hit, funcs_hit = {}, {}; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
163 | local total_lines, covered_lines = 0, 0; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
164 | |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
165 | for line in io.lines(file) do |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
166 | total_lines = total_lines + 1; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
167 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
168 | |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
169 | return function (event, line) -- Line hook |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
170 | if not lines_hit[line] then |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
171 | local info = debug.getinfo(2, "fSL") |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
172 | if not info.source:find(file) then return; end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
173 | if not funcs_hit[info.func] and info.activelines then |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
174 | funcs_hit[info.func] = true; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
175 | for line in pairs(info.activelines) do |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
176 | lines_hit[line] = false; -- Marks it as hittable, but not hit yet |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
177 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
178 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
179 | if lines_hit[line] == false then |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
180 | --print("New line hit: "..line.." in "..debug.getinfo(2, "S").source); |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
181 | lines_hit[line] = true; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
182 | covered_lines = covered_lines + 1; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
183 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
184 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
185 | end, |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
186 | function (test_name, success) -- Get info |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
187 | local fn = file:gsub("^%W*", ""); |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
188 | local total_active_lines = 0; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
189 | local coverage_file = io.open("reports/coverage_"..fn:gsub("%W+", "_")..".report", "a+"); |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
190 | for line, active in pairs(lines_hit) do |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
191 | if active ~= nil then total_active_lines = total_active_lines + 1; end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
192 | if coverage_file then |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
193 | if active == false then coverage_file:write(fn, "|", line, "|", name or "", "|miss\n"); |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
194 | else coverage_file:write(fn, "|", line, "|", name or "", "|", tostring(success), "\n"); end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
195 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
196 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
197 | if coverage_file then coverage_file:close(); end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
198 | return covered_lines, total_active_lines, lines_hit; |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
199 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
200 | end |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
201 | |
a2d83b04d769
Update unit testing to output coverage reports
Matthew Wild <mwild1@gmail.com>
parents:
337
diff
changeset
|
202 | run_all_tests() |