diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2011-07-06 14:32:37 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-07 00:31:11 +0200 |
commit | 63f23475f06e213ccefc2e7fba63ea896e7fd73d (patch) | |
tree | 198f0c4236f89ac0f83078241b29204fd5ba0bbc | |
parent | 6b3f959cb3170561276e86b3abbf8ed69ec38c71 (diff) |
Fix QSGBorderImage autotests
Change-Id: I6dd87232fc3d12a0ea3b8c25932d2ca01879fb3b
Reviewed-on: http://codereview.qt.nokia.com/1196
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
-rw-r--r-- | tests/auto/declarative/qsgborderimage/data/colors-mirror.png | bin | 0 -> 5554 bytes | |||
-rw-r--r-- | tests/auto/declarative/qsgborderimage/data/mirror.qml | 5 | ||||
-rw-r--r-- | tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp | 14 |
3 files changed, 10 insertions, 9 deletions
diff --git a/tests/auto/declarative/qsgborderimage/data/colors-mirror.png b/tests/auto/declarative/qsgborderimage/data/colors-mirror.png Binary files differnew file mode 100644 index 0000000000..e30870dd1e --- /dev/null +++ b/tests/auto/declarative/qsgborderimage/data/colors-mirror.png diff --git a/tests/auto/declarative/qsgborderimage/data/mirror.qml b/tests/auto/declarative/qsgborderimage/data/mirror.qml index 8d02f58e05..abab076e08 100644 --- a/tests/auto/declarative/qsgborderimage/data/mirror.qml +++ b/tests/auto/declarative/qsgborderimage/data/mirror.qml @@ -1,8 +1,7 @@ import QtQuick 2.0 BorderImage { - source: "heart200.png" - smooth: true + source: "colors-mirror.png" width: 300; height: 300 - border { top: 50; right: 50; bottom: 50; left: 50 } + border { top: 30; right: 30; bottom: 30; left: 30 } } diff --git a/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp b/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp index 2bd15c1094..b5836cfb83 100644 --- a/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp +++ b/tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp @@ -230,16 +230,18 @@ void tst_qsgborderimage::mirror() canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/mirror.qml")); QSGBorderImage *image = qobject_cast<QSGBorderImage*>(canvas->rootObject()); QVERIFY(image != 0); + canvas->show(); - int width = image->property("width").toInt(); + QImage screenshot = canvas->grabFrameBuffer(); - QPixmap screenshot = canvas->renderPixmap(); + QImage srcPixmap(screenshot); + QTransform transform; + transform.translate(image->width(), 0).scale(-1, 1.0); + srcPixmap = srcPixmap.transformed(transform); image->setProperty("mirror", true); - QPixmap mirrored; - - QSKIP("Skip while QTBUG-19351 and QTBUG-19252 are not resolved", SkipSingle); - QCOMPARE(screenshot, mirrored); + screenshot = canvas->grabFrameBuffer(); + QCOMPARE(screenshot, srcPixmap); delete canvas; } |