diff options
author | Kent Hansen <khansen@trolltech.com> | 2009-07-30 14:57:15 (GMT) |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-07-30 14:57:15 (GMT) |
commit | 34e6fb628673cfa7b56cad95b765ef3a0fc24f66 (patch) | |
tree | aa96b993020d3e734a99024615b88b7ceedca48f /tests/auto/qscriptengine | |
parent | 3963331128f8af4dc1008a7efbbd1ccf292df567 (diff) | |
download | Qt-34e6fb628673cfa7b56cad95b765ef3a0fc24f66.zip Qt-34e6fb628673cfa7b56cad95b765ef3a0fc24f66.tar.gz Qt-34e6fb628673cfa7b56cad95b765ef3a0fc24f66.tar.bz2 |
implement QScriptContext::activationObject()
Diffstat (limited to 'tests/auto/qscriptengine')
-rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index 74368c5..9067005 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -163,7 +163,6 @@ void tst_QScriptEngine::currentContext() QVERIFY(!globalCtx->callee().isValid()); QCOMPARE(globalCtx->state(), QScriptContext::NormalState); QVERIFY(globalCtx->thisObject().strictlyEquals(eng.globalObject())); - QEXPECT_FAIL("", "", Continue); QVERIFY(globalCtx->activationObject().strictlyEquals(eng.globalObject())); QVERIFY(globalCtx->argumentsObject().isObject()); } @@ -183,14 +182,12 @@ void tst_QScriptEngine::pushPopContext() QCOMPARE(ctx->backtrace().size(), 2); QCOMPARE(ctx->engine(), &eng); QCOMPARE(ctx->state(), QScriptContext::NormalState); - QEXPECT_FAIL("", "activationObject not implemented", Continue); QVERIFY(ctx->activationObject().isObject()); QVERIFY(ctx->argumentsObject().isObject()); QScriptContext *ctx2 = eng.pushContext(); QVERIFY(ctx2 != 0); QCOMPARE(ctx2->parentContext(), ctx); - QEXPECT_FAIL("", "activationObject not implemented", Continue); QVERIFY(!ctx2->activationObject().strictlyEquals(ctx->activationObject())); QVERIFY(!ctx2->argumentsObject().strictlyEquals(ctx->argumentsObject())); @@ -890,7 +887,6 @@ void tst_QScriptEngine::getSetGlobalObject() QCOMPARE(glob.isObject(), true); QVERIFY(!glob.isFunction()); QVERIFY(eng.currentContext()->thisObject().strictlyEquals(glob)); - QEXPECT_FAIL("", "Activation object for global context", Continue); QVERIFY(eng.currentContext()->activationObject().strictlyEquals(glob)); QCOMPARE(glob.toString(), QString::fromLatin1("[object global]")); // prototype should be Object.prototype @@ -902,7 +898,6 @@ void tst_QScriptEngine::getSetGlobalObject() eng.setGlobalObject(obj); QVERIFY(eng.globalObject().strictlyEquals(obj)); QVERIFY(eng.currentContext()->thisObject().strictlyEquals(obj)); - QEXPECT_FAIL("", "this-object for global context", Continue); QVERIFY(eng.currentContext()->activationObject().strictlyEquals(obj)); QVERIFY(eng.evaluate("this").strictlyEquals(obj)); QCOMPARE(eng.globalObject().toString(), QString::fromLatin1("[object Object]")); @@ -913,13 +908,11 @@ void tst_QScriptEngine::getSetGlobalObject() eng.setGlobalObject(obj); QVERIFY(eng.globalObject().strictlyEquals(obj)); QVERIFY(eng.currentContext()->thisObject().strictlyEquals(obj)); - QEXPECT_FAIL("", "", Continue); QVERIFY(eng.currentContext()->activationObject().strictlyEquals(obj)); eng.collectGarbage(); QVERIFY(eng.globalObject().strictlyEquals(obj)); QVERIFY(eng.currentContext()->thisObject().strictlyEquals(obj)); - QEXPECT_FAIL("", "", Continue); QVERIFY(eng.currentContext()->activationObject().strictlyEquals(obj)); } |