1 files changed, 29 insertions, 13 deletions

diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 4b3e2606fd..86dd8c4daf 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -36,7 +36,6 @@
 
 #include <QBuffer>
 #include <QDebug>
-#include <QFile>
 #include <QImage>
 #include <QImageReader>
 #include <QImageWriter>
@@ -46,6 +45,7 @@
 #include <QTcpServer>
 #include <QTimer>
 #include <QTemporaryDir>
+#include <QTemporaryFile>
 
 #include <algorithm>
 
@@ -53,6 +53,22 @@ typedef QMap<QString, QString> QStringMap;
 typedef QList<int> QIntList;
 Q_DECLARE_METATYPE(QImage::Format)
 
+static QByteArray msgFileOpenWriteFailed(const QFile &file)
+{
+    const QString result = QLatin1String("Cannot open \"")
+        + QDir::toNativeSeparators(file.fileName())
+        + QLatin1String("\" for writing: ") + file.errorString();
+    return result.toLocal8Bit();
+}
+
+static QByteArray msgFileOpenReadFailed(const QFile &file)
+{
+    const QString result = QLatin1String("Cannot open \"")
+        + QDir::toNativeSeparators(file.fileName())
+        + QLatin1String("\" for reading: ") + file.errorString();
+    return result.toLocal8Bit();
+}
+
 class tst_QImageReader : public QObject
 {
     Q_OBJECT
@@ -194,7 +210,7 @@ void tst_QImageReader::initTestCase()
     prefix = QFINDTESTDATA("images/");
     if (prefix.isEmpty())
         QFAIL("Can't find images directory!");
-   QVERIFY(m_temporaryDir.isValid());
+   QVERIFY2(m_temporaryDir.isValid(), qPrintable(m_temporaryDir.errorString()));
 }
 
 void tst_QImageReader::cleanupTestCase()
@@ -224,6 +240,7 @@ void tst_QImageReader::readImage_data()
     QTest::newRow("PPM: runners") << QString("runners.ppm") << true << QByteArray("ppm");
     QTest::newRow("PPM: test") << QString("test.ppm") << true << QByteArray("ppm");
     QTest::newRow("XBM: gnus") << QString("gnus.xbm") << true << QByteArray("xbm");
+    QTest::newRow("PGM: longcomment") << QString("longcomment.pgm") << true << QByteArray("pgm");
 
     QTest::newRow("JPEG: beavis") << QString("beavis.jpg") << true << QByteArray("jpeg");
     QTest::newRow("JPEG: qtbug13653") << QString("qtbug13653-no_eoi.jpg") << true << QByteArray("jpeg");
@@ -733,7 +750,7 @@ void tst_QImageReader::gifHandlerBugs()
         QVERIFY(io.loopCount() != 1);
         int count=0;
         for (; io.canRead(); io.read(), ++count) ;
-        QVERIFY(count == 34);
+        QCOMPARE(count, 34);
     }
 
     // Task 95166
@@ -810,7 +827,7 @@ void tst_QImageReader::gifImageCount()
         QVERIFY(io.canRead());
         QImage greenFrame = io.read();
 
-        QVERIFY(io.imageCount() == 4);
+        QCOMPARE(io.imageCount(), 4);
 
         QVERIFY(io.canRead());
         QImage blueFrame = io.read();
@@ -925,8 +942,8 @@ void tst_QImageReader::gifImageCount()
     }
     {
         QImageReader io(":images/trolltech.gif");
-        QVERIFY(io.imageCount() == 34);
-        QVERIFY(io.size() == QSize(128,64));
+        QCOMPARE(io.imageCount(), 34);
+        QCOMPARE(io.size(), QSize(128,64));
     }
 }
 
@@ -1050,7 +1067,7 @@ void tst_QImageReader::readFromDevice()
     const QString imageFileName = prefix + fileName;
     QImage expectedImage(imageFileName, format);
     QFile file(imageFileName);
-    QVERIFY(file.open(QFile::ReadOnly));
+    QVERIFY2(file.open(QFile::ReadOnly), msgFileOpenReadFailed(file).constData());
     QByteArray imageData = file.readAll();
     QVERIFY(!imageData.isEmpty());
     {
@@ -1128,12 +1145,11 @@ void tst_QImageReader::readFromFileAfterJunk()
 
     SKIP_IF_UNSUPPORTED(format);
 
-    QFile::remove("junk");
-    QFile junkFile("junk");
-    QVERIFY(junkFile.open(QFile::WriteOnly));
+    QTemporaryFile junkFile(m_temporaryDir.path() + QLatin1String("/junkXXXXXX"));
+    QVERIFY2(junkFile.open(), msgFileOpenWriteFailed(junkFile).constData());
 
     QFile imageFile(prefix + fileName);
-    QVERIFY(imageFile.open(QFile::ReadOnly));
+    QVERIFY2(imageFile.open(QFile::ReadOnly), msgFileOpenReadFailed(imageFile).constData());
     QByteArray imageData = imageFile.readAll();
     QVERIFY(!imageData.isNull());
 
@@ -1154,7 +1170,7 @@ void tst_QImageReader::readFromFileAfterJunk()
         }
     }
     junkFile.close();
-    junkFile.open(QFile::ReadOnly);
+    QVERIFY2(junkFile.open(), msgFileOpenReadFailed(junkFile).constData());
 
     for (int i = 0; i < iterations; ++i) {
         QByteArray ole = junkFile.read(9);
@@ -1204,7 +1220,7 @@ void tst_QImageReader::devicePosition()
     QVERIFY(!expected.isNull());
 
     QFile imageFile(prefix + fileName);
-    QVERIFY(imageFile.open(QFile::ReadOnly));
+    QVERIFY2(imageFile.open(QFile::ReadOnly), msgFileOpenReadFailed(imageFile).constData());
     QByteArray imageData = imageFile.readAll();
     QVERIFY(!imageData.isNull());
     int imageDataSize = imageData.size();