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

Fix tst_bench_qimagereader

Browse Source 
It couldn't find the test images if not build in sources.

Change-Id: Ieeb5a76694a37d05b3e9a4ed0154885040b0812f
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2019-08-19 14:46:28 +02:00
parent 1d89748772
commit 2cddaf0071
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/benchmarks/gui/image/qimagereader/qimagereader.pro
View File

@ -8,3 +8,5 @@ SOURCES += tst_qimagereader.cpp
qtConfig(gif): DEFINES += QTEST_HAVE_GIF qtConfig(gif): DEFINES += QTEST_HAVE_GIF
qtConfig(jpeg): DEFINES += QTEST_HAVE_JPEG qtConfig(jpeg): DEFINES += QTEST_HAVE_JPEG
TESTDATA += images/*

17
tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
View File

@ -51,6 +51,7 @@ public:
virtual ~tst_QImageReader(); virtual ~tst_QImageReader();
public slots: public slots:
void initTestCase();
void init(); void init();
void cleanup(); void cleanup();
@ -69,6 +70,7 @@ private slots:
private: private:
QList< QPair<QString, QByteArray> > images; // filename, format QList< QPair<QString, QByteArray> > images; // filename, format
QString prefix;
}; };
tst_QImageReader::tst_QImageReader() tst_QImageReader::tst_QImageReader()
@ -102,6 +104,13 @@ tst_QImageReader::~tst_QImageReader()
{ {
} }
void tst_QImageReader::initTestCase()
{
prefix = QFINDTESTDATA("images/");
if (prefix.isEmpty())
QFAIL("Can't find images directory!");
}
void tst_QImageReader::init() void tst_QImageReader::init()
{ {
} }
@ -128,7 +137,7 @@ void tst_QImageReader::readImage()
QFETCH(QByteArray, format); QFETCH(QByteArray, format);
QBENCHMARK { QBENCHMARK {
QImageReader io("images/" + fileName, format); QImageReader io(prefix + fileName, format);
QImage image = io.read(); QImage image = io.read();
QVERIFY(!image.isNull()); QVERIFY(!image.isNull());
} }
@ -159,7 +168,7 @@ void tst_QImageReader::setScaledSize()
QFETCH(QByteArray, format); QFETCH(QByteArray, format);
QBENCHMARK { QBENCHMARK {
QImageReader reader("images/" + fileName, format); QImageReader reader(prefix + fileName, format);
reader.setScaledSize(newSize); reader.setScaledSize(newSize);
QImage image = reader.read(); QImage image = reader.read();
QCOMPARE(image.size(), newSize); QCOMPARE(image.size(), newSize);
@ -186,7 +195,7 @@ void tst_QImageReader::setClipRect()
QFETCH(QByteArray, format); QFETCH(QByteArray, format);
QBENCHMARK { QBENCHMARK {
QImageReader reader("images/" + fileName, format); QImageReader reader(prefix + fileName, format);
reader.setClipRect(newRect); reader.setClipRect(newRect);
QImage image = reader.read(); QImage image = reader.read();
QCOMPARE(image.rect(), newRect); QCOMPARE(image.rect(), newRect);
@ -205,7 +214,7 @@ void tst_QImageReader::setScaledClipRect()
QFETCH(QByteArray, format); QFETCH(QByteArray, format);
QBENCHMARK { QBENCHMARK {
QImageReader reader("images/" + fileName, format); QImageReader reader(prefix + fileName, format);
reader.setScaledSize(QSize(300, 300)); reader.setScaledSize(QSize(300, 300));
reader.setScaledClipRect(newRect); reader.setScaledClipRect(newRect);
QImage image = reader.read(); QImage image = reader.read();