diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-07-11 13:47:51 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 06:38:09 +0200 |
commit | 4442dea01b9d4d45964228ac442166d89f091f9e (patch) | |
tree | 28ae20cb26967765a988b1ee522fc2d64d777671 /tests/auto/declarative/qdeclarativeview | |
parent | b119220da60453ecf31898f7a57eda9d3c4e9225 (diff) |
Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeview')
5 files changed, 0 insertions, 352 deletions
diff --git a/tests/auto/declarative/qdeclarativeview/data/error1.qml b/tests/auto/declarative/qdeclarativeview/data/error1.qml deleted file mode 100644 index 4887ff908f..0000000000 --- a/tests/auto/declarative/qdeclarativeview/data/error1.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 1.0 - -Rectangle { - nonExistentProperty: 5 -} diff --git a/tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml b/tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml deleted file mode 100644 index e5501a10dc..0000000000 --- a/tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 1.0 -Item { - width: 200 - height: 200 -} diff --git a/tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml b/tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml deleted file mode 100644 index f27090888b..0000000000 --- a/tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 1.0 -QGraphicsWidget { - width: 200 - height: 200 -} diff --git a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro deleted file mode 100644 index 5b401973f9..0000000000 --- a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro +++ /dev/null @@ -1,14 +0,0 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui -macx:CONFIG -= app_bundle - -SOURCES += tst_qdeclarativeview.cpp - -symbian: { - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp deleted file mode 100644 index 0483e0a0e8..0000000000 --- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp +++ /dev/null @@ -1,323 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 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$ -** 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 <QtTest/QSignalSpy> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/qdeclarativeview.h> -#include <QtDeclarative/qdeclarativeitem.h> -#include <QtGui/qgraphicswidget.h> -#include "../../../shared/util.h" - -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - -class tst_QDeclarativeView : public QObject - -{ - Q_OBJECT -public: - tst_QDeclarativeView(); - -private slots: - void scene(); - void resizemodedeclarativeitem(); - void resizemodegraphicswidget(); - void errors(); - -private: - template<typename T> - T *findItem(QGraphicsObject *parent, const QString &objectName); -}; - - -tst_QDeclarativeView::tst_QDeclarativeView() -{ -} - -void tst_QDeclarativeView::scene() -{ - // QTBUG-14771 - QGraphicsScene scene; - scene.setItemIndexMethod(QGraphicsScene::NoIndex); - scene.setStickyFocus(true); - - QDeclarativeView *view = new QDeclarativeView(); - QVERIFY(view); - QVERIFY(view->scene()); - view->setScene(&scene); - QCOMPARE(view->scene(), &scene); - - view->setSource(QUrl::fromLocalFile(SRCDIR "/data/resizemodedeclarativeitem.qml")); - QDeclarativeItem* declarativeItem = qobject_cast<QDeclarativeItem*>(view->rootObject()); - QVERIFY(declarativeItem); - QVERIFY(scene.items().count() > 0); - QCOMPARE(scene.items().at(0), declarativeItem); - - delete view; -} - -void tst_QDeclarativeView::resizemodedeclarativeitem() -{ - QWidget window; - QDeclarativeView *canvas = new QDeclarativeView(&window); - QVERIFY(canvas); - QSignalSpy sceneResizedSpy(canvas, SIGNAL(sceneResized(QSize))); - canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView); - QCOMPARE(QSize(0,0), canvas->initialSize()); - canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/resizemodedeclarativeitem.qml")); - QDeclarativeItem* declarativeItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject()); - QVERIFY(declarativeItem); - window.show(); - - // initial size from root object - QCOMPARE(declarativeItem->width(), 200.0); - QCOMPARE(declarativeItem->height(), 200.0); - QCOMPARE(canvas->size(), QSize(200, 200)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(canvas->size(), canvas->initialSize()); - QCOMPARE(sceneResizedSpy.count(), 1); - - // size update from view - canvas->resize(QSize(80,100)); - QCOMPARE(declarativeItem->width(), 80.0); - QCOMPARE(declarativeItem->height(), 100.0); - QCOMPARE(canvas->size(), QSize(80, 100)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy.count(), 2); - - canvas->setResizeMode(QDeclarativeView::SizeViewToRootObject); - - // size update from view disabled - canvas->resize(QSize(60,80)); - QCOMPARE(declarativeItem->width(), 80.0); - QCOMPARE(declarativeItem->height(), 100.0); - QCOMPARE(canvas->size(), QSize(60, 80)); - QCOMPARE(sceneResizedSpy.count(), 3); - - // size update from root object - declarativeItem->setWidth(250); - declarativeItem->setHeight(350); - QCOMPARE(declarativeItem->width(), 250.0); - QCOMPARE(declarativeItem->height(), 350.0); - QTRY_COMPARE(canvas->size(), QSize(250, 350)); - QCOMPARE(canvas->size(), QSize(250, 350)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy.count(), 4); - - // reset canvas - window.hide(); - delete canvas; - canvas = new QDeclarativeView(&window); - QVERIFY(canvas); - QSignalSpy sceneResizedSpy2(canvas, SIGNAL(sceneResized(QSize))); - canvas->setResizeMode(QDeclarativeView::SizeViewToRootObject); - canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/resizemodedeclarativeitem.qml")); - declarativeItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject()); - QVERIFY(declarativeItem); - window.show(); - - // initial size for root object - QCOMPARE(declarativeItem->width(), 200.0); - QCOMPARE(declarativeItem->height(), 200.0); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(canvas->size(), canvas->initialSize()); - QCOMPARE(sceneResizedSpy2.count(), 1); - - // size update from root object - declarativeItem->setWidth(80); - declarativeItem->setHeight(100); - QCOMPARE(declarativeItem->width(), 80.0); - QCOMPARE(declarativeItem->height(), 100.0); - QTRY_COMPARE(canvas->size(), QSize(80, 100)); - QCOMPARE(canvas->size(), QSize(80, 100)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy2.count(), 2); - - // size update from root object disabled - canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView); - declarativeItem->setWidth(60); - declarativeItem->setHeight(80); - QCOMPARE(canvas->width(), 80); - QCOMPARE(canvas->height(), 100); - QCOMPARE(QSize(declarativeItem->width(), declarativeItem->height()), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy2.count(), 2); - - // size update from view - canvas->resize(QSize(200,300)); - QCOMPARE(declarativeItem->width(), 200.0); - QCOMPARE(declarativeItem->height(), 300.0); - QCOMPARE(canvas->size(), QSize(200, 300)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy2.count(), 3); - - delete canvas; -} - -void tst_QDeclarativeView::resizemodegraphicswidget() -{ - QWidget window; - QDeclarativeView *canvas = new QDeclarativeView(&window); - QVERIFY(canvas); - QSignalSpy sceneResizedSpy(canvas, SIGNAL(sceneResized(QSize))); - canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView); - canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/resizemodegraphicswidget.qml")); - QGraphicsWidget* graphicsWidget = qobject_cast<QGraphicsWidget*>(canvas->rootObject()); - QVERIFY(graphicsWidget); - window.show(); - - // initial size from root object - QCOMPARE(graphicsWidget->size(), QSizeF(200.0, 200.0)); - QCOMPARE(canvas->size(), QSize(200, 200)); - QCOMPARE(canvas->size(), QSize(200, 200)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(canvas->size(), canvas->initialSize()); - QCOMPARE(sceneResizedSpy.count(), 1); - - // size update from view - canvas->resize(QSize(80,100)); - QCOMPARE(graphicsWidget->size(), QSizeF(80.0,100.0)); - QCOMPARE(canvas->size(), QSize(80,100)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy.count(), 2); - - // size update from view disabled - canvas->setResizeMode(QDeclarativeView::SizeViewToRootObject); - canvas->resize(QSize(60,80)); - QCOMPARE(graphicsWidget->size(), QSizeF(80.0,100.0)); - QCOMPARE(canvas->size(), QSize(60, 80)); - QCOMPARE(sceneResizedSpy.count(), 3); - - // size update from root object - graphicsWidget->resize(QSizeF(250.0, 350.0)); - QCOMPARE(graphicsWidget->size(), QSizeF(250.0,350.0)); - QCOMPARE(canvas->size(), QSize(250, 350)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy.count(), 4); - - // reset canvas - window.hide(); - delete canvas; - canvas = new QDeclarativeView(&window); - QVERIFY(canvas); - QSignalSpy sceneResizedSpy2(canvas, SIGNAL(sceneResized(QSize))); - canvas->setResizeMode(QDeclarativeView::SizeViewToRootObject); - canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/resizemodegraphicswidget.qml")); - graphicsWidget = qobject_cast<QGraphicsWidget*>(canvas->rootObject()); - QVERIFY(graphicsWidget); - window.show(); - - // initial size from root object - QCOMPARE(graphicsWidget->size(), QSizeF(200.0, 200.0)); - QCOMPARE(canvas->size(), QSize(200, 200)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(canvas->size(), canvas->initialSize()); - QCOMPARE(sceneResizedSpy2.count(), 1); - - // size update from root object - graphicsWidget->resize(QSizeF(80, 100)); - QCOMPARE(graphicsWidget->size(), QSizeF(80.0, 100.0)); - QCOMPARE(canvas->size(), QSize(80, 100)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy2.count(), 2); - - // size update from root object disabled - canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView); - graphicsWidget->resize(QSizeF(60,80)); - QCOMPARE(canvas->size(), QSize(80,100)); - QCOMPARE(QSize(graphicsWidget->size().width(), graphicsWidget->size().height()), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy2.count(), 2); - - // size update from view - canvas->resize(QSize(200,300)); - QCOMPARE(graphicsWidget->size(), QSizeF(200.0, 300.0)); - QCOMPARE(canvas->size(), QSize(200, 300)); - QCOMPARE(canvas->size(), canvas->sizeHint()); - QCOMPARE(sceneResizedSpy2.count(), 3); - - window.show(); - delete canvas; -} - -static void silentErrorsMsgHandler(QtMsgType, const char *) -{ -} - -void tst_QDeclarativeView::errors() -{ - QDeclarativeView *canvas = new QDeclarativeView; - QVERIFY(canvas); - QtMsgHandler old = qInstallMsgHandler(silentErrorsMsgHandler); - canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/error1.qml")); - qInstallMsgHandler(old); - QVERIFY(canvas->status() == QDeclarativeView::Error); - QVERIFY(canvas->errors().count() == 1); - delete canvas; -} - -template<typename T> -T *tst_QDeclarativeView::findItem(QGraphicsObject *parent, const QString &objectName) -{ - if (!parent) - return 0; - - const QMetaObject &mo = T::staticMetaObject; - //qDebug() << parent->QGraphicsObject::children().count() << "children"; - for (int i = 0; i < parent->childItems().count(); ++i) { - QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i)); - if(!item) - continue; - //qDebug() << "try" << item; - if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) - return static_cast<T*>(item); - item = findItem<T>(item, objectName); - if (item) - return static_cast<T*>(item); - } - - return 0; -} - -QTEST_MAIN(tst_QDeclarativeView) - -#include "tst_qdeclarativeview.moc" |