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 /tests/auto/declarative/qjsengine/tst_qjsengine.cpp | |
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 'tests/auto/declarative/qjsengine/tst_qjsengine.cpp')
-rw-r--r-- | tests/auto/declarative/qjsengine/tst_qjsengine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp index 7df0064fa1..f83a1b3efd 100644 --- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp @@ -701,7 +701,7 @@ void tst_QJSEngine::newVariant_promoteObject() QVERIFY(object.property("foo").isObject()); QVERIFY(!object.property("foo").isVariant()); QScriptValue originalProto = object.property("foo").prototype(); - QSKIP("It is not possible to promote plain object to a wrapper", SkipAll); + QSKIP("It is not possible to promote plain object to a wrapper"); QScriptValue ret = eng.newVariant(object.property("foo"), QVariant(123)); QVERIFY(ret.isValid()); QVERIFY(ret.strictlyEquals(object.property("foo"))); @@ -781,7 +781,7 @@ void tst_QJSEngine::newVariant_promoteNonObject() void tst_QJSEngine::newVariant_promoteNonQScriptObject() { - QSKIP("This test relay on limitation of QtScript JSC implementation", SkipAll); + QSKIP("This test relay on limitation of QtScript JSC implementation"); QScriptEngine eng; { QTest::ignoreMessage(QtWarningMsg, "QScriptEngine::newVariant(): changing class of non-QScriptObject not supported"); @@ -1073,7 +1073,7 @@ void tst_QJSEngine::newQObject_promoteObject() void tst_QJSEngine::newQObject_sameQObject() { #if 0 // ###FIXME: No QObjectWrapOptions API - QSKIP("This test stongly relay on strictlyEquals feature that would change in near future", SkipAll); + QSKIP("This test stongly relay on strictlyEquals feature that would change in near future"); QScriptEngine eng; // calling newQObject() several times with same object for (int x = 0; x < 2; ++x) { @@ -1151,7 +1151,7 @@ void tst_QJSEngine::newQObject_promoteNonObject() void tst_QJSEngine::newQObject_promoteNonQScriptObject() { #if 0 // ### FIXME: object promotion is not supported - QSKIP("Promotion of non QScriptObjects kind of works (there is not difference between Object and Array, look at comments in newQObject implementation).", SkipAll); + QSKIP("Promotion of non QScriptObjects kind of works (there is not difference between Object and Array, look at comments in newQObject implementation)."); QScriptEngine eng; { QTest::ignoreMessage(QtWarningMsg, "QScriptEngine::newQObject(): changing class of non-QScriptObject not supported"); @@ -1319,7 +1319,7 @@ void tst_QJSEngine::newQMetaObject() #if 0 // ###FIXME: No activation object support void tst_QJSEngine::newActivationObject() { - QSKIP("internal function not implemented in JSC-based back-end", SkipAll); + QSKIP("internal function not implemented in JSC-based back-end"); QScriptEngine eng; QScriptValue act = eng.newActivationObject(); QEXPECT_FAIL("", "", Continue); @@ -3776,7 +3776,7 @@ void tst_QJSEngine::abortEvaluation() void tst_QJSEngine::abortEvaluation_tryCatch() { - QSKIP("It crashes", SkipAll); + QSKIP("It crashes"); QScriptEngine eng; EventReceiver3 receiver(&eng); eng.setProcessEventsInterval(100); @@ -4876,7 +4876,7 @@ void tst_QJSEngine::jsFutureReservedWords_data() void tst_QJSEngine::jsFutureReservedWords() { - QSKIP("Fails", SkipAll); + QSKIP("Fails"); // See ECMA-262 Section 7.6.1.2, "Future Reserved Words". // In real-world implementations, most of these words are // actually allowed as normal identifiers. |