diff options
author | Simjees Abraham <simjees.abraham@nokia.com> | 2012-05-22 14:01:16 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 12:52:43 +0200 |
commit | b909ce4f50be282a65f04b1ef19469d5875868e1 (patch) | |
tree | 1523ad33640172fba515095d24fa09d693f05e0f /tests/auto/qml/debugger/qqmlenginedebugservice | |
parent | 1956ec4792f557a910e195e2276a124550337aeb (diff) |
Debugger: Removing the deleted objects from objectReferenceHash
The invalid entries from objectReferenceHash in QQmlDebugService
is removed once the Qml object is destroyed.
Task-number: QTCREATORBUG_7451
Change-Id: I8d2ccafe81a811ea319f13fd99fbde3c13e6b2be
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Diffstat (limited to 'tests/auto/qml/debugger/qqmlenginedebugservice')
-rw-r--r-- | tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp index b0070b718c..59623fec96 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp @@ -131,6 +131,8 @@ private slots: void setMethodBody(); void queryObjectTree(); void setBindingInStates(); + + void regression_QTCREATORBUG_7451(); }; QmlDebugObjectReference tst_QQmlEngineDebugService::findRootObject( @@ -763,6 +765,68 @@ void tst_QQmlEngineDebugService::queryObjectsForLocation_data() QTest::newRow("recursive") << true; } +void tst_QQmlEngineDebugService::regression_QTCREATORBUG_7451() +{ + QmlDebugObjectReference rootObject = findRootObject(); + int contextId = rootObject.contextDebugId; + QQmlContext *context = qobject_cast<QQmlContext *>(QQmlDebugService::objectForId(contextId)); + QQmlComponent component(context->engine()); + QByteArray content; + content.append("import QtQuick 2.0\n" + "Text {" + "y: 10\n" + "text: \"test\"\n" + "}"); + component.setData(content, rootObject.source.url); + QObject *object = component.create(context); + QVERIFY(object); + int idNew = QQmlDebugService::idForObject(object); + QVERIFY(idNew >= 0); + + const QString fileName = QFileInfo(rootObject.source.url.toString()).fileName(); + int lineNumber = rootObject.source.lineNumber; + int columnNumber = rootObject.source.columnNumber; + bool success = false; + + m_dbg->queryObjectsForLocation(fileName, lineNumber, + columnNumber, &success); + QVERIFY(success); + QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result()))); + + foreach (QmlDebugObjectReference child, rootObject.children) { + success = false; + lineNumber = child.source.lineNumber; + columnNumber = child.source.columnNumber; + m_dbg->queryObjectsForLocation(fileName, lineNumber, + columnNumber, &success); + QVERIFY(success); + QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result()))); + } + + delete object; + QObject *deleted = QQmlDebugService::objectForId(idNew); + QVERIFY(!deleted); + + lineNumber = rootObject.source.lineNumber; + columnNumber = rootObject.source.columnNumber; + success = false; + m_dbg->queryObjectsForLocation(fileName, lineNumber, + columnNumber, &success); + QVERIFY(success); + QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result()))); + + foreach (QmlDebugObjectReference child, rootObject.children) { + success = false; + lineNumber = child.source.lineNumber; + columnNumber = child.source.columnNumber; + m_dbg->queryObjectsForLocation(fileName, lineNumber, + columnNumber, &success); + QVERIFY(success); + QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result()))); + } +} + + void tst_QQmlEngineDebugService::queryExpressionResult() { QFETCH(QString, expr); |