From 34280c409d16b2e252bc90e89fc6937a81d0a6d2 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 14 Mar 2012 12:41:37 +1000
Subject: Reuse a QQuickCanvas in examples auto test.

Much faster than creating a new one for each example.

Change-Id: Ic32f244047e0dba78134ba0e3d368260be838f1e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---
 tests/auto/quick/examples/tst_examples.cpp | 36 +++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 11 deletions(-)

(limited to 'tests/auto/quick/examples/tst_examples.cpp')

diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index c29da570c3..3c109471c5 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -62,6 +62,7 @@ class tst_examples : public QObject
     Q_OBJECT
 public:
     tst_examples();
+    ~tst_examples();
 
 private slots:
     void init();
@@ -81,9 +82,11 @@ private:
     QStringList findQmlFiles(const QDir &);
 
     QQmlEngine engine;
+
+    QQuickCanvas *canvas;
 };
 
-tst_examples::tst_examples()
+tst_examples::tst_examples() : canvas(0)
 {
     // Add files to exclude here
     excludedFiles << "doc/src/snippets/qml/listmodel.qml"; //Just a ListModel, no root QQuickItem
@@ -112,6 +115,11 @@ tst_examples::tst_examples()
 #endif
 }
 
+tst_examples::~tst_examples()
+{
+    delete canvas;
+}
+
 void tst_examples::init()
 {
     if (!qstrcmp(QTest::currentTestFunction(), "sgsnippets"))
@@ -252,13 +260,16 @@ void tst_examples::sgexamples()
         component.completeCreate();
     QVERIFY(root);
 
-    QQuickCanvas canvas;
-    root->setParentItem(canvas.rootItem());
+    if (!canvas) {
+        canvas = new QQuickCanvas();
+        canvas->resize(240, 320);
+        canvas->show();
+        QTest::qWaitForWindowShown(canvas);
+    }
+    root->setParentItem(canvas->rootItem());
     component.completeCreate();
-    canvas.show();
-
-    QTest::qWaitForWindowShown(&canvas);
 
+    qApp->processEvents();
 }
 
 void tst_examples::sgsnippets_data()
@@ -293,13 +304,16 @@ void tst_examples::sgsnippets()
         component.completeCreate();
     QVERIFY(root);
 
-    QQuickCanvas canvas;
-    root->setParentItem(canvas.rootItem());
+    if (!canvas) {
+        canvas = new QQuickCanvas();
+        canvas->resize(240, 320);
+        canvas->show();
+        QTest::qWaitForWindowShown(canvas);
+    }
+    root->setParentItem(canvas->rootItem());
     component.completeCreate();
-    canvas.show();
-
-    QTest::qWaitForWindowShown(&canvas);
 
+    qApp->processEvents();
 }
 
 QTEST_MAIN(tst_examples)
-- 
cgit v1.2.3