diff options
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
-rw-r--r-- | src/qmltest/quicktestresult.cpp | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index ddfa928f96..5654c87ad9 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -192,28 +192,15 @@ void QuickTestResult::setDataTag(const QString &tag) /*! \qmlproperty bool TestResult::failed - This property returns true if the current test function has - failed; false otherwise. The fail state is reset when - functionName is changed or finishTestFunction() is called. + This property returns true if the current test function (or + current test data row for a data-driven test) has failed; + false otherwise. The fail state is reset when functionName + is changed or finishTestDataCleanup() is called. - \sa skipped, dataFailed + \sa skipped */ bool QuickTestResult::isFailed() const { - return QTestResult::testFailed(); -} - -/*! - \qmlproperty bool TestResult::dataFailed - - This property returns true if the current data function has - failed; false otherwise. The fail state is reset when - functionName is changed or finishTestFunction() is called. - - \sa failed -*/ -bool QuickTestResult::isDataFailed() const -{ return QTestResult::currentTestFailed(); } @@ -349,6 +336,11 @@ void QuickTestResult::finishTestData() QTestResult::finishedCurrentTestData(); } +void QuickTestResult::finishTestDataCleanup() +{ + QTestResult::finishedCurrentTestDataCleanup(); +} + void QuickTestResult::finishTestFunction() { QTestResult::finishedCurrentTestFunction(); |