AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QImageReader::preserveTexts(): deduplicate data tags

Browse Source 
The same data tags were used with two distinct filenames in their
data. Include the basename of each filename in the data tag, to avoid
duplication.

Change-Id: I216fecbd413fab409227ad6f93f8ac3fcc74b059
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Edward Welbourne 2022-10-07 18:23:58 +02:00
parent af0c910912
commit c13df5b6ea
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
View File

@ -1984,19 +1984,31 @@ void tst_QImageReader::preserveTexts_data()
for (int c = 0xa0; c <= 0xff; c++)
latin1set.append(QLatin1Char(c));
QStringList fileNames;
fileNames << QLatin1String(":/images/kollada.png")
<< QLatin1String(":/images/txts.jpg");
foreach (const QString &fileName, fileNames) {
QTest::newRow("Simple") << fileName << "simpletext";
QTest::newRow("Whitespace") << fileName << " A text with whitespace ";
QTest::newRow("Newline") << fileName << "A text\nwith newlines\n";
QTest::newRow("Double newlines") << fileName << "A text\n\nwith double newlines\n\n";
QTest::newRow("Long") << fileName << QString("A rather long text, at least after many repetitions. ").repeated(100);
QTest::newRow("All Latin1 chars") << fileName << latin1set;
const QList<QLatin1StringView> fileNames{
QLatin1StringView(":/images/kollada.png"),
QLatin1StringView(":/images/txts.jpg")
// Common prefix of length 9 before file names: ":/images/", skipped below by + 9.
};
for (const auto &fileName : fileNames) {
QTest::addRow("Simple %s", fileName.data() + 9)
<< QString(fileName) << "simpletext";
QTest::addRow("Whitespace %s", fileName.data() + 9)
<< QString(fileName) << " A text with whitespace ";
QTest::addRow("Newline %s", fileName.data() + 9)
<< QString(fileName) << "A text\nwith newlines\n";
QTest::addRow("Double newlines %s", fileName.data() + 9)
<< QString(fileName) << "A text\n\nwith double newlines\n\n";
QTest::addRow("Long %s", fileName.data() + 9)
<< QString(fileName)
<< QString("A rather long text, at least after many repetitions. ").repeated(100);
QTest::addRow("All Latin1 chars %s", fileName.data() + 9)
<< QString(fileName) << latin1set;
#if 0
// Depends on iTXt support in libpng
QTest::newRow("Multibyte string") << fileName << QString::fromUtf8("\341\233\222\341\233\226\341\232\251\341\232\271\341\232\242\341\233\232\341\232\240");
QTest::addRow("Multibyte string %s", fileName.data() + 9)
<< QString(fileName)
<< QString::fromUtf8("\341\233\222\341\233\226\341\232\251\341\232"
"\271\341\232\242\341\233\232\341\232\240");
#endif
}
}