diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2015-01-13 13:33:10 +0100 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@theqtcompany.com> | 2016-01-20 07:48:34 +0000 |
commit | 4de1d0cb2890b509e8b11a00d251bf3a5d337cba (patch) | |
tree | 35cbfca1ae618843fb645e7617fdcb32c7e47fac | |
parent | a63a506d543430c22ce23107e1bdedeb489161b2 (diff) | |
download | qtbase-4de1d0cb2890b509e8b11a00d251bf3a5d337cba.tar.gz |
Android: Fix some QGraphicsScene tests
1. Use qrc for test data so that it can be found on all platforms.
2. Skip a test which does not work on platforms where show() implies
showMaximized(), as it depends on the window size being 150x150.
3. Skip test for hover event which depends on having a valid
mouse cursor position.
4. Skip a couple of tests that fail on some Android devices.
It's not worth spending a lot of time investigating this at the
moment.
Change-Id: Icb2b7f1d82981546a2154a76535b95606d7f40da
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
3 files changed, 48 insertions, 4 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro index 1a775d8b16..986ba019b4 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -17,3 +17,5 @@ wince* { DEPLOYMENT += rootFiles renderFiles DEFINES += SRCDIR=\\\".\\\" } + +RESOURCES += testdata.qrc diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/testdata.qrc b/tests/auto/widgets/graphicsview/qgraphicsscene/testdata.qrc new file mode 100644 index 0000000000..07a0579cdc --- /dev/null +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testdata.qrc @@ -0,0 +1,32 @@ +<RCC> + <qresource prefix="/"> + <file>testData/render/all-all-45-deg-left.png</file> + <file>testData/render/all-all-45-deg-right.png</file> + <file>testData/render/all-all-scale-2x.png</file> + <file>testData/render/all-all-translate-0-50.png</file> + <file>testData/render/all-all-translate-50-0.png</file> + <file>testData/render/all-all-untransformed-clip-ellipse.png</file> + <file>testData/render/all-all-untransformed-clip-rect.png</file> + <file>testData/render/all-all-untransformed.png</file> + <file>testData/render/all-bottomleft-untransformed.png</file> + <file>testData/render/all-bottomright-untransformed.png</file> + <file>testData/render/all-topleft-untransformed.png</file> + <file>testData/render/all-topright-untransformed.png</file> + <file>testData/render/bottom-bottomright-untransformed.png</file> + <file>testData/render/bottom-topleft-untransformed.png</file> + <file>testData/render/bottomleft-all-untransformed.png</file> + <file>testData/render/bottomleft-topleft-untransformed.png</file> + <file>testData/render/bottomright-all-untransformed.png</file> + <file>testData/render/bottomright-topleft-untransformed.png</file> + <file>testData/render/left-bottomright-untransformed.png</file> + <file>testData/render/left-topleft-untransformed.png</file> + <file>testData/render/right-bottomright-untransformed.png</file> + <file>testData/render/right-topleft-untransformed.png</file> + <file>testData/render/top-bottomright-untransformed.png</file> + <file>testData/render/top-topleft-untransformed.png</file> + <file>testData/render/topleft-all-untransformed.png</file> + <file>testData/render/topleft-topleft-untransformed.png</file> + <file>testData/render/topright-all-untransformed.png</file> + <file>testData/render/topright-topleft-untransformed.png</file> + </qresource> +</RCC> diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index f494e4474c..69ea64e505 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -1255,7 +1255,7 @@ void tst_QGraphicsScene::addText() void tst_QGraphicsScene::removeItem() { -#if defined(Q_OS_WINCE) && !defined(GWES_ICONCURS) +#if (defined(Q_OS_WINCE) && !defined(GWES_ICONCURS)) || defined(Q_OS_ANDROID) QSKIP("No mouse cursor support"); #endif QGraphicsScene scene; @@ -2629,9 +2629,7 @@ void tst_QGraphicsScene::render() scene.render(&painter, targetRect, sourceRect, aspectRatioMode); painter.end(); - const QString renderPath = QLatin1String(SRCDIR) + "/testData/render"; - QString fileName = renderPath + QLatin1Char('/') + QLatin1String(QTest::currentDataTag()) - + QLatin1String(".png"); + QString fileName = QFINDTESTDATA(QString("/testData/render/%1.png").arg(QTest::currentDataTag())); QImage original(fileName); QVERIFY(!original.isNull()); @@ -2682,6 +2680,10 @@ void tst_QGraphicsScene::render() void tst_QGraphicsScene::renderItemsWithNegativeWidthOrHeight() { +#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) + QSKIP("Test only works on platforms with resizable windows"); +#endif + QGraphicsScene scene(0, 0, 150, 150); // Add item with negative width. @@ -2757,6 +2759,10 @@ protected: void tst_QGraphicsScene::contextMenuEvent_ItemIgnoresTransformations() { +#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) + QSKIP("Test fails on some Android devices (QTBUG-44430)"); +#endif + QGraphicsScene scene(0, 0, 200, 200); ContextMenuItem *item = new ContextMenuItem; item->setFlag(QGraphicsItem::ItemIgnoresTransformations); @@ -4026,6 +4032,10 @@ void tst_QGraphicsScene::polishItems2() void tst_QGraphicsScene::isActive() { +#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) + QSKIP("Fails on Android (QTBUG-44430)"); +#endif + QGraphicsScene scene1; QVERIFY(!scene1.isActive()); QGraphicsScene scene2; |