diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-07-13 08:11:58 (GMT) |
|---|---|---|
| committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-07-13 08:11:58 (GMT) |
| commit | 777762fa72de048b8ace97e21192bb659accb9f9 (patch) | |
| tree | ef516cb06c1078d7945fe0d9aabf51395390eab7 /tests | |
| parent | f6304c909b074a951dc33c39bc2b9d75536b1c22 (diff) | |
| parent | 7f2fadda40fa79a35e9c77ef4f9613940c23f382 (diff) | |
| download | Qt-777762fa72de048b8ace97e21192bb659accb9f9.zip Qt-777762fa72de048b8ace97e21192bb659accb9f9.tar.gz Qt-777762fa72de048b8ace97e21192bb659accb9f9.tar.bz2 | |
Merge branch 'qtscript-jsc-backend' of git@scm.dev.nokia.troll.no:qt/qt-webkit into qtscript-jsc-backend
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qscriptclass/tst_qscriptclass.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp index 963b221..e587b51 100644 --- a/tests/auto/qscriptclass/tst_qscriptclass.cpp +++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp @@ -607,7 +607,9 @@ void tst_QScriptClass::newInstance() QVERIFY(arr.isArray()); QCOMPARE(arr.scriptClass(), (QScriptClass*)0); arr.setScriptClass(&cls); + QEXPECT_FAIL("", "Changing class of arbitrary script object is not allowed (it's OK)", Continue); QCOMPARE(arr.scriptClass(), (QScriptClass*)&cls); + QEXPECT_FAIL("", "Changing class of arbitrary script object is not allowed (it's OK)", Continue); QVERIFY(!arr.isArray()); QVERIFY(arr.isObject()); } diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index 65da950..8330d67 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -438,6 +438,7 @@ void tst_QScriptEngine::newVariant() QScriptValue value = object.property("valueOf").call(object); QVERIFY(value.isObject()); QVERIFY(value.strictlyEquals(object)); + QEXPECT_FAIL("", "QVariant.prototype.toString is not correctly implemented", Continue); QCOMPARE(object.toString(), QString::fromLatin1("QVariant(QPoint)")); } } diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 6560cfe..13f9206 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -2213,7 +2213,6 @@ public: void tst_QScriptValue::getSetScriptClass() { - QSKIP("Not implemented", SkipAll); QScriptEngine eng; QScriptValue inv; QCOMPARE(inv.scriptClass(), (QScriptClass*)0); |