Qml Debugger: Make sure all objects have a type

QQmlMetaType::prettyTypeName() does a better job in finding a valid type
name for our objects than we can do ourselves.

Task-number: QTCREATORBUG-17741
Change-Id: Ie8a192aceb230e73b5295b745987692548aff641
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

3 files changed, 58 insertions, 27 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
index 151e44c4d4..3fb0522cd1 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
@@ -409,18 +409,7 @@ QQmlEngineDebugServiceImpl::objectData(QObject *object)
     rv.objectId = QQmlDebugService::idForObject(object);
     rv.contextId = QQmlDebugService::idForObject(qmlContext(object));
     rv.parentId = QQmlDebugService::idForObject(object->parent());
-    QQmlType *type = QQmlMetaType::qmlType(object->metaObject());
-    if (type) {
-        QString typeName = type->qmlTypeName();
-        int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
-        rv.objectType = lastSlash < 0 ? typeName : typeName.mid(lastSlash+1);
-    } else {
-        rv.objectType = QString::fromUtf8(object->metaObject()->className());
-        int marker = rv.objectType.indexOf(QLatin1String("_QMLTYPE_"));
-        if (marker != -1)
-            rv.objectType = rv.objectType.left(marker);
-    }
-
+    rv.objectType = QQmlMetaType::prettyTypeName(object);
     return rv;
 }
 
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
index 8c30a82317..d9a4777115 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp
@@ -180,14 +180,9 @@ void tst_QQmlEngineDebugService::recursiveObjectTest(
 {
     const QMetaObject *meta = o->metaObject();
 
-    QQmlType *type = QQmlMetaType::qmlType(meta);
-    QString className = type ? QString(type->qmlTypeName())
-                             : QString(meta->className());
-    className = className.mid(className.lastIndexOf(QLatin1Char('/'))+1);
-
     QCOMPARE(oref.debugId, QQmlDebugService::idForObject(o));
     QCOMPARE(oref.name, o->objectName());
-    QCOMPARE(oref.className, className);
+    QCOMPARE(oref.className, QQmlMetaType::prettyTypeName(o));
     QCOMPARE(oref.contextDebugId, QQmlDebugService::idForObject(
                  qmlContext(o)));
 
@@ -201,6 +196,7 @@ void tst_QQmlEngineDebugService::recursiveObjectTest(
 
         QmlDebugObjectReference cref;
         foreach (const QmlDebugObjectReference &ref, oref.children) {
+            QVERIFY(!ref.className.isEmpty());
             if (ref.debugId == debugId) {
                 cref = ref;
                 break;
@@ -369,6 +365,7 @@ void tst_QQmlEngineDebugService::setMethodBody()
 {
     bool success;
     QmlDebugObjectReference obj = findRootObject(2);
+    QVERIFY(!obj.className.isEmpty());
 
     QObject *root = m_components.at(2);
     // Without args
@@ -410,6 +407,7 @@ void tst_QQmlEngineDebugService::setMethodBody()
 void tst_QQmlEngineDebugService::watch_property()
 {
     QmlDebugObjectReference obj = findRootObject();
+    QVERIFY(!obj.className.isEmpty());
     QmlDebugPropertyReference prop = findProperty(obj.properties, "width");
 
     bool success;
@@ -454,6 +452,7 @@ void tst_QQmlEngineDebugService::watch_property()
 void tst_QQmlEngineDebugService::watch_object()
 {
     QmlDebugObjectReference obj = findRootObject();
+    QVERIFY(!obj.className.isEmpty());
 
     bool success;
 
@@ -519,6 +518,7 @@ void tst_QQmlEngineDebugService::watch_expression()
     int origWidth = m_rootItem->property("width").toInt();
 
     QmlDebugObjectReference obj = findRootObject();
+    QVERIFY(!obj.className.isEmpty());
 
     bool success;
 
@@ -654,6 +654,7 @@ void tst_QQmlEngineDebugService::queryObject()
     bool success;
 
     QmlDebugObjectReference rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
 
     QQmlEngineDebugClient *unconnected = new QQmlEngineDebugClient(0);
     recursive ? unconnected->queryObjectRecursive(rootObject, &success) : unconnected->queryObject(rootObject, &success);
@@ -665,6 +666,7 @@ void tst_QQmlEngineDebugService::queryObject()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     QmlDebugObjectReference obj = m_dbg->object();
+    QVERIFY(!obj.className.isEmpty());
 
     // check source as defined in main()
     QmlDebugFileReference source = obj.source;
@@ -676,12 +678,15 @@ void tst_QQmlEngineDebugService::queryObject()
     recursiveObjectTest(m_rootItem, obj, recursive);
 
     if (recursive) {
-        foreach (const QmlDebugObjectReference &child, obj.children)
+        foreach (const QmlDebugObjectReference &child, obj.children) {
+            QVERIFY(!child.className.isEmpty());
             QVERIFY(child.properties.count() > 0);
+        }
 
         QmlDebugObjectReference rect;
         QmlDebugObjectReference text;
         foreach (const QmlDebugObjectReference &child, obj.children) {
+            QVERIFY(!child.className.isEmpty());
             if (child.className == "Rectangle")
                 rect = child;
             else if (child.className == "Text")
@@ -695,8 +700,10 @@ void tst_QQmlEngineDebugService::queryObject()
 
         QCOMPARE(findProperty(text.properties, "color").value, qVariantFromValue(QColor("blue")));
     } else {
-        foreach (const QmlDebugObjectReference &child, obj.children)
+        foreach (const QmlDebugObjectReference &child, obj.children) {
+            QVERIFY(!child.className.isEmpty());
             QCOMPARE(child.properties.count(), 0);
+        }
     }
 }
 
@@ -715,6 +722,7 @@ void tst_QQmlEngineDebugService::queryObjectsForLocation()
     bool success;
 
     QmlDebugObjectReference rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
 
     const QString fileName = QFileInfo(rootObject.source.url.toString()).fileName();
     int lineNumber = rootObject.source.lineNumber;
@@ -737,6 +745,7 @@ void tst_QQmlEngineDebugService::queryObjectsForLocation()
 
     QCOMPARE(m_dbg->objects().count(), 1);
     QmlDebugObjectReference obj = m_dbg->objects().first();
+    QVERIFY(!obj.className.isEmpty());
 
     // check source as defined in main()
     QmlDebugFileReference source = obj.source;
@@ -748,12 +757,15 @@ void tst_QQmlEngineDebugService::queryObjectsForLocation()
     recursiveObjectTest(m_rootItem, obj, recursive);
 
     if (recursive) {
-        foreach (const QmlDebugObjectReference &child, obj.children)
+        foreach (const QmlDebugObjectReference &child, obj.children) {
+            QVERIFY(!child.className.isEmpty());
             QVERIFY(child.properties.count() > 0);
+        }
 
         QmlDebugObjectReference rect;
         QmlDebugObjectReference text;
         foreach (const QmlDebugObjectReference &child, obj.children) {
+            QVERIFY(!child.className.isEmpty());
             if (child.className == "Rectangle")
                 rect = child;
             else if (child.className == "Text")
@@ -767,8 +779,10 @@ void tst_QQmlEngineDebugService::queryObjectsForLocation()
 
         QCOMPARE(findProperty(text.properties, "color").value, qVariantFromValue(QColor("blue")));
     } else {
-        foreach (const QmlDebugObjectReference &child, obj.children)
+        foreach (const QmlDebugObjectReference &child, obj.children) {
+            QVERIFY(!child.className.isEmpty());
             QCOMPARE(child.properties.count(), 0);
+        }
     }
 }
 
@@ -783,6 +797,7 @@ void tst_QQmlEngineDebugService::queryObjectsForLocation_data()
 void tst_QQmlEngineDebugService::regression_QTCREATORBUG_7451()
 {
     QmlDebugObjectReference rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     int contextId = rootObject.contextDebugId;
     QQmlContext *context = qobject_cast<QQmlContext *>(QQmlDebugService::objectForId(contextId));
     QQmlComponent component(context->engine());
@@ -809,6 +824,7 @@ void tst_QQmlEngineDebugService::regression_QTCREATORBUG_7451()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     foreach (QmlDebugObjectReference child, rootObject.children) {
+        QVERIFY(!child.className.isEmpty());
         success = false;
         lineNumber = child.source.lineNumber;
         columnNumber = child.source.columnNumber;
@@ -831,6 +847,7 @@ void tst_QQmlEngineDebugService::regression_QTCREATORBUG_7451()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     foreach (QmlDebugObjectReference child, rootObject.children) {
+        QVERIFY(!child.className.isEmpty());
         success = false;
         lineNumber = child.source.lineNumber;
         columnNumber = child.source.columnNumber;
@@ -846,6 +863,7 @@ void tst_QQmlEngineDebugService::queryObjectWithNonStreamableTypes()
     bool success;
 
     QmlDebugObjectReference rootObject = findRootObject(4, true);
+    QVERIFY(!rootObject.className.isEmpty());
 
     QQmlEngineDebugClient *unconnected = new QQmlEngineDebugClient(0);
     unconnected->queryObject(rootObject, &success);
@@ -857,6 +875,7 @@ void tst_QQmlEngineDebugService::queryObjectWithNonStreamableTypes()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     QmlDebugObjectReference obj = m_dbg->object();
+    QVERIFY(!obj.className.isEmpty());
 
     QCOMPARE(findProperty(obj.properties, "modelIndex").value, QVariant());
 }
@@ -950,6 +969,7 @@ void tst_QQmlEngineDebugService::queryExpressionResultBC_data()
 void tst_QQmlEngineDebugService::setBindingForObject()
 {
     QmlDebugObjectReference rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     QVERIFY(rootObject.debugId != -1);
     QmlDebugPropertyReference widthPropertyRef = findProperty(rootObject.properties, "width");
 
@@ -967,6 +987,7 @@ void tst_QQmlEngineDebugService::setBindingForObject()
     QCOMPARE(m_dbg->valid(), true);
 
     rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     widthPropertyRef =  findProperty(rootObject.properties, "width");
 
     QCOMPARE(widthPropertyRef.value, QVariant(15));
@@ -982,6 +1003,7 @@ void tst_QQmlEngineDebugService::setBindingForObject()
     QCOMPARE(m_dbg->valid(), true);
 
     rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     widthPropertyRef =  findProperty(rootObject.properties, "width");
 
     QCOMPARE(widthPropertyRef.value, QVariant(20));
@@ -992,13 +1014,14 @@ void tst_QQmlEngineDebugService::setBindingForObject()
     // set handler
     //
     rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     QCOMPARE(rootObject.children.size(), 5); // Rectangle, Text, MouseArea, Component.onCompleted, NonScriptPropertyElement
     QmlDebugObjectReference mouseAreaObject = rootObject.children.at(2);
+    QVERIFY(!mouseAreaObject.className.isEmpty());
     m_dbg->queryObjectRecursive(mouseAreaObject, &success);
     QVERIFY(success);
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
     mouseAreaObject = m_dbg->object();
-
     QCOMPARE(mouseAreaObject.className, QString("MouseArea"));
 
     QmlDebugPropertyReference onEnteredRef = findProperty(mouseAreaObject.properties, "onEntered");
@@ -1015,11 +1038,14 @@ void tst_QQmlEngineDebugService::setBindingForObject()
     QCOMPARE(m_dbg->valid(), true);
 
     rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     mouseAreaObject = rootObject.children.at(2);
+    QVERIFY(!mouseAreaObject.className.isEmpty());
     m_dbg->queryObjectRecursive(mouseAreaObject, &success);
     QVERIFY(success);
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
     mouseAreaObject = m_dbg->object();
+    QVERIFY(!mouseAreaObject.className.isEmpty());
     onEnteredRef = findProperty(mouseAreaObject.properties, "onEntered");
     QCOMPARE(onEnteredRef.name, QString("onEntered"));
     QCOMPARE(onEnteredRef.value, QVariant("function() { [code] }"));
@@ -1028,6 +1054,7 @@ void tst_QQmlEngineDebugService::setBindingForObject()
 void tst_QQmlEngineDebugService::resetBindingForObject()
 {
     QmlDebugObjectReference rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     QVERIFY(rootObject.debugId != -1);
     QmlDebugPropertyReference widthPropertyRef = findProperty(rootObject.properties, "width");
 
@@ -1048,6 +1075,7 @@ void tst_QQmlEngineDebugService::resetBindingForObject()
     QCOMPARE(m_dbg->valid(), true);
 
     rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     widthPropertyRef =  findProperty(rootObject.properties, "width");
 
     QCOMPARE(widthPropertyRef.value, QVariant(0));
@@ -1063,6 +1091,7 @@ void tst_QQmlEngineDebugService::resetBindingForObject()
     QCOMPARE(m_dbg->valid(), true);
 
     rootObject = findRootObject();
+    QVERIFY(!rootObject.className.isEmpty());
     QmlDebugPropertyReference boldPropertyRef =  findProperty(rootObject.properties, "font.bold");
 
     QCOMPARE(boldPropertyRef.value.toBool(), false);
@@ -1076,7 +1105,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     const int sourceIndex = 3;
 
     QmlDebugObjectReference obj = findRootObject(sourceIndex);
-
+    QVERIFY(!obj.className.isEmpty());
     QVERIFY(obj.debugId != -1);
     QVERIFY(obj.children.count() >= 2);
     bool success;
@@ -1092,6 +1121,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(),200);
 
 
@@ -1102,6 +1132,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
 
 
     obj = findRootObject(sourceIndex, true);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(),100);
 
 
@@ -1111,6 +1142,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QVERIFY(state.children.count() > 0);
 
     QmlDebugObjectReference propertyChange = state.children[0];
+    QVERIFY(!propertyChange.className.isEmpty());
     QVERIFY(propertyChange.debugId != -1);
 
     m_dbg->setBindingForObject(propertyChange.debugId, "width",QVariant(300),true,
@@ -1120,6 +1152,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
 
     // check properties changed in state
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(),100);
 
 
@@ -1128,6 +1161,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(),300);
 
     // check changing properties of base state from within a state
@@ -1141,6 +1175,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(),300);
 
     m_dbg->queryExpressionResult(obj.debugId,QString("state=\"\""), &success);
@@ -1148,6 +1183,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(), 400);
 
     //  reset binding while in a state
@@ -1156,6 +1192,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QVERIFY(QQmlDebugTest::waitForSignal(m_dbg, SIGNAL(result())));
 
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(), 300);
 
     m_dbg->resetBindingForObject(propertyChange.debugId, "width", &success);
@@ -1164,6 +1201,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QCOMPARE(m_dbg->valid(), true);
 
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(), 400);
 
     // re-add binding
@@ -1174,6 +1212,7 @@ void tst_QQmlEngineDebugService::setBindingInStates()
     QCOMPARE(m_dbg->valid(), true);
 
     obj = findRootObject(sourceIndex);
+    QVERIFY(!obj.className.isEmpty());
     QCOMPARE(findProperty(obj.properties,"width").value.toInt(), 300);
 }
 
@@ -1182,7 +1221,7 @@ void tst_QQmlEngineDebugService::queryObjectTree()
     const int sourceIndex = 3;
 
     QmlDebugObjectReference obj = findRootObject(sourceIndex, true);
-
+    QVERIFY(!obj.className.isEmpty());
     QVERIFY(obj.debugId != -1);
     QVERIFY(obj.children.count() >= 2);
 
@@ -1192,16 +1231,16 @@ void tst_QQmlEngineDebugService::queryObjectTree()
     QVERIFY(state.children.count() > 0);
 
     QmlDebugObjectReference propertyChange = state.children[0];
+    QVERIFY(!propertyChange.className.isEmpty());
     QVERIFY(propertyChange.debugId != -1);
 
     QmlDebugPropertyReference propertyChangeTarget = findProperty(propertyChange.properties,"target");
     QCOMPARE(propertyChangeTarget.objectDebugId, propertyChange.debugId);
 
     QmlDebugObjectReference targetReference = qvariant_cast<QmlDebugObjectReference>(propertyChangeTarget.value);
+    QVERIFY(!targetReference.className.isEmpty());
     QVERIFY(targetReference.debugId != -1);
 
-
-
     // check transition
     QmlDebugObjectReference transition = obj.children[0];
     QCOMPARE(transition.className, QString("Transition"));
@@ -1210,12 +1249,14 @@ void tst_QQmlEngineDebugService::queryObjectTree()
     QVERIFY(transition.children.count() > 0);
 
     QmlDebugObjectReference animation = transition.children[0];
+    QVERIFY(!animation.className.isEmpty());
     QVERIFY(animation.debugId != -1);
 
     QmlDebugPropertyReference animationTarget = findProperty(animation.properties,"target");
     QCOMPARE(animationTarget.objectDebugId, animation.debugId);
 
     targetReference = qvariant_cast<QmlDebugObjectReference>(animationTarget.value);
+    QVERIFY(!targetReference.className.isEmpty());
     QVERIFY(targetReference.debugId != -1);
 
     QCOMPARE(findProperty(animation.properties,"property").value.toString(), QString("width"));
diff --git a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp
index 3e27951d78..c0252a0290 100644
--- a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp
+++ b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp
@@ -386,6 +386,7 @@ void QQmlEngineDebugClient::decode(QPacket &ds,
         {
             QmlDebugObjectReference obj;
             obj.debugId = prop.value.toInt();
+            obj.className = prop.valueTypeName;
             prop.value = qVariantFromValue(obj);
             break;
         }