summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptvalue
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2009-07-27 16:13:21 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2009-07-27 16:39:10 (GMT)
commita8dae30f3825d0527a38499e13bd8e36485aac47 (patch)
tree0f42ae104da8a59d3f50e277b83ac29750610c40 /tests/auto/qscriptvalue
parentda769c4d4bd890e98173baf406f5455052f09c1f (diff)
downloadQt-a8dae30f3825d0527a38499e13bd8e36485aac47.zip
Qt-a8dae30f3825d0527a38499e13bd8e36485aac47.tar.gz
Qt-a8dae30f3825d0527a38499e13bd8e36485aac47.tar.bz2
Remove the uncaughtException, use the JSC exception instead
Use the exception from JSC::exec instead of QScriptEngin::uncaughtException. A few more tests are passing for qscriptvalue and qscriptqobject. Reviewed-by: Kent Hansen
Diffstat (limited to 'tests/auto/qscriptvalue')
-rw-r--r--tests/auto/qscriptvalue/tst_qscriptvalue.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 0036d95..f272b7f 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -1924,16 +1924,12 @@ void tst_QScriptValue::getSetProperty()
QVERIFY(!eng.hasUncaughtException());
QScriptValue ret = object5.property("foo");
QVERIFY(ret.isError());
- QEXPECT_FAIL("", "hasUncaughtException() should return true", Continue);
QVERIFY(eng.hasUncaughtException());
- QEXPECT_FAIL("", "uncaughtException() and return value should be the same", Continue);
QVERIFY(ret.strictlyEquals(eng.uncaughtException()));
eng.evaluate("Object"); // clear exception state...
QVERIFY(!eng.hasUncaughtException());
object5.setProperty("foo", str);
- QEXPECT_FAIL("", "hasUncaughtException() should return true", Continue);
QVERIFY(eng.hasUncaughtException());
- QEXPECT_FAIL("", "Should produce an error message", Continue);
QCOMPARE(eng.uncaughtException().toString(), QLatin1String("Error: set foo"));
}