diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-02-07 12:42:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 06:29:37 +0100 |
| commit | 3233e8052d2d25fd36567f67f9cd314cf0eaef92 (patch) | |
| tree | 9457848b778ead5e9ba5696153f854b7e3642307 /src/imports/testlib | |
| parent | 5b76b0de4848912cb9901524ff07d03bc9b71a5f (diff) | |
Remove code related to test location.
Testlib no longer does anything with the test location and neither do
any of Qt's tests, so this code is no longer needed.
Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/imports/testlib')
| -rw-r--r-- | src/imports/testlib/TestCase.qml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index a1ab85c4cb..02fa095da2 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -481,16 +481,12 @@ Item { } function qtest_runFunction(prop, arg) { - qtest_results.functionType = TestResult.InitFunc qtest_runInternal("init") if (!qtest_results.skipped) { - qtest_results.functionType = TestResult.Func qtest_runInternal(prop, arg) qtest_results.finishTestData() - qtest_results.functionType = TestResult.CleanupFunc qtest_runInternal("cleanup") } - qtest_results.functionType = TestResult.NoWhere } function qtest_runBenchmarkFunction(prop, arg) { @@ -499,13 +495,11 @@ Item { qtest_results.beginDataRun() do { // Run the initialization function. - qtest_results.functionType = TestResult.InitFunc qtest_runInternal("init") if (qtest_results.skipped) break // Execute the benchmark function. - qtest_results.functionType = TestResult.Func if (prop.indexOf("benchmark_once_") != 0) qtest_results.startBenchmark(TestResult.RepeatUntilValidMeasurement, qtest_results.dataTag) else @@ -520,9 +514,7 @@ Item { qtest_results.stopBenchmark() // Run the cleanup function. - qtest_results.functionType = TestResult.CleanupFunc qtest_runInternal("cleanup") - qtest_results.functionType = TestResult.NoWhere } while (!qtest_results.measurementAccepted()) qtest_results.endDataRun() } while (qtest_results.needsMoreMeasurements()) @@ -571,7 +563,6 @@ Item { // Run the initTestCase function. qtest_results.functionName = "initTestCase" - qtest_results.functionType = TestResult.InitFunc var runTests = true if (!qtest_runInternal("initTestCase")) runTests = false @@ -603,7 +594,6 @@ Item { } qtest_results.functionName = prop if (datafunc in testCase) { - qtest_results.functionType = TestResult.DataFunc if (qtest_runInternal(datafunc)) { var table = qtest_testCaseResult var haveData = false @@ -637,7 +627,6 @@ Item { // Run the cleanupTestCase function. qtest_results.skipped = false qtest_results.functionName = "cleanupTestCase" - qtest_results.functionType = TestResult.CleanupFunc qtest_runInternal("cleanupTestCase") // Complain about missing functions that we were supposed to run. |