diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 13:24:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 04:12:18 +0200 |
| commit | 080a1f3ff328005b78f89381c8d9faf4b0b8e16c (patch) | |
| tree | 31cacc4362b39e806448681232595b58f289cd92 /src/imports | |
| parent | 9167f5338ec978462d64f2f348144f674a2d599c (diff) | |
Remove SkipMode from qtestlib API.
The SkipMode parameter to QSKIP has been removed in qtbase, therefore it
must also be removed here.
Task-number: QTBUG-21851, QTBUG-21652
Change-Id: I8016f8c28338b1b532bdb593c796d699b99250dc
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/testlib/TestCase.qml | 5 | ||||
| -rw-r--r-- | src/imports/testlib/testcase.qdoc | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 020f934aac..fd04c786a2 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -307,14 +307,15 @@ Item { function skip(msg) { if (msg === undefined) msg = "" - qtest_results.skipSingle(msg, util.callerFile(), util.callerLine()) + qtest_results.skip(msg, util.callerFile(), util.callerLine()) throw new Error("QtQuickTest::skip") } function skipAll(msg) { if (msg === undefined) msg = "" - qtest_results.skipAll(msg, util.callerFile(), util.callerLine()) + warn("The skipAll function is deprecated and will be removed soon. Please update this test by changing skipAll to skip.") + qtest_results.skip(msg, util.callerFile(), util.callerLine()) throw new Error("QtQuickTest::skip") } diff --git a/src/imports/testlib/testcase.qdoc b/src/imports/testlib/testcase.qdoc index c08af334e5..719d9baea7 100644 --- a/src/imports/testlib/testcase.qdoc +++ b/src/imports/testlib/testcase.qdoc @@ -362,19 +362,7 @@ Skips the current test case and prints the optional \a message. If this is a data-driven test, then only the current row is skipped. - Similar to \c{QSKIP(message, SkipSingle)} in C++. - - \sa skipAll() -*/ - -/*! - \qmlmethod TestCase::skipAll(message = "") - - Skips the current test case and prints the optional \a message. - If this is a data-driven test, then all remaining rows are skipped. - Similar to \c{QSKIP(message, SkipAll)} in C++. - - \sa skip() + Similar to \c{QSKIP(message)} in C++. */ /*! |