summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2009-07-30 21:31:01 (GMT)
committerTor Arne Vestbø <tor.arne.vestbo@nokia.com>2009-07-31 11:46:44 (GMT)
commit819bc9a2f9f86260af8a76027a712b2a310a088d (patch)
tree48a11b945fde67434da02d8629e1de794f81a7b1 /tests
parentb2fc6a9406f3b59f9e800e9d2d567d0dabde6cef (diff)
downloadQt-819bc9a2f9f86260af8a76027a712b2a310a088d.zip
Qt-819bc9a2f9f86260af8a76027a712b2a310a088d.tar.gz
Qt-819bc9a2f9f86260af8a76027a712b2a310a088d.tar.bz2
QScriptValueIterator: fix missing non-enumerable values
Added an extra argument to JSObject::getPropertyNames() that specifies if the non-enumerable properties (those with the DontEnum attribute set) should be included or not. Tried looking at using a unsigned as an attribute-inclusion or exclusion filter, but the semantics of either the calling or the callee code would be very strange so I opted out.
Diffstat (limited to 'tests')
-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 1f7a857..7b019c1 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -1046,17 +1046,17 @@ void tst_QScriptEngine::globalObjectProperties()
actualNames.insert(it.name());
}
}
+
QSet<QString> remainingNames = actualNames;
{
QSet<QString>::const_iterator it;
for (it = expectedNames.constBegin(); it != expectedNames.constEnd(); ++it) {
QString name = *it;
- if (!actualNames.contains(name))
- QEXPECT_FAIL("", "JSC getPropertyNames() doesn't include DontEnum properties", Abort);
QVERIFY(actualNames.contains(name));
remainingNames.remove(name);
}
}
+ QEXPECT_FAIL("", "JSC global object has extra properties (JSON and jscprint)", Abort);
QVERIFY(remainingNames.isEmpty());
}