projects / profile / ivi / qtdeclarative.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename Qt Quick-specific classes to QQuick*
[profile/ivi/qtdeclarative.git] / tests / auto / declarative / qquickflickable / tst_qquickflickable.cpp
diff --git a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp b/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp
similarity index 78%
rename from tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
rename to tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp
index f8d7bfd..2f155e2 100644 (file)
--- a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
+++ b/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp
@@ -42,18 +42,18 @@
 #include <QtTest/QSignalSpy>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qsgview.h>
-#include <private/qsgflickable_p.h>
+#include <QtDeclarative/qquickview.h>
+#include <private/qquickflickable_p.h>
 #include <private/qdeclarativevaluetype_p.h>
 #include <math.h>
 #include "../shared/util.h"
 #include <QtOpenGL/QGLShaderProgram>
 
-class tst_qsgflickable : public QObject
+class tst_qquickflickable : public QObject
 {
     Q_OBJECT
 public:
-    tst_qsgflickable();
+    tst_qquickflickable();
 
 private slots:
     void initTestCase();
@@ -80,30 +80,30 @@ private slots:
 private:
     QDeclarativeEngine engine;
 
-    void flick(QSGView *canvas, const QPoint &from, const QPoint &to, int duration);
+    void flick(QQuickView *canvas, const QPoint &from, const QPoint &to, int duration);
     template<typename T>
-    T *findItem(QSGItem *parent, const QString &objectName);
+    T *findItem(QQuickItem *parent, const QString &objectName);
 };
 
-tst_qsgflickable::tst_qsgflickable()
+tst_qquickflickable::tst_qquickflickable()
 {
 }
 
-void tst_qsgflickable::initTestCase()
+void tst_qquickflickable::initTestCase()
 {
 
 }
 
-void tst_qsgflickable::cleanupTestCase()
+void tst_qquickflickable::cleanupTestCase()
 {
 
 }
 
-void tst_qsgflickable::create()
+void tst_qquickflickable::create()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable01.qml")));
-    QSGFlickable *obj = qobject_cast<QSGFlickable*>(c.create());
+    QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->isAtXBeginning(), true);
@@ -117,18 +117,18 @@ void tst_qsgflickable::create()
     QCOMPARE(obj->verticalVelocity(), 0.);
 
     QCOMPARE(obj->isInteractive(), true);
-    QCOMPARE(obj->boundsBehavior(), QSGFlickable::DragAndOvershootBounds);
+    QCOMPARE(obj->boundsBehavior(), QQuickFlickable::DragAndOvershootBounds);
     QCOMPARE(obj->pressDelay(), 0);
     QCOMPARE(obj->maximumFlickVelocity(), 2500.);
 
     delete obj;
 }
 
-void tst_qsgflickable::horizontalViewportSize()
+void tst_qquickflickable::horizontalViewportSize()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable02.qml")));
-    QSGFlickable *obj = qobject_cast<QSGFlickable*>(c.create());
+    QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->contentWidth(), 800.);
@@ -141,11 +141,11 @@ void tst_qsgflickable::horizontalViewportSize()
     delete obj;
 }
 
-void tst_qsgflickable::verticalViewportSize()
+void tst_qquickflickable::verticalViewportSize()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable03.qml")));
-    QSGFlickable *obj = qobject_cast<QSGFlickable*>(c.create());
+    QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->contentWidth(), 200.);
@@ -158,15 +158,15 @@ void tst_qsgflickable::verticalViewportSize()
     delete obj;
 }
 
-void tst_qsgflickable::properties()
+void tst_qquickflickable::properties()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable04.qml")));
-    QSGFlickable *obj = qobject_cast<QSGFlickable*>(c.create());
+    QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->isInteractive(), false);
-    QCOMPARE(obj->boundsBehavior(), QSGFlickable::StopAtBounds);
+    QCOMPARE(obj->boundsBehavior(), QQuickFlickable::StopAtBounds);
     QCOMPARE(obj->pressDelay(), 200);
     QCOMPARE(obj->maximumFlickVelocity(), 2000.);
 
@@ -177,40 +177,40 @@ void tst_qsgflickable::properties()
     delete obj;
 }
 
-void tst_qsgflickable::boundsBehavior()
+void tst_qquickflickable::boundsBehavior()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 2.0; Flickable { boundsBehavior: Flickable.StopAtBounds }", QUrl::fromLocalFile(""));
-    QSGFlickable *flickable = qobject_cast<QSGFlickable*>(component.create());
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(boundsBehaviorChanged()));
 
     QVERIFY(flickable);
-    QVERIFY(flickable->boundsBehavior() == QSGFlickable::StopAtBounds);
+    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::StopAtBounds);
 
-    flickable->setBoundsBehavior(QSGFlickable::DragAndOvershootBounds);
-    QVERIFY(flickable->boundsBehavior() == QSGFlickable::DragAndOvershootBounds);
+    flickable->setBoundsBehavior(QQuickFlickable::DragAndOvershootBounds);
+    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::DragAndOvershootBounds);
     QCOMPARE(spy.count(),1);
-    flickable->setBoundsBehavior(QSGFlickable::DragAndOvershootBounds);
+    flickable->setBoundsBehavior(QQuickFlickable::DragAndOvershootBounds);
     QCOMPARE(spy.count(),1);
 
-    flickable->setBoundsBehavior(QSGFlickable::DragOverBounds);
-    QVERIFY(flickable->boundsBehavior() == QSGFlickable::DragOverBounds);
+    flickable->setBoundsBehavior(QQuickFlickable::DragOverBounds);
+    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::DragOverBounds);
     QCOMPARE(spy.count(),2);
-    flickable->setBoundsBehavior(QSGFlickable::DragOverBounds);
+    flickable->setBoundsBehavior(QQuickFlickable::DragOverBounds);
     QCOMPARE(spy.count(),2);
 
-    flickable->setBoundsBehavior(QSGFlickable::StopAtBounds);
-    QVERIFY(flickable->boundsBehavior() == QSGFlickable::StopAtBounds);
+    flickable->setBoundsBehavior(QQuickFlickable::StopAtBounds);
+    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::StopAtBounds);
     QCOMPARE(spy.count(),3);
-    flickable->setBoundsBehavior(QSGFlickable::StopAtBounds);
+    flickable->setBoundsBehavior(QQuickFlickable::StopAtBounds);
     QCOMPARE(spy.count(),3);
 }
 
-void tst_qsgflickable::maximumFlickVelocity()
+void tst_qquickflickable::maximumFlickVelocity()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 2.0; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile(""));
-    QSGFlickable *flickable = qobject_cast<QSGFlickable*>(component.create());
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(maximumFlickVelocityChanged()));
 
     QVERIFY(flickable);
@@ -223,11 +223,11 @@ void tst_qsgflickable::maximumFlickVelocity()
     QCOMPARE(spy.count(),1);
 }
 
-void tst_qsgflickable::flickDeceleration()
+void tst_qquickflickable::flickDeceleration()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 2.0; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile(""));
-    QSGFlickable *flickable = qobject_cast<QSGFlickable*>(component.create());
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(flickDecelerationChanged()));
 
     QVERIFY(flickable);
@@ -240,11 +240,11 @@ void tst_qsgflickable::flickDeceleration()
     QCOMPARE(spy.count(),1);
 }
 
-void tst_qsgflickable::pressDelay()
+void tst_qquickflickable::pressDelay()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 2.0; Flickable { pressDelay: 100; }", QUrl::fromLocalFile(""));
-    QSGFlickable *flickable = qobject_cast<QSGFlickable*>(component.create());
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(pressDelayChanged()));
 
     QVERIFY(flickable);
@@ -258,18 +258,18 @@ void tst_qsgflickable::pressDelay()
 }
 
 // QTBUG-17361
-void tst_qsgflickable::nestedPressDelay()
+void tst_qquickflickable::nestedPressDelay()
 {
-    QSGView *canvas = new QSGView;
+    QQuickView *canvas = new QQuickView;
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("nestedPressDelay.qml")));
     canvas->show();
     canvas->requestActivateWindow();
     QVERIFY(canvas->rootObject() != 0);
 
-    QSGFlickable *outer = qobject_cast<QSGFlickable*>(canvas->rootObject());
+    QQuickFlickable *outer = qobject_cast<QQuickFlickable*>(canvas->rootObject());
     QVERIFY(outer != 0);
 
-    QSGFlickable *inner = canvas->rootObject()->findChild<QSGFlickable*>("innerFlickable");
+    QQuickFlickable *inner = canvas->rootObject()->findChild<QQuickFlickable*>("innerFlickable");
     QVERIFY(inner != 0);
 
     QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(150, 150));
@@ -285,40 +285,40 @@ void tst_qsgflickable::nestedPressDelay()
     delete canvas;
 }
 
-void tst_qsgflickable::flickableDirection()
+void tst_qquickflickable::flickableDirection()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 2.0; Flickable { flickableDirection: Flickable.VerticalFlick; }", QUrl::fromLocalFile(""));
-    QSGFlickable *flickable = qobject_cast<QSGFlickable*>(component.create());
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(flickableDirectionChanged()));
 
     QVERIFY(flickable);
-    QCOMPARE(flickable->flickableDirection(), QSGFlickable::VerticalFlick);
+    QCOMPARE(flickable->flickableDirection(), QQuickFlickable::VerticalFlick);
 
-    flickable->setFlickableDirection(QSGFlickable::HorizontalAndVerticalFlick);
-    QCOMPARE(flickable->flickableDirection(), QSGFlickable::HorizontalAndVerticalFlick);
+    flickable->setFlickableDirection(QQuickFlickable::HorizontalAndVerticalFlick);
+    QCOMPARE(flickable->flickableDirection(), QQuickFlickable::HorizontalAndVerticalFlick);
     QCOMPARE(spy.count(),1);
 
-    flickable->setFlickableDirection(QSGFlickable::AutoFlickDirection);
-    QCOMPARE(flickable->flickableDirection(), QSGFlickable::AutoFlickDirection);
+    flickable->setFlickableDirection(QQuickFlickable::AutoFlickDirection);
+    QCOMPARE(flickable->flickableDirection(), QQuickFlickable::AutoFlickDirection);
     QCOMPARE(spy.count(),2);
 
-    flickable->setFlickableDirection(QSGFlickable::HorizontalFlick);
-    QCOMPARE(flickable->flickableDirection(), QSGFlickable::HorizontalFlick);
+    flickable->setFlickableDirection(QQuickFlickable::HorizontalFlick);
+    QCOMPARE(flickable->flickableDirection(), QQuickFlickable::HorizontalFlick);
     QCOMPARE(spy.count(),3);
 
-    flickable->setFlickableDirection(QSGFlickable::HorizontalFlick);
-    QCOMPARE(flickable->flickableDirection(), QSGFlickable::HorizontalFlick);
+    flickable->setFlickableDirection(QQuickFlickable::HorizontalFlick);
+    QCOMPARE(flickable->flickableDirection(), QQuickFlickable::HorizontalFlick);
     QCOMPARE(spy.count(),3);
 }
 
 // QtQuick 1.1
-void tst_qsgflickable::resizeContent()
+void tst_qquickflickable::resizeContent()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("resize.qml")));
-    QSGItem *root = qobject_cast<QSGItem*>(c.create());
-    QSGFlickable *obj = findItem<QSGFlickable>(root, "flick");
+    QQuickItem *root = qobject_cast<QQuickItem*>(c.create());
+    QQuickFlickable *obj = findItem<QQuickFlickable>(root, "flick");
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->contentX(), 0.);
@@ -337,12 +337,12 @@ void tst_qsgflickable::resizeContent()
 }
 
 // QtQuick 1.1
-void tst_qsgflickable::returnToBounds()
+void tst_qquickflickable::returnToBounds()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("resize.qml")));
-    QSGItem *root = qobject_cast<QSGItem*>(c.create());
-    QSGFlickable *obj = findItem<QSGFlickable>(root, "flick");
+    QQuickItem *root = qobject_cast<QQuickItem*>(c.create());
+    QQuickFlickable *obj = findItem<QQuickFlickable>(root, "flick");
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->contentX(), 0.);
@@ -363,15 +363,15 @@ void tst_qsgflickable::returnToBounds()
     delete root;
 }
 
-void tst_qsgflickable::wheel()
+void tst_qquickflickable::wheel()
 {
-    QSGView *canvas = new QSGView;
+    QQuickView *canvas = new QQuickView;
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("wheel.qml")));
     canvas->show();
     canvas->requestActivateWindow();
     QVERIFY(canvas->rootObject() != 0);
 
-    QSGFlickable *flick = canvas->rootObject()->findChild<QSGFlickable*>("flick");
+    QQuickFlickable *flick = canvas->rootObject()->findChild<QQuickFlickable*>("flick");
     QVERIFY(flick != 0);
 
     {
@@ -398,16 +398,16 @@ void tst_qsgflickable::wheel()
     delete canvas;
 }
 
-void tst_qsgflickable::movingAndDragging()
+void tst_qquickflickable::movingAndDragging()
 {
-    QSGView *canvas = new QSGView;
+    QQuickView *canvas = new QQuickView;
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("flickable03.qml")));
     canvas->show();
     canvas->requestActivateWindow();
     QTest::qWaitForWindowShown(canvas);
     QVERIFY(canvas->rootObject() != 0);
 
-    QSGFlickable *flickable = qobject_cast<QSGFlickable*>(canvas->rootObject());
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(canvas->rootObject());
     QVERIFY(flickable != 0);
 
     QSignalSpy vDragSpy(flickable, SIGNAL(draggingVerticallyChanged()));
@@ -503,15 +503,15 @@ void tst_qsgflickable::movingAndDragging()
     delete canvas;
 }
 
-void tst_qsgflickable::disabled()
+void tst_qquickflickable::disabled()
 {
-    QSGView *canvas = new QSGView;
+    QQuickView *canvas = new QQuickView;
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("disabled.qml")));
     canvas->show();
     canvas->requestActivateWindow();
     QVERIFY(canvas->rootObject() != 0);
 
-    QSGFlickable *flick = canvas->rootObject()->findChild<QSGFlickable*>("flickable");
+    QQuickFlickable *flick = canvas->rootObject()->findChild<QQuickFlickable*>("flickable");
     QVERIFY(flick != 0);
 
     QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(50, 90));
@@ -531,19 +531,19 @@ void tst_qsgflickable::disabled()
     QTRY_VERIFY(canvas->rootObject()->property("clicked").toBool() == true);
 }
 
-void tst_qsgflickable::flickVelocity()
+void tst_qquickflickable::flickVelocity()
 {
 #ifdef Q_WS_MAC
     QSKIP("Producing flicks on Mac CI impossible due to timing problems");
 #endif
 
-    QSGView *canvas = new QSGView;
+    QQuickView *canvas = new QQuickView;
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("flickable03.qml")));
     canvas->show();
     canvas->requestActivateWindow();
     QVERIFY(canvas->rootObject() != 0);
 
-    QSGFlickable *flickable = qobject_cast<QSGFlickable*>(canvas->rootObject());
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(canvas->rootObject());
     QVERIFY(flickable != 0);
 
     // flick up
@@ -559,12 +559,12 @@ void tst_qsgflickable::flickVelocity()
     delete canvas;
 }
 
-void tst_qsgflickable::margins()
+void tst_qquickflickable::margins()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("margins.qml")));
-    QSGItem *root = qobject_cast<QSGItem*>(c.create());
-    QSGFlickable *obj = qobject_cast<QSGFlickable*>(root);
+    QQuickItem *root = qobject_cast<QQuickItem*>(c.create());
+    QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(root);
     QVERIFY(obj != 0);
 
     // starting state
@@ -618,7 +618,7 @@ void tst_qsgflickable::margins()
     delete root;
 }
 
-void tst_qsgflickable::flick(QSGView *canvas, const QPoint &from, const QPoint &to, int duration)
+void tst_qquickflickable::flick(QQuickView *canvas, const QPoint &from, const QPoint &to, int duration)
 {
     const int pointCount = 5;
     QPoint diff = to - from;
@@ -637,12 +637,12 @@ void tst_qsgflickable::flick(QSGView *canvas, const QPoint &from, const QPoint &
 }
 
 template<typename T>
-T *tst_qsgflickable::findItem(QSGItem *parent, const QString &objectName)
+T *tst_qquickflickable::findItem(QQuickItem *parent, const QString &objectName)
 {
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QSGItem *item = qobject_cast<QSGItem*>(parent->childItems().at(i));
+        QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i));
         if (!item)
             continue;
         //qDebug() << "try" << item;
@@ -657,6 +657,6 @@ T *tst_qsgflickable::findItem(QSGItem *parent, const QString &objectName)
     return 0;
 }
 
-QTEST_MAIN(tst_qsgflickable)
+QTEST_MAIN(tst_qquickflickable)
 
-#include "tst_qsgflickable.moc"
+#include "tst_qquickflickable.moc"
Domain: UI Framework / Uncategorized;