summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/image/qimagereader
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-06-07 16:20:10 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-06-18 12:59:10 +0000
commit68bcbe2470f1dec54b7803d847f7aa755b07c058 (patch)
treeb04ea2d5de1c9c74961e340905a8002d1630aa0b /tests/auto/gui/image/qimagereader
parentf5f98da54e1140cfc340e5077735c63d209edd7d (diff)
Fix tst_QImageReader::imageFormatBeforeRead
The test was never loading images from a valid path, and thus never had any fullfill the base option which meant nothing was tested. Making it work revealed that the Format option on BMP formats doesn't predict semi-transparent files. Change-Id: I7035a0f63ebfbce940ce7a17a6142cf177480798 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests/auto/gui/image/qimagereader')
-rw-r--r--tests/auto/gui/image/qimagereader/tst_qimagereader.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 19948edcdf..574ad805ca 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -728,13 +728,15 @@ void tst_QImageReader::imageFormatBeforeRead()
SKIP_IF_UNSUPPORTED(format);
- QImageReader reader(fileName);
+ QImageReader reader(prefix + fileName);
+ QVERIFY(reader.canRead());
if (reader.supportsOption(QImageIOHandler::ImageFormat)) {
QImage::Format fileFormat = reader.imageFormat();
QCOMPARE(fileFormat, imageFormat);
QSize size = reader.size();
QImage image(size, fileFormat);
QVERIFY(reader.read(&image));
+ QEXPECT_FAIL("bmp-3", "Semi-transparent BMPs not predicted", Continue);
QCOMPARE(image.format(), fileFormat);
}
}