summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-06-29 16:23:23 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-06-29 16:23:23 (GMT)
commit939e59f7f3cd23ab429c48d1be8f3d98f94962ad (patch)
treeed9cfff0efd64a6d015ff4295c511e455b4dcd48 /tests/auto
parent4c248e463c1748db0afbdb7db32a1b512a11bf44 (diff)
downloadQt-939e59f7f3cd23ab429c48d1be8f3d98f94962ad.zip
Qt-939e59f7f3cd23ab429c48d1be8f3d98f94962ad.tar.gz
Qt-939e59f7f3cd23ab429c48d1be8f3d98f94962ad.tar.bz2
make part of test not assert
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qscriptqobject/tst_qscriptqobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
index ed466ff..5f1bb1f 100644
--- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
@@ -1513,7 +1513,6 @@ void tst_QScriptExtQObject::connectAndDisconnect()
m_engine->evaluate("gotSignal = false");
QVERIFY(m_engine->evaluate("myObject.mySignal2.connect(myHandler)").isUndefined());
- QSKIP("Rest of the test causes crash", SkipAll);
m_myObject->emitMySignal2(true);
QCOMPARE(m_engine->evaluate("gotSignal").toBoolean(), true);
QCOMPARE(m_engine->evaluate("signalArgs.length").toNumber(), 1.0);
@@ -1582,6 +1581,7 @@ void tst_QScriptExtQObject::connectAndDisconnect()
m_myObject->emitMySignalWithVariantArg(123);
QCOMPARE(m_engine->evaluate("gotSignal").toBoolean(), true);
QCOMPARE(m_engine->evaluate("signalArgs.length").toNumber(), 1.0);
+ QVERIFY(m_engine->evaluate("signalArgs[0]").isNumber());
QCOMPARE(m_engine->evaluate("signalArgs[0]").toNumber(), 123.0);
QVERIFY(m_engine->evaluate("myObject.mySignalWithVariantArg.disconnect(myHandler)").isUndefined());
@@ -1793,7 +1793,7 @@ void tst_QScriptExtQObject::connectAndDisconnect()
void tst_QScriptExtQObject::cppConnectAndDisconnect()
{
- QSKIP("Crashes", SkipAll);
+ QSKIP("Crashes (GC-related)", SkipAll);
QScriptEngine eng;
QLineEdit edit;
QLineEdit edit2;