Commit d9df24ef authored by Gunnar Sletta's avatar Gunnar Sletta Committed by The Qt Project
Browse files

Stabilize tst_qquickanimatedimage::mirror_notRunning()


Task-number: QTBUG-31370
Change-Id: I200d94dccd1314c891df92576b0d2b704e530e16
Reviewed-by: default avatarSergio Ahumada <sergio.ahumada@digia.com>
parent cf737d26
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 old/5.1 old/5.2 wip/cmake wip/dbus wip/gc wip/itemviews wip/nacl wip/new-backend wip/pointerhandler wip/propertycache-refactor wip/qquickdeliveryagent wip/scenegraphng wip/tizen wip/webassembly v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1
No related merge requests found
Showing with 6 additions and 10 deletions
...@@ -190,9 +190,6 @@ void tst_qquickanimatedimage::mirror_running() ...@@ -190,9 +190,6 @@ void tst_qquickanimatedimage::mirror_running()
QImage frame0_expected = frame0.transformed(transform); QImage frame0_expected = frame0.transformed(transform);
QImage frame1_expected = frame1.transformed(transform); QImage frame1_expected = frame1.transformed(transform);
#ifdef Q_OS_MAC
QSKIP("QTBUG-31370 - sometimes fails on Mac");
#endif
QCOMPARE(frame0_flipped, frame0_expected); QCOMPARE(frame0_flipped, frame0_expected);
QCOMPARE(frame1_flipped, frame1_expected); QCOMPARE(frame1_flipped, frame1_expected);
...@@ -204,29 +201,28 @@ void tst_qquickanimatedimage::mirror_notRunning() ...@@ -204,29 +201,28 @@ void tst_qquickanimatedimage::mirror_notRunning()
QFETCH(QUrl, fileUrl); QFETCH(QUrl, fileUrl);
QQuickView window; QQuickView window;
window.setSource(fileUrl);
window.show(); window.show();
QTRY_VERIFY(window.isExposed());
window.setSource(fileUrl);
QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(window.rootObject()); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(window.rootObject());
QVERIFY(anim); QVERIFY(anim);
int width = anim->property("width").toInt(); int width = anim->property("width").toInt();
QPixmap screenshot = QPixmap::fromImage(window.grabWindow()); QImage screenshot = window.grabWindow();
QTransform transform; QTransform transform;
transform.translate(width, 0).scale(-1, 1.0); transform.translate(width, 0).scale(-1, 1.0);
QPixmap expected = screenshot.transformed(transform); QImage expected = screenshot.transformed(transform);
int frame = anim->currentFrame(); int frame = anim->currentFrame();
bool playing = anim->isPlaying(); bool playing = anim->isPlaying();
bool paused = anim->isPlaying(); bool paused = anim->isPlaying();
anim->setProperty("mirror", true); anim->setProperty("mirror", true);
screenshot = QPixmap::fromImage(window.grabWindow()); screenshot = window.grabWindow();
#ifdef Q_OS_MAC screenshot.save("screen.png");
QSKIP("QTBUG-31370 - sometimes fails on Mac");
#endif
QCOMPARE(screenshot, expected); QCOMPARE(screenshot, expected);
// mirroring should not change the current frame or playing status // mirroring should not change the current frame or playing status
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment