diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | 221 |
1 files changed, 0 insertions, 221 deletions
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp deleted file mode 100644 index 868cd901c0..0000000000 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ /dev/null @@ -1,221 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qtest.h> -#include <QDeclarativeEngine> -#include <QDeclarativeComponent> -#include <QTimer> -#include <QDeclarativeContext> -#include <qdeclarativeinfo.h> -#include "../../shared/util.h" - -class tst_qdeclarativeinfo : public QDeclarativeDataTest -{ - Q_OBJECT -public: - tst_qdeclarativeinfo() {} - -private slots: - void qmlObject(); - void nestedQmlObject(); - void nestedComponent(); - void nonQmlObject(); - void nullObject(); - void nonQmlContextedObject(); - void types(); - void chaining(); - -private: - QDeclarativeEngine engine; -}; - -void tst_qdeclarativeinfo::qmlObject() -{ - QDeclarativeComponent component(&engine, testFileUrl("qmlObject.qml")); - - QObject *object = component.create(); - QVERIFY(object != 0); - - QString message = component.url().toString() + ":3:1: QML QtObject: Test Message"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - qmlInfo(object) << "Test Message"; - - QObject *nested = qvariant_cast<QObject *>(object->property("nested")); - QVERIFY(nested != 0); - - message = component.url().toString() + ":6:13: QML QtObject: Second Test Message"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - qmlInfo(nested) << "Second Test Message"; -} - -void tst_qdeclarativeinfo::nestedQmlObject() -{ - QDeclarativeComponent component(&engine, testFileUrl("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 = component.url().toString() + ":5:13: QML NestedObject: Outer Object"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - qmlInfo(nested) << "Outer Object"; - - message = testFileUrl("NestedObject.qml").toString() + ":6:14: QML QtObject: Inner Object"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - qmlInfo(nested2) << "Inner Object"; -} - -void tst_qdeclarativeinfo::nestedComponent() -{ - QDeclarativeComponent component(&engine, testFileUrl("NestedComponent.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 = component.url().toString() + ":10:9: QML NestedObject: Complex Object"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - qmlInfo(nested) << "Complex Object"; - - message = component.url().toString() + ":16:9: QML Image: Simple Object"; - QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); - qmlInfo(nested2) << "Simple Object"; -} - -void tst_qdeclarativeinfo::nonQmlObject() -{ - QObject object; - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QtObject: Test Message"); - qmlInfo(&object) << "Test Message"; - - QTimer nonQmlObject; - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QTimer: Test Message"); - qmlInfo(&nonQmlObject) << "Test Message"; -} - -void tst_qdeclarativeinfo::nullObject() -{ - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: Null Object Test Message"); - qmlInfo(0) << "Null Object Test Message"; -} - -void tst_qdeclarativeinfo::nonQmlContextedObject() -{ - QObject object; - QDeclarativeContext context(&engine); - QDeclarativeEngine::setContextForObject(&object, &context); - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QtObject: Test Message"); - qmlInfo(&object) << "Test Message"; -} - -void tst_qdeclarativeinfo::types() -{ - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false"); - qmlInfo(0) << false; - - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: 1.1"); - qmlInfo(0) << 1.1; - - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: 1.2"); - qmlInfo(0) << 1.2f; - - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: 15"); - qmlInfo(0) << 15; - - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: 'b'"); - qmlInfo(0) << QChar('b'); - - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: \"Qt\""); - qmlInfo(0) << QByteArray("Qt"); - - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: true"); - qmlInfo(0) << bool(true); - - //### do we actually want QUrl to show up in the output? - //### why the extra space at the end? - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QUrl(\"http://qt.nokia.com\") "); - qmlInfo(0) << QUrl("http://qt.nokia.com"); - - //### should this be quoted? - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: hello"); - qmlInfo(0) << QLatin1String("hello"); - - //### should this be quoted? - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: World"); - QString str("Hello World"); - QStringRef ref(&str, 6, 5); - qmlInfo(0) << ref; - - //### should this be quoted? - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: Quick"); - qmlInfo(0) << QString ("Quick"); -} - -void tst_qdeclarativeinfo::chaining() -{ - //### should more of these be automatically inserting spaces? - QString str("Hello World"); - QStringRef ref(&str, 6, 5); - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://qt.nokia.com\") World \"Qt\" true Quick "); - qmlInfo(0) << false << ' ' - << 1.1 << ' ' - << 1.2f << ' ' - << 15 << ' ' - << QLatin1String("hello") << ' ' - << QChar('b') << ' ' - << QUrl("http://qt.nokia.com") - << ref - << QByteArray("Qt") - << bool(true) - << QString ("Quick"); -} - -QTEST_MAIN(tst_qdeclarativeinfo) - -#include "tst_qdeclarativeinfo.moc" |