diff options
Diffstat (limited to 'src/testlib/qplaintestlogger.cpp')
-rw-r--r-- | src/testlib/qplaintestlogger.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index e5226b7820..853515f2d9 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -221,18 +221,6 @@ void QPlainTestLogger::outputMessage(const char *str) outputString(str); } -static void testIdentifier(QTestCharBuffer *identifier) -{ - const char *testObject = QTestResult::currentTestObjectName(); - const char *testFunction = QTestResult::currentTestFunction() ? QTestResult::currentTestFunction() : "UnknownTestFunc"; - - const char *dataTag = QTestResult::currentDataTag() ? QTestResult::currentDataTag() : ""; - const char *globalDataTag = QTestResult::currentGlobalDataTag() ? QTestResult::currentGlobalDataTag() : ""; - const char *tagFiller = (dataTag[0] && globalDataTag[0]) ? ":" : ""; - - QTest::qt_asprintf(identifier, "%s::%s(%s%s%s)", testObject, testFunction, globalDataTag, tagFiller, dataTag); -} - void QPlainTestLogger::printMessage(const char *type, const char *msg, const char *file, int line) { QTEST_ASSERT(type); @@ -251,10 +239,10 @@ void QPlainTestLogger::printMessage(const char *type, const char *msg, const cha } const char *msgFiller = msg[0] ? " " : ""; - QTestCharBuffer testIdent; - testIdentifier(&testIdent); + QTestCharBuffer testIdentifier; + QTestPrivate::generateTestIdentifier(&testIdentifier); QTest::qt_asprintf(&messagePrefix, "%s: %s%s%s%s\n", - type, testIdent.data(), msgFiller, msg, failureLocation.data()); + type, testIdentifier.data(), msgFiller, msg, failureLocation.data()); // In colored mode, printf above stripped our nonprintable control characters. // Put them back. |