qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Jones 2012-03-14 12:41:37 +10:00 committed by Qt by Nokia
parent 6b8c356401
commit 34280c409d
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/auto/quick/examples/tst_examples.cpp
View File

@ -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)