From 080a1f3ff328005b78f89381c8d9faf4b0b8e16c Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 13:24:34 +1000 Subject: 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 Reviewed-by: Rohan McGovern --- tests/auto/qmltest/selftests/tst_selftests.qml | 32 ++++---------------------- 1 file changed, 4 insertions(+), 28 deletions(-) (limited to 'tests/auto/qmltest') 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) -- cgit v1.2.3