aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest
diff options
context:
space:
mode:
authorCharles Yin <charles.yin@nokia.com>2011-09-02 15:44:47 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-09 01:08:10 +0200
commite5b13e6eae3782163dc3414bd87158797d5af6e0 (patch)
tree4530d82a7923917e7702d5cc0968aa486dacdfff /src/qmltest
parentde868c71b7ec5f463ed9b1a142f3b805d1c3d627 (diff)
make the testcase name the same in both plain text and xml/xunit logs for qmltest
Change-Id: I911b3c7ba698b6c94aaa712eeaa917301c651e64 Reviewed-on: http://codereview.qt-project.org/4112 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'src/qmltest')
-rw-r--r--src/qmltest/quicktestresult.cpp40
1 files changed, 3 insertions, 37 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 80c3f8b3d5..40b7d9bea8 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -78,7 +78,6 @@ public:
}
QByteArray intern(const QString &str);
- void updateTestObjectName();
QString testCaseName;
QString functionName;
@@ -96,25 +95,6 @@ QByteArray QuickTestResultPrivate::intern(const QString &str)
return *(internedStrings.insert(bstr));
}
-void QuickTestResultPrivate::updateTestObjectName()
-{
- // In plain logging mode we use the TestCase name as the
- // class name so that multiple TestCase elements will report
- // results with "testCase::function". In XML logging mode,
- // we use the program name as the class name and report test
- // functions as "testCase__function".
- if (QTestLog::logMode() == QTestLog::Plain) {
- if (testCaseName.isEmpty()) {
- QTestResult::setCurrentTestObject(globalProgramName);
- } else if (QTestLog::logMode() == QTestLog::Plain) {
- QTestResult::setCurrentTestObject
- (intern(testCaseName).constData());
- }
- } else {
- QTestResult::setCurrentTestObject(globalProgramName);
- }
-}
-
QuickTestResult::QuickTestResult(QObject *parent)
: QObject(parent), d_ptr(new QuickTestResultPrivate)
{
@@ -144,7 +124,6 @@ void QuickTestResult::setTestCaseName(const QString &name)
{
Q_D(QuickTestResult);
d->testCaseName = name;
- d->updateTestObjectName();
emit testCaseNameChanged();
}
@@ -167,15 +146,11 @@ void QuickTestResult::setFunctionName(const QString &name)
{
Q_D(QuickTestResult);
if (!name.isEmpty()) {
- // In plain logging mode, we use the function name directly.
- // In XML logging mode, we use "testCase__functionName" as the
- // program name is acting as the class name.
- if (QTestLog::logMode() == QTestLog::Plain ||
- d->testCaseName.isEmpty()) {
+ if (d->testCaseName.isEmpty()) {
QTestResult::setCurrentTestFunction
(d->intern(name).constData());
} else {
- QString fullName = d->testCaseName + QLatin1String("__") + name;
+ QString fullName = d->testCaseName + QLatin1String("::") + name;
QTestResult::setCurrentTestFunction
(d->intern(fullName).constData());
}
@@ -342,15 +317,7 @@ void QuickTestResult::startLogging()
Q_D(QuickTestResult);
if (loggingStarted)
return;
- const char *saved = QTestResult::currentTestObjectName();
- if (globalProgramName) {
- QTestResult::setCurrentTestObject(globalProgramName);
- } else {
- QTestResult::setCurrentTestObject
- (d->intern(d->testCaseName).constData());
- }
QTestLog::startLogging();
- QTestResult::setCurrentTestObject(saved);
loggingStarted = true;
}
@@ -366,10 +333,8 @@ void QuickTestResult::stopLogging()
Q_D(QuickTestResult);
if (globalProgramName)
return; // Logging will be stopped by setProgramName(0).
- const char *saved = QTestResult::currentTestObjectName();
QTestResult::setCurrentTestObject(d->intern(d->testCaseName).constData());
QTestLog::stopLogging();
- QTestResult::setCurrentTestObject(saved);
}
void QuickTestResult::initTestTable()
@@ -614,6 +579,7 @@ void QuickTestResult::setProgramName(const char *name)
QTestResult::setCurrentTestObject(0);
}
globalProgramName = name;
+ QTestResult::setCurrentTestObject(globalProgramName);
}
int QuickTestResult::exitCode()