tst_QResourceEngine: move the resource path to the end in the row label
Otherwise, it's impossible to select those rows in the command-line, because they start with a colon. Change-Id: I6979d02a7395405cbf23fffd17c98f455a4cbdaa Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>bb10
Thiago Macieira
parent
08bb11d101
commit
0cd5eb895c
|
|
@ -213,56 +213,56 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
for(int i = 0; i < roots.size(); ++i) {
|
||||
const QString root = roots.at(i);
|
||||
|
||||
QTest::addRow("%s prefix dir", qPrintable(root)) << QString(root + "test/abc/123/+++")
|
||||
QTest::addRow("prefix dir on %s", qPrintable(root)) << QString(root + "test/abc/123/+++")
|
||||
<< QByteArray()
|
||||
<< (QStringList() << QLatin1String("currentdir.txt") << QLatin1String("currentdir2.txt") << QLatin1String("parentdir.txt"))
|
||||
<< (QStringList() << QLatin1String("subdir"))
|
||||
<< QLocale::c()
|
||||
<< qlonglong(0);
|
||||
|
||||
QTest::addRow("%s parent to prefix", qPrintable(root)) << QString(root + "test/abc/123")
|
||||
QTest::addRow("parent to prefix on %s", qPrintable(root)) << QString(root + "test/abc/123")
|
||||
<< QByteArray()
|
||||
<< QStringList()
|
||||
<< (QStringList() << QLatin1String("+++"))
|
||||
<< QLocale::c()
|
||||
<< qlonglong(0);
|
||||
|
||||
QTest::addRow("%s two parents prefix", qPrintable(root)) << QString(root + "test/abc")
|
||||
QTest::addRow("two parents prefix on %s", qPrintable(root)) << QString(root + "test/abc")
|
||||
<< QByteArray()
|
||||
<< QStringList()
|
||||
<< QStringList(QLatin1String("123"))
|
||||
<< QLocale::c()
|
||||
<< qlonglong(0);
|
||||
|
||||
QTest::addRow("%s test dir ", qPrintable(root)) << QString(root + "test")
|
||||
QTest::addRow("test dir on %s", qPrintable(root)) << QString(root + "test")
|
||||
<< QByteArray()
|
||||
<< (QStringList() << QLatin1String("testdir.txt"))
|
||||
<< (QStringList() << QLatin1String("abc") << QLatin1String("test"))
|
||||
<< QLocale::c()
|
||||
<< qlonglong(0);
|
||||
|
||||
QTest::addRow("%s prefix no slashes", qPrintable(root)) << QString(root + "withoutslashes")
|
||||
QTest::addRow("prefix no slashes on %s", qPrintable(root)) << QString(root + "withoutslashes")
|
||||
<< QByteArray()
|
||||
<< QStringList("blahblah.txt")
|
||||
<< QStringList()
|
||||
<< QLocale::c()
|
||||
<< qlonglong(0);
|
||||
|
||||
QTest::addRow("%s other dir", qPrintable(root)) << QString(root + "otherdir")
|
||||
QTest::addRow("other dir on %s", qPrintable(root)) << QString(root + "otherdir")
|
||||
<< QByteArray()
|
||||
<< QStringList(QLatin1String("otherdir.txt"))
|
||||
<< QStringList()
|
||||
<< QLocale::c()
|
||||
<< qlonglong(0);
|
||||
|
||||
QTest::addRow("%s alias dir", qPrintable(root)) << QString(root + "aliasdir")
|
||||
QTest::addRow("alias dir on %s", qPrintable(root)) << QString(root + "aliasdir")
|
||||
<< QByteArray()
|
||||
<< QStringList(QLatin1String("aliasdir.txt"))
|
||||
<< QStringList()
|
||||
<< QLocale::c()
|
||||
<< qlonglong(0);
|
||||
|
||||
QTest::addRow("%s second test dir", qPrintable(root)) << QString(root + "test/test")
|
||||
QTest::addRow("second test dir on %s", qPrintable(root)) << QString(root + "test/test")
|
||||
<< QByteArray()
|
||||
<< (QStringList() << QLatin1String("test1.txt") << QLatin1String("test2.txt"))
|
||||
<< QStringList()
|
||||
|
|
@ -270,7 +270,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(0);
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/test/test/test1.txt"));
|
||||
QTest::addRow("%s test1 text", qPrintable(root)) << QString(root + "test/test/test1.txt")
|
||||
QTest::addRow("test1 text on %s", qPrintable(root)) << QString(root + "test/test/test1.txt")
|
||||
<< QByteArray("abc\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -278,7 +278,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/blahblah.txt"));
|
||||
QTest::addRow("%s text no slashes", qPrintable(root)) << QString(root + "withoutslashes/blahblah.txt")
|
||||
QTest::addRow("text no slashes on %s", qPrintable(root)) << QString(root + "withoutslashes/blahblah.txt")
|
||||
<< QByteArray("qwerty\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -287,7 +287,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/test/test/test2.txt"));
|
||||
QTest::addRow("%s test2 text", qPrintable(root)) << QString(root + "test/test/test2.txt")
|
||||
QTest::addRow("test2 text on %s", qPrintable(root)) << QString(root + "test/test/test2.txt")
|
||||
<< QByteArray("def\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -295,7 +295,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/currentdir.txt"));
|
||||
QTest::addRow("%s currentdir text", qPrintable(root)) << QString(root + "test/abc/123/+++/currentdir.txt")
|
||||
QTest::addRow("currentdir text on %s", qPrintable(root)) << QString(root + "test/abc/123/+++/currentdir.txt")
|
||||
<< QByteArray("\"This is the current dir\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -303,7 +303,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/currentdir2.txt"));
|
||||
QTest::addRow("%s currentdir text2", qPrintable(root)) << QString(root + "test/abc/123/+++/currentdir2.txt")
|
||||
QTest::addRow("currentdir text2 on %s", qPrintable(root)) << QString(root + "test/abc/123/+++/currentdir2.txt")
|
||||
<< QByteArray("\"This is also the current dir\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -311,7 +311,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("parentdir.txt"));
|
||||
QTest::addRow("%s parentdir text", qPrintable(root)) << QString(root + "test/abc/123/+++/parentdir.txt")
|
||||
QTest::addRow("parentdir text on %s", qPrintable(root)) << QString(root + "test/abc/123/+++/parentdir.txt")
|
||||
<< QByteArray("abcdefgihklmnopqrstuvwxyz \n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -319,7 +319,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/subdir/subdir.txt"));
|
||||
QTest::addRow("%s subdir text", qPrintable(root)) << QString(root + "test/abc/123/+++/subdir/subdir.txt")
|
||||
QTest::addRow("subdir text on %s", qPrintable(root)) << QString(root + "test/abc/123/+++/subdir/subdir.txt")
|
||||
<< QByteArray("\"This is in the sub directory\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -327,7 +327,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/test/testdir.txt"));
|
||||
QTest::addRow("%s testdir text", qPrintable(root)) << QString(root + "test/testdir.txt")
|
||||
QTest::addRow("testdir text on %s", qPrintable(root)) << QString(root + "test/testdir.txt")
|
||||
<< QByteArray("\"This is in the test directory\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -335,7 +335,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/otherdir/otherdir.txt"));
|
||||
QTest::addRow("%s otherdir text", qPrintable(root)) << QString(root + "otherdir/otherdir.txt")
|
||||
QTest::addRow("otherdir text on %s", qPrintable(root)) << QString(root + "otherdir/otherdir.txt")
|
||||
<< QByteArray("\"This is the other dir\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -343,7 +343,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/test/testdir2.txt"));
|
||||
QTest::addRow("%s alias text", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
QTest::addRow("alias text on %s", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
<< QByteArray("\"This is another file in this directory\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -351,7 +351,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/aliasdir/aliasdir.txt"));
|
||||
QTest::addRow("%s korean text", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
QTest::addRow("korean text on %s", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
<< QByteArray("\"This is a korean text file\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -359,7 +359,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/aliasdir/aliasdir.txt"));
|
||||
QTest::addRow("%s korean text 2", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
QTest::addRow("korean text 2 on %s", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
<< QByteArray("\"This is a korean text file\"\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -367,7 +367,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/test/german.txt"));
|
||||
QTest::addRow("%s german text", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
QTest::addRow("german text on %s", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
<< QByteArray("Deutsch\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -375,7 +375,7 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
<< qlonglong(info.size());
|
||||
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/test/german.txt"));
|
||||
QTest::addRow("%s german text 2", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
QTest::addRow("german text 2 on %s", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
<< QByteArray("Deutsch\n")
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
@ -386,14 +386,14 @@ void tst_QResourceEngine::checkStructure_data()
|
|||
QVERIFY(file.open(QFile::ReadOnly));
|
||||
info = QFileInfo(QFINDTESTDATA("testqrc/aliasdir/compressme.txt"));
|
||||
QByteArray compressmeContents = file.readAll();
|
||||
QTest::addRow("%s compressed text", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
QTest::addRow("compressed text on %s", qPrintable(root)) << QString(root + "aliasdir/aliasdir.txt")
|
||||
<< compressmeContents
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
<< QLocale("de_CH")
|
||||
<< qlonglong(info.size());
|
||||
|
||||
QTest::addRow("%s non-compressed text", qPrintable(root)) << QString(root + "uncompresseddir/uncompressed.txt")
|
||||
QTest::addRow("non-compressed text on %s", qPrintable(root)) << QString(root + "uncompresseddir/uncompressed.txt")
|
||||
<< compressmeContents
|
||||
<< QStringList()
|
||||
<< QStringList()
|
||||
|
|
|
|||
Loading…
Reference in New Issue