summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-30 10:07:14 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-09-30 16:20:29 +0200
commitc25687fa0b6e4be043e1f8c92c093d8b06ca06c4 (patch)
treea90851e676d7407caa9df0cd2357a2de0876b513 /src/testlib
parent2044992eed3e48909d17a4304ea25d3007d94d60 (diff)
QTestResult: Don't pass a nullptr file to addFailure()
addBFail() asserts on the file being non-null. The convention seems to be "Unknown File" for cases where we cannot determine the file. Change-Id: I3a4d0130352d77d75f264fad6f3bd47c6700ef4c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qtestresult.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 88028aac6e..a87d2f82c1 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -134,13 +134,15 @@ static void clearExpectFail()
void QTestResult::finishedCurrentTestData()
{
- if (QTest::expectFailMode)
- addFailure("QEXPECT_FAIL was called without any subsequent verification statements", nullptr, 0);
+ if (QTest::expectFailMode) {
+ addFailure("QEXPECT_FAIL was called without any subsequent verification statements",
+ "Unknown File", 0);
+ }
clearExpectFail();
if (!QTest::failed && QTestLog::unhandledIgnoreMessages()) {
QTestLog::printUnhandledIgnoreMessages();
- addFailure("Not all expected messages were received", nullptr, 0);
+ addFailure("Not all expected messages were received", "Unknown File", 0);
}
QTestLog::clearIgnoreMessages();
}