From f18031dba7860289342a0d11ead1d2b20c971664 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 6 Nov 2009 11:11:35 +1000
Subject: qmlinfo test
---
src/declarative/qml/qmlinfo.cpp | 12 +-
tests/auto/declarative/declarative.pro | 1 +
.../auto/declarative/qmlinfo/data/NestedObject.qml | 8 ++
.../declarative/qmlinfo/data/nestedQmlObject.qml | 8 ++
tests/auto/declarative/qmlinfo/data/qmlObject.qml | 8 ++
tests/auto/declarative/qmlinfo/qmlinfo.pro | 7 ++
tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp | 139 +++++++++++++++++++++
7 files changed, 177 insertions(+), 6 deletions(-)
create mode 100644 tests/auto/declarative/qmlinfo/data/NestedObject.qml
create mode 100644 tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
create mode 100644 tests/auto/declarative/qmlinfo/data/qmlObject.qml
create mode 100644 tests/auto/declarative/qmlinfo/qmlinfo.pro
create mode 100644 tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index c0d9eca..f62f5fd 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -80,18 +80,18 @@ void qmlInfo(const QString& msg, QObject* object)
pos += QLatin1Char(' ');
pos += QLatin1String(object->metaObject()->className());
}
- QmlDeclarativeData *ddata = QmlDeclarativeData::get(object);
+ QmlDeclarativeData *ddata = object?QmlDeclarativeData::get(object):0;
pos += QLatin1String(" (");
if (ddata) {
if (ddata->outerContext) {
pos += ddata->outerContext->baseUrl().toString();
+ pos += QLatin1String(":");
+ pos += QString::number(ddata->lineNumber);
+ pos += QLatin1String(":");
+ pos += QString::number(ddata->columnNumber);
} else {
- pos += qApp->translate("QmlInfo","unknown");
+ pos += qApp->translate("QmlInfo","unknown location");
}
- pos += QLatin1String(":");
- pos += QString::number(ddata->lineNumber);
- pos += QLatin1String(":");
- pos += QString::number(ddata->columnNumber);
} else {
pos += qApp->translate("QmlInfo","unknown location");
}
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 716d278..5fafb7d 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -24,6 +24,7 @@ SUBDIRS += \
qmlgraphicsborderimage \ # Cover
qmlgraphicsparticles \ # Cover
qmlgraphicstext \ # Cover
+ qmlinfo \ # Cover
qmllanguage \ # Cover
qmllist \ # Cover
qmllistaccessor \ # Cover
diff --git a/tests/auto/declarative/qmlinfo/data/NestedObject.qml b/tests/auto/declarative/qmlinfo/data/NestedObject.qml
new file mode 100644
index 0000000..ac96d20
--- /dev/null
+++ b/tests/auto/declarative/qmlinfo/data/NestedObject.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Object {
+ property var nested
+
+ nested: Object {}
+}
+
diff --git a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
new file mode 100644
index 0000000..ee98354
--- /dev/null
+++ b/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Object {
+ property var nested
+ nested: NestedObject { }
+ property var nested2: nested.nested
+}
+
diff --git a/tests/auto/declarative/qmlinfo/data/qmlObject.qml b/tests/auto/declarative/qmlinfo/data/qmlObject.qml
new file mode 100644
index 0000000..b86063b
--- /dev/null
+++ b/tests/auto/declarative/qmlinfo/data/qmlObject.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Object {
+ property var nested
+
+ nested: Object {
+ }
+}
diff --git a/tests/auto/declarative/qmlinfo/qmlinfo.pro b/tests/auto/declarative/qmlinfo/qmlinfo.pro
new file mode 100644
index 0000000..dbebf92
--- /dev/null
+++ b/tests/auto/declarative/qmlinfo/qmlinfo.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qmlinfo.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp b/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
new file mode 100644
index 0000000..8241045
--- /dev/null
+++ b/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QmlEngine>
+#include <QmlComponent>
+#include <QPushButton>
+#include <QmlContext>
+#include <qmlinfo.h>
+
+class tst_qmlinfo : public QObject
+{
+ Q_OBJECT
+public:
+ tst_qmlinfo() {}
+
+private slots:
+ void qmlObject();
+ void nestedQmlObject();
+ void nonQmlObject();
+ void nullObject();
+ void nonQmlContextedObject();
+
+private:
+ QmlEngine engine;
+};
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+ return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+void tst_qmlinfo::qmlObject()
+{
+ QmlComponent component(&engine, TEST_FILE("qmlObject.qml"));
+
+ QObject *object = component.create();
+ QVERIFY(object != 0);
+
+ QString message = "QML " + QString(object->metaObject()->className()) + " (" + component.url().toString() + ":3:1) Test Message";
+ QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+ qmlInfo("Test Message", object);
+
+ QObject *nested = qvariant_cast<QObject *>(object->property("nested"));
+ QVERIFY(nested != 0);
+
+ message = "QML " + QString(nested->metaObject()->className()) + " (" + component.url().toString() + ":6:13) Second Test Message";
+ QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+ qmlInfo("Second Test Message", nested);
+}
+
+void tst_qmlinfo::nestedQmlObject()
+{
+ QmlComponent component(&engine, TEST_FILE("nestedQmlObject.qml"));
+
+ QObject *object = component.create();
+ QVERIFY(object != 0);
+
+ QObject *nested = qvariant_cast<QObject *>(object->property("nested"));
+ QVERIFY(nested != 0);
+ QObject *nested2 = qvariant_cast<QObject *>(object->property("nested2"));
+ QVERIFY(nested2 != 0);
+
+ QString message = "QML " + QString(nested->metaObject()->className()) + " (" + component.url().toString() + ":5:13) Outer Object";
+ QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+ qmlInfo("Outer Object", nested);
+
+ message = "QML " + QString(nested2->metaObject()->className()) + " (" + TEST_FILE("NestedObject.qml").toString() + ":6:14) Inner Object";
+ QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+ qmlInfo("Inner Object", nested2);
+}
+
+void tst_qmlinfo::nonQmlObject()
+{
+ QObject object;
+ QTest::ignoreMessage(QtWarningMsg, "QML QObject (unknown location) Test Message");
+ qmlInfo("Test Message", &object);
+
+ QPushButton pbObject;
+ QTest::ignoreMessage(QtWarningMsg, "QML QPushButton (unknown location) Test Message");
+ qmlInfo("Test Message", &pbObject);
+}
+
+void tst_qmlinfo::nullObject()
+{
+ QTest::ignoreMessage(QtWarningMsg, "QML (unknown location) Null Object Test Message");
+ qmlInfo("Null Object Test Message", 0);
+}
+
+void tst_qmlinfo::nonQmlContextedObject()
+{
+ QObject object;
+ QmlContext context(&engine);
+ QmlEngine::setContextForObject(&object, &context);
+ QTest::ignoreMessage(QtWarningMsg, "QML QObject (unknown location) Test Message");
+ qmlInfo("Test Message", &object);
+}
+
+QTEST_MAIN(tst_qmlinfo)
+
+#include "tst_qmlinfo.moc"
--
cgit v0.12