summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>2011-05-10 09:14:25 -0300
committerCaio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>2011-05-10 09:36:55 -0300
commit04a0dc8daaeb9beeed59d12ed495942a54762cb5 (patch)
tree899deab216cb2d4fbadc15329bfca34c4bd9c123
parent66ead1db95d25bf11f59156cee8532de27d18a61 (diff)
downloadqtscript-04a0dc8daaeb9beeed59d12ed495942a54762cb5.tar.gz
tst_qscriptengine: skip and unskip tests
Expect failure for tests that verify the [[Class]] of the global property. Do not expect failure for __defineGetter__ / __defineSetter__, the issue doesn't exist anymore since we are using the original global object and not a replacement with interceptors. Reviewed-by: Jedrzej Nowacki
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 81ac573..7c2b565 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -1271,6 +1271,7 @@ void tst_QScriptEngine::getSetGlobalObject()
QVERIFY(!glob.isFunction());
QVERIFY(eng.currentContext()->thisObject().strictlyEquals(glob));
QVERIFY(eng.currentContext()->activationObject().strictlyEquals(glob));
+ QEXPECT_FAIL("", "FIXME: Do we really want to enforce this? ECMA standard says that it is implementation dependent, skipping for now", Continue);
QCOMPARE(glob.toString(), QString::fromLatin1("[object global]"));
// prototype should be Object.prototype
QCOMPARE(glob.prototype().isValid(), true);
@@ -1289,7 +1290,7 @@ void tst_QScriptEngine::getSetGlobalObject()
QVERIFY(eng.currentContext()->thisObject().strictlyEquals(obj));
QVERIFY(eng.currentContext()->activationObject().strictlyEquals(obj));
QVERIFY(eng.evaluate("this").strictlyEquals(obj));
-// QEXPECT_FAIL("", "FIXME: Do we really want to enforce this? ECMA standard says that it is implementation dependent, skipping for now", Continue);
+ QEXPECT_FAIL("", "FIXME: Do we really want to enforce this? ECMA standard says that it is implementation dependent, skipping for now", Continue);
QCOMPARE(eng.globalObject().toString(), QString::fromLatin1("[object global]"));
collectGarbage_helper(eng);
@@ -1344,7 +1345,6 @@ void tst_QScriptEngine::getSetGlobalObject()
}
// Getter/setter property.
- QEXPECT_FAIL("", "__defineGetter__ and co. does not work on the objects that have an interceptor", Abort);
//the custom global object have an interceptor
QVERIFY(eng.evaluate("this.__defineGetter__('oof', function() { return this.bar; })").isUndefined());
QVERIFY(eng.evaluate("this.__defineSetter__('oof', function(v) { this.bar = v; })").isUndefined());