Test fixes and reenables.

Change-Id: I85e3493855b6fefb682ddb120b15abd003fb00fd
Reviewed-on: http://codereview.qt-project.org/5045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

3 files changed, 28 insertions, 40 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 4bda9422d9..5322913d7b 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -27,7 +27,7 @@ PUBLICTESTS += \
 
 PRIVATETESTS += \
     qdeclarativeanimations \
-#   qdeclarativeapplication \
+    qdeclarativeapplication \
     qdeclarativebehaviors \
     qdeclarativebinding \
     qdeclarativeconnection \
@@ -48,7 +48,7 @@ PRIVATETESTS += \
     qdeclarativestyledtext \
     qdeclarativesqldatabase \
     qdeclarativestates \
-#   qdeclarativesystempalette \
+    qdeclarativesystempalette \
     qdeclarativetimer \
     qdeclarativevaluetypes \
     qdeclarativeworkerscript \
@@ -60,23 +60,23 @@ SGTESTS =  \
     qsganimatedimage \
     qsgborderimage \
     qsgcanvas \
-#   qsgflickable \
+    qsgflickable \
     qsgflipable \
-#   qsgfocusscope \
-#   qsggridview \
-#   qsgimage \
+    qsgfocusscope \
+    qsggridview \
+    qsgimage \
     qsgitem \
     qsglistview \
     qsgloader \
     qsgmousearea \
-#   qsgpathview \
+    qsgpathview \
     qsgpincharea \
-#   qsgpositioners \
+    qsgpositioners \
     qsgrepeater \
     qsgtext \
 #   qsgtextedit \
 #   qsgtextinput \
-#   qsgvisualdatamodel \
+    qsgvisualdatamodel \
 
 
 SUBDIRS += $$PUBLICTESTS
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
index c79516e0ef..71ff738619 100644
--- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
+++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
@@ -42,7 +42,7 @@
 #include <qtest.h>
 #include <QDeclarativeEngine>
 #include <QDeclarativeComponent>
-#include <QPushButton>
+#include <QTimer>
 #include <QDeclarativeContext>
 #include <qdeclarativeinfo.h>
 
@@ -143,9 +143,9 @@ void tst_qdeclarativeinfo::nonQmlObject()
     QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QtObject: Test Message");
     qmlInfo(&object) << "Test Message";
 
-    QPushButton pbObject;
-    QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QPushButton: Test Message");
-    qmlInfo(&pbObject) << "Test Message";
+    QTimer nonQmlObject;
+    QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML QTimer: Test Message");
+    qmlInfo(&nonQmlObject) << "Test Message";
 }
 
 void tst_qdeclarativeinfo::nullObject()
diff --git a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp b/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
index d12008f5b7..e75914a746 100644
--- a/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
+++ b/tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
@@ -408,6 +408,7 @@ void tst_qsgflickable::movingAndDragging()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
     canvas->show();
     canvas->requestActivateWindow();
+    QTest::qWaitForWindowShown(canvas);
     QVERIFY(canvas->rootObject() != 0);
 
     QSGFlickable *flickable = qobject_cast<QSGFlickable*>(canvas->rootObject());
@@ -425,14 +426,11 @@ void tst_qsgflickable::movingAndDragging()
     //Vertical
     QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(50, 90));
 
-    QMouseEvent moveEvent(QEvent::MouseMove, QPoint(50, 80), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
-
-    moveEvent = QMouseEvent(QEvent::MouseMove, QPoint(50, 70), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
+    QTest::mouseMove(canvas, QPoint(50, 80));
+    QTest::mouseMove(canvas, QPoint(50, 70));
+    QTest::mouseMove(canvas, QPoint(50, 60));
 
-    moveEvent = QMouseEvent(QEvent::MouseMove, QPoint(50, 60), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
+    QMouseEvent moveEvent(QEvent::MouseMove, QPoint(50, 80), Qt::LeftButton, Qt::LeftButton, 0);
 
     QVERIFY(!flickable->isDraggingHorizontally());
     QVERIFY(flickable->isDraggingVertically());
@@ -452,7 +450,7 @@ void tst_qsgflickable::movingAndDragging()
 
     QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(50, 60));
 
-    QVERIFY(!flickable->isDraggingVertically());
+    QTRY_VERIFY(!flickable->isDraggingVertically());
     QVERIFY(!flickable->isDragging());
     QCOMPARE(vDragSpy.count(), 2);
     QCOMPARE(dragSpy.count(), 2);
@@ -475,14 +473,9 @@ void tst_qsgflickable::movingAndDragging()
 
     QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(90, 50));
 
-    moveEvent = QMouseEvent(QEvent::MouseMove, QPoint(80, 50), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
-
-    moveEvent = QMouseEvent(QEvent::MouseMove, QPoint(70, 50), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
-
-    moveEvent = QMouseEvent(QEvent::MouseMove, QPoint(60, 50), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
+    QTest::mouseMove(canvas, QPoint(80, 50));
+    QTest::mouseMove(canvas, QPoint(70, 50));
+    QTest::mouseMove(canvas, QPoint(60, 50));
 
     QVERIFY(flickable->isDraggingHorizontally());
     QVERIFY(flickable->isDragging());
@@ -501,7 +494,7 @@ void tst_qsgflickable::movingAndDragging()
 
     QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(60, 50));
 
-    QVERIFY(!flickable->isDraggingHorizontally());
+    QTRY_VERIFY(!flickable->isDraggingHorizontally());
     QVERIFY(!flickable->isDragging());
     QCOMPARE(vDragSpy.count(), 0);
     QCOMPARE(dragSpy.count(), 2);
@@ -527,14 +520,9 @@ void tst_qsgflickable::disabled()
 
     QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(50, 90));
 
-    QMouseEvent moveEvent(QEvent::MouseMove, QPoint(50, 80), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
-
-    moveEvent = QMouseEvent(QEvent::MouseMove, QPoint(50, 70), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
-
-    moveEvent = QMouseEvent(QEvent::MouseMove, QPoint(50, 60), Qt::LeftButton, Qt::LeftButton, 0);
-    QApplication::sendEvent(canvas, &moveEvent);
+    QTest::mouseMove(canvas, QPoint(50, 80));
+    QTest::mouseMove(canvas, QPoint(50, 70));
+    QTest::mouseMove(canvas, QPoint(50, 60));
 
     QVERIFY(flick->isMoving() == false);
 
@@ -544,7 +532,7 @@ void tst_qsgflickable::disabled()
     QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(50, 10));
     QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(50, 10));
 
-    QVERIFY(canvas->rootObject()->property("clicked").toBool() == true);
+    QTRY_VERIFY(canvas->rootObject()->property("clicked").toBool() == true);
 }
 
 void tst_qsgflickable::flickVelocity()
@@ -556,7 +544,7 @@ void tst_qsgflickable::flickVelocity()
     QSGView *canvas = new QSGView;
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
     canvas->show();
-    canvas->setFocus();
+    canvas->requestActivateWindow();
     QVERIFY(canvas->rootObject() != 0);
 
     QSGFlickable *flickable = qobject_cast<QSGFlickable*>(canvas->rootObject());