summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2013-05-26 18:38:58 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-27 00:41:46 +0200
commite9723d9d31e1ec8ce3d56fb143621841b9f3f794 (patch)
tree151038a6dcaff0b3f9d7cdc56ef30916e9aef4d6 /src/testlib
parentb571b6329b8dd51b22cdea58b512d9b19a7a78f3 (diff)
QtTest: Output correct library name
"QTest" is the C++ namespace; "QtTest" is the library name - Edited the logger output in qplaintestlogger.cpp - Updated documentation - Updated expected outputs for self-tests Change-Id: I43c525c43221a8d4e843a00d6d55b0f06ef55fd7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc2
-rw-r--r--src/testlib/qplaintestlogger.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
index 16bd099e37..eb3301aa58 100644
--- a/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
+++ b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
@@ -78,7 +78,7 @@ set LIB=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SD
//! [10]
********* Start testing of TestQString *********
-Config: Using QTest library %VERSION%, Qt %VERSION%
+Config: Using QtTest library %VERSION%, Qt %VERSION%
PASS : TestQString::initTestCase()
PASS : TestQString::toUpper()
PASS : TestQString::cleanupTestCase()
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 9fe82de19e..a923a0d0fa 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -319,7 +319,7 @@ void QPlainTestLogger::startLogging()
} else {
qsnprintf(buf, sizeof(buf),
"********* Start testing of %s *********\n"
- "Config: Using QTest library " QTEST_VERSION_STR
+ "Config: Using QtTest library " QTEST_VERSION_STR
", Qt %s\n", QTestResult::currentTestObjectName(), qVersion());
}
outputMessage(buf);