diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-14 10:20:06 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-20 07:15:17 +0000 |
| commit | bffc040f8014b361992cd92671e559c1c2abd633 (patch) | |
| tree | a5c75e487291bd6af0fb817c64fcef896579b391 /tests/auto/quick/qquickborderimage | |
| parent | 3124b03276398f68dd8f3afe18866cfb6ec8a035 (diff) | |
Tests: Un-crash image comparison tests
When (naively) running the tests with High-DPI scaling active, the
test would assert on mismatching image sizes caused by the scaling.
Add an error message parameter to
QQuickVisualTestUtil::compareImages() for use with QVERIFY2, return
false instead of asserting on format/size mismatches and adapt the
usages. Remove duplicate code in tst_qquickwindow.
Change-Id: I76564f4125798fa1e065a0202b686bc7f5ec5680
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickborderimage')
| -rw-r--r-- | tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp index 02e89ba0a7..9292e1886a 100644 --- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp @@ -596,7 +596,9 @@ void tst_qquickborderimage::borderImageMesh() window->setSource(testFileUrl("mesh.qml")); QImage mesh = window->grabWindow(); - QVERIFY(QQuickVisualTestUtil::compareImages(mesh, nonmesh)); + QString errorMessage; + QVERIFY2(QQuickVisualTestUtil::compareImages(mesh, nonmesh, &errorMessage), + qPrintable(errorMessage)); } #endif QTEST_MAIN(tst_qquickborderimage) |