1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix writing into application directory

Browse Source 
Tests are not supposed to write into the build/application directory,
but rather should output to the temp directory.

Change-Id: Idcdf51226a2d547514aea2fbb2054998d8a3437e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Maurice Kalinowski 2016-11-09 10:32:54 +01:00
parent bfaa8925d5
commit dffde23a0a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -171,6 +171,7 @@ private:
const QString m_prefix; const QString m_prefix;
const QString m_convertFromImage; const QString m_convertFromImage;
const QString m_loadFromData; const QString m_loadFromData;
const QTemporaryDir m_tempDir;
}; };
static bool lenientCompare(const QPixmap &actual, const QPixmap &expected) static bool lenientCompare(const QPixmap &actual, const QPixmap &expected)
@ -230,11 +231,11 @@ void tst_QPixmap::initTestCase()
QVERIFY(!m_prefix.isEmpty()); QVERIFY(!m_prefix.isEmpty());
QVERIFY(!m_convertFromImage.isEmpty()); QVERIFY(!m_convertFromImage.isEmpty());
QVERIFY(!m_loadFromData.isEmpty()); QVERIFY(!m_loadFromData.isEmpty());
QVERIFY2(m_tempDir.isValid(), qPrintable(m_tempDir.errorString()));
} }
void tst_QPixmap::cleanupTestCase() void tst_QPixmap::cleanupTestCase()
{ {
QFile::remove(QLatin1String("temp_image.png"));
} }
void tst_QPixmap::swap() void tst_QPixmap::swap()
@ -1471,18 +1472,18 @@ void tst_QPixmap::preserveDepth()
void tst_QPixmap::loadAsBitmapOrPixmap() void tst_QPixmap::loadAsBitmapOrPixmap()
{ {
QImage tmp(10, 10, QImage::Format_RGB32); QImage tmp(10, 10, QImage::Format_RGB32);
tmp.save("temp_image.png"); tmp.save(m_tempDir.path() + "/temp_image.png");
bool ok; bool ok;
// Check that we can load the pixmap as a pixmap and that it then turns into a pixmap // Check that we can load the pixmap as a pixmap and that it then turns into a pixmap
QPixmap pixmap("temp_image.png"); QPixmap pixmap(m_tempDir.path() + "/temp_image.png");
QVERIFY(!pixmap.isNull()); QVERIFY(!pixmap.isNull());
QVERIFY(pixmap.depth() > 1); QVERIFY(pixmap.depth() > 1);
QVERIFY(!pixmap.isQBitmap()); QVERIFY(!pixmap.isQBitmap());
pixmap = QPixmap(); pixmap = QPixmap();
ok = pixmap.load("temp_image.png"); ok = pixmap.load(m_tempDir.path() + "/temp_image.png");
QVERIFY(ok); QVERIFY(ok);
QVERIFY(!pixmap.isNull()); QVERIFY(!pixmap.isNull());
QVERIFY(pixmap.depth() > 1); QVERIFY(pixmap.depth() > 1);
@ -1490,20 +1491,20 @@ void tst_QPixmap::loadAsBitmapOrPixmap()
//now we can try to load it without an extension //now we can try to load it without an extension
pixmap = QPixmap(); pixmap = QPixmap();
ok = pixmap.load("temp_image"); ok = pixmap.load(m_tempDir.path() + "/temp_image");
QVERIFY(ok); QVERIFY(ok);
QVERIFY(!pixmap.isNull()); QVERIFY(!pixmap.isNull());
QVERIFY(pixmap.depth() > 1); QVERIFY(pixmap.depth() > 1);
QVERIFY(!pixmap.isQBitmap()); QVERIFY(!pixmap.isQBitmap());
// The do the same check for bitmaps.. // The do the same check for bitmaps..
QBitmap bitmap("temp_image.png"); QBitmap bitmap(m_tempDir.path() + "/temp_image.png");
QVERIFY(!bitmap.isNull()); QVERIFY(!bitmap.isNull());
QCOMPARE(bitmap.depth(), 1); QCOMPARE(bitmap.depth(), 1);
QVERIFY(bitmap.isQBitmap()); QVERIFY(bitmap.isQBitmap());
bitmap = QBitmap(); bitmap = QBitmap();
ok = bitmap.load("temp_image.png"); ok = bitmap.load(m_tempDir.path() + "/temp_image.png");
QVERIFY(ok); QVERIFY(ok);
QVERIFY(!bitmap.isNull()); QVERIFY(!bitmap.isNull());
QCOMPARE(bitmap.depth(), 1); QCOMPARE(bitmap.depth(), 1);