summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptvalue
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-04 14:47:08 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-04 14:48:15 (GMT)
commit28e8cb97ed2813a6baac36f1795b3ba9c71892c2 (patch)
tree2110883da644ecb4e8694414dd38319dc42c2393 /tests/auto/qscriptvalue
parent394f62d779e6e120ce2fc19bd61ec64bd29a87a9 (diff)
downloadQt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.zip
Qt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.tar.gz
Qt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.tar.bz2
adapt to commit 014c4c63066fd3920594e6a58b02f314b5c88cdf
Diffstat (limited to 'tests/auto/qscriptvalue')
-rw-r--r--tests/auto/qscriptvalue/tst_qscriptvalue.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 99f5770..2b48c30 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -2031,6 +2031,10 @@ void tst_QScriptValue::getSetProperty()
"} found");
QCOMPARE(ret.strictlyEquals(QScriptValue(&eng, true)), true);
}
+ // should still be deletable from C++
+ object.setProperty("undeletableProperty", QScriptValue());
+ QVERIFY(!object.property("undeletableProperty").isValid());
+ QCOMPARE(object.propertyFlags("undeletableProperty"), 0);
// SkipInEnumeration
object.setProperty("dontEnumProperty", num, QScriptValue::SkipInEnumeration);
@@ -2071,7 +2075,6 @@ void tst_QScriptValue::getSetProperty()
QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly | QScriptValue::Undeletable);
object.setProperty("flagProperty", str, QScriptValue::UserRange);
- QEXPECT_FAIL("", "User-range flags are not retained for normal properties (JSC discards them?)", Continue);
QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::UserRange);
// using interned strings
@@ -2083,15 +2086,6 @@ void tst_QScriptValue::getSetProperty()
object.setProperty(foo, num);
QVERIFY(object.property(foo).strictlyEquals(num));
QVERIFY(object.property("foo").strictlyEquals(num));
-
- // can't set length property of native function objects
- {
- QScriptValue fun = eng.newFunction(getterSetter, /*length=*/2);
- for (int x = 0; x < 2; ++x) {
- QVERIFY(fun.property("length").strictlyEquals(QScriptValue(&eng, 2)));
- fun.setProperty("length", QScriptValue());
- }
- }
}
void tst_QScriptValue::getSetPrototype()