diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2011-07-19 10:43:32 +0200 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-07-19 10:48:19 +0200 |
commit | 61a31de94c16e8b1164d0ebe6238590f85ce897f (patch) | |
tree | f0756820235750e5e19e301fe89ae15ef26d6309 | |
parent | da59c90c78c3e127a0bcff2af2977f40e6c42efd (diff) | |
download | qtscript-wip/v8.tar.gz |
Fix the error message in
getSetProperty_gettersAndSettersOnGlobalObject().
Remove two testcases from the prettyPrinter because they cause
SyntaxError exception.
Change-Id: I0fb6906f3c00887772625a414f65d994e42b564e
Merge-request: 2
Reviewed-by: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1817
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
-rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 268dc4a..85f1ab0 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -2053,7 +2053,7 @@ void tst_QScriptValue::getSetProperty_gettersAndSettersOnGlobalObject() { QScriptValue ret = eng.evaluate("this.globalGetterSetterProperty()"); QVERIFY(ret.isError()); - QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Property 'globalGetterSetterProperty' of object #<an Object> is not a function")); + QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Property 'globalGetterSetterProperty' of object #<Object> is not a function")); } { QScriptValue ret = eng.evaluate("new this.globalGetterSetterProperty()"); @@ -3760,9 +3760,7 @@ void tst_QScriptValue::prettyPrinter_data() QTest::newRow("for") << QString("function() { for (var a; b; c) { } }") << QString("function () { for (var a; b; c) { } }"); QTest::newRow("for") << QString("function() { for (var a, b, c; d; e) { } }") << QString("function () { for (var a, b, c; d; e) { } }"); QTest::newRow("continue") << QString("function() { for (; ; ) { continue; } }") << QString("function () { for (; ; ) { continue; } }"); - QTest::newRow("continue") << QString("function() { for (; ; ) { continue label; } }") << QString("function () { for (; ; ) { continue label; } }"); QTest::newRow("break") << QString("function() { for (; ; ) { break; } }") << QString("function () { for (; ; ) { break; } }"); - QTest::newRow("break") << QString("function() { for (; ; ) { break label; } }") << QString("function () { for (; ; ) { break label; } }"); QTest::newRow("return") << QString("function() { return; }") << QString("function () { return; }"); QTest::newRow("return") << QString("function() { return 10; }") << QString("function () { return 10; }"); QTest::newRow("with") << QString("function() { with (a) { b; } }") << QString("function () { with (a) { b; } }"); |