diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-10 12:38:22 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-10 12:39:32 (GMT) |
| commit | 70f320f661a0241fcb5fc85f5b9df8e565f5f7e0 (patch) | |
| tree | 6a305679da8b8584c123150607ae1cc4168de6a6 /tests | |
| parent | aa3aeaee694fb5f15fb8beb32dafdaca97361563 (diff) | |
| download | Qt-70f320f661a0241fcb5fc85f5b9df8e565f5f7e0.zip Qt-70f320f661a0241fcb5fc85f5b9df8e565f5f7e0.tar.gz Qt-70f320f661a0241fcb5fc85f5b9df8e565f5f7e0.tar.bz2 | |
finish implementation of QScriptEngine::importExtension()
Added the properties to the activation object: __extension__,
__setupPackage__ and __postInit__.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index 538834b..e0dd173 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -1783,7 +1783,6 @@ void tst_QScriptEngine::importExtension() for (int x = 0; x < 2; ++x) { QCOMPARE(eng.globalObject().property("com").isValid(), x == 1); QScriptValue ret = eng.importExtension("com.trolltech"); - QEXPECT_FAIL("", "", Abort); QCOMPARE(eng.hasUncaughtException(), false); QCOMPARE(ret.isUndefined(), true); @@ -1840,9 +1839,10 @@ void tst_QScriptEngine::importExtension() QVERIFY(eng.importedExtensions().isEmpty()); QScriptValue ret = eng.importExtension("com.trolltech.syntaxerror"); QVERIFY(eng.hasUncaughtException()); + QEXPECT_FAIL("", "JSC throws syntax error eagerly", Continue); QCOMPARE(eng.uncaughtExceptionLineNumber(), 4); QVERIFY(ret.isError()); - QCOMPARE(ret.property("message").toString(), QLatin1String("invalid assignment lvalue")); + QCOMPARE(ret.property("message").toString(), QLatin1String("Parse error")); } QStringList imp = eng.importedExtensions(); QCOMPARE(imp.size(), 2); |