From e8420af07158dc3aa5c6ea7ddae6f8be4976e454 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 7 Feb 2012 15:09:44 +1000 Subject: qmltest: Perform extra checks after each data row is executed. Add calls to the new function QTestResult::finishedCurrentTestData() to verify that expected failures and expected messages have been produced. Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28 Reviewed-by: Rohan McGovern Reviewed-by: Yunqiao Yin --- src/imports/testlib/TestCase.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/imports/testlib') diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 5b853cbad5..a1ab85c4cb 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -486,6 +486,7 @@ Item { if (!qtest_results.skipped) { qtest_results.functionType = TestResult.Func qtest_runInternal(prop, arg) + qtest_results.finishTestData() qtest_results.functionType = TestResult.CleanupFunc qtest_runInternal("cleanup") } @@ -510,7 +511,9 @@ Item { else qtest_results.startBenchmark(TestResult.RunOnce, qtest_results.dataTag) while (!qtest_results.isBenchmarkDone()) { - if (!qtest_runInternal(prop, arg)) + var success = qtest_runInternal(prop, arg) + qtest_results.finishTestData() + if (!success) break qtest_results.nextBenchmark() } -- cgit v1.2.3