summaryrefslogtreecommitdiffstats
path: root/src/imports/testlib/testlogger.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/testlib/testlogger.js')
-rw-r--r--src/imports/testlib/testlogger.js78
1 files changed, 6 insertions, 72 deletions
diff --git a/src/imports/testlib/testlogger.js b/src/imports/testlib/testlogger.js
index f556497..7fd33ca 100644
--- a/src/imports/testlib/testlogger.js
+++ b/src/imports/testlib/testlogger.js
@@ -49,67 +49,16 @@ function log_init_results()
{
if (!Qt.testResults) {
Qt.testResults = {
- suiteName: "",
reportedStart: false,
- numPassed: 0,
- numFailed: 0,
- numSkipped: 0,
nextId: 0,
- testCases: [],
- reporter: null
+ testCases: []
}
}
}
-function log_fail(testcase, msg)
-{
- if (!msg)
- msg = ""
- Qt.testResults.reporter.log_fail(testcase, msg);
- ++Qt.testResults.numFailed
-}
-
-function log_expect_fail(testcase, expectmsg, msg)
-{
- if (!msg)
- msg = ""
- if (expectmsg)
- Qt.testResults.reporter.log_expect_fail(testcase, expectmsg + " " + msg);
- else
- Qt.testResults.reporter.log_expect_fail(testcase, msg);
- ++Qt.testResults.numPassed
-}
-
-function log_expect_fail_pass(testcase)
-{
- Qt.testResults.reporter.log_expect_fail_pass(testcase);
- ++Qt.testResults.numFailed
-}
-
-function log_skip(testcase, msg)
-{
- if (!msg)
- msg = ""
- Qt.testResults.reporter.log_skip(testcase, msg);
- ++Qt.testResults.numSkipped
-}
-
-function log_pass(testcase)
-{
- Qt.testResults.reporter.log_pass(testcase);
- ++Qt.testResults.numPassed
-}
-
-function log_message(msg)
-{
- Qt.testResults.reporter.log_message(msg);
-}
-
function log_register_test(name)
{
log_init_results()
- if (name && !Qt.testResults.suiteName)
- Qt.testResults.suiteName = name
var testId = Qt.testResults.nextId++
Qt.testResults.testCases.push(testId)
return testId
@@ -131,34 +80,19 @@ function log_mandatory_test(testId)
Qt.testResults.testCases.push(testId)
}
-function log_start_test(reporter)
+function log_start_test()
{
log_init_results()
- Qt.testResults.reporter = reporter
if (Qt.testResults.reportedStart)
- return
+ return false
Qt.testResults.reportedStart = true
+ return true
}
-function log_complete_test(testId, reporter)
+function log_complete_test(testId)
{
var index = Qt.testResults.testCases.indexOf(testId)
if (index >= 0)
Qt.testResults.testCases.splice(index, 1)
- if (!Qt.testResults.testCases.length) {
- reporter.report(Qt.testResults.numPassed,
- Qt.testResults.numFailed,
- Qt.testResults.numSkipped)
- Qt.quit()
- }
-}
-
-function log_prefixed_name(name, funcname)
-{
- if (!name)
- name = Qt.testResults.suiteName
- if (name)
- return name + "::" + funcname + "()"
- else
- return funcname + "()"
+ return Qt.testResults.testCases.length > 0
}