diff options
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/selftests/tst_selftests.qml | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/tests/auto/qmltest/selftests/tst_selftests.qml b/tests/auto/qmltest/selftests/tst_selftests.qml index 88f0468de9..3da615d8c2 100644 --- a/tests/auto/qmltest/selftests/tst_selftests.qml +++ b/tests/auto/qmltest/selftests/tst_selftests.qml @@ -82,12 +82,8 @@ TestCase { } } - function skipSingle(msg, file, line) { - failmsg = "skipSingle:" + msg - } - - function skipAll(msg, file, line) { - failmsg = "skipAll:" + msg + function skip(msg, file, line) { + failmsg = "skip:" + msg } } @@ -271,7 +267,7 @@ TestCase { testCase.skip("foo") } catch (e) { compare(e.message, "QtQuickTest::skip") - compare(functions.failmsg, "skipSingle:foo") + compare(functions.failmsg, "skip:foo") caught = true } verify(caught) @@ -281,27 +277,7 @@ TestCase { testCase.skip() } catch (e) { compare(e.message, "QtQuickTest::skip") - compare(functions.failmsg, "skipSingle:") - caught = true - } - verify(caught) - - caught = false - try { - testCase.skipAll("foo") - } catch (e) { - compare(e.message, "QtQuickTest::skip") - compare(functions.failmsg, "skipAll:foo") - caught = true - } - verify(caught) - - caught = false - try { - testCase.skipAll() - } catch (e) { - compare(e.message, "QtQuickTest::skip") - compare(functions.failmsg, "skipAll:") + compare(functions.failmsg, "skip:") caught = true } verify(caught) |