1 files changed, 24 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
index 42018219a9..fc9b9ee201 100644
--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // Copyright (C) 2019 Intel Corporation.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QResource>
@@ -37,9 +37,11 @@ private slots:
     void searchPath_data();
     void searchPath();
     void doubleSlashInRoot();
+    void setLocale_data();
     void setLocale();
     void lastModified();
     void resourcesInStaticPlugins();
+    void qtResourceEmpty();
 
 private:
     const QString m_runtimeResourceRcc;
@@ -167,6 +169,7 @@ void tst_QResourceEngine::checkStructure_data()
 #ifdef Q_OS_ANDROID
                  << QLatin1String("android_testdata")
 #endif
+                 << QLatin1String("empty")
                  << QLatin1String("otherdir")
                  << QLatin1String("runtime_resource")
                  << QLatin1String("searchpath1")
@@ -283,7 +286,7 @@ void tst_QResourceEngine::checkStructure_data()
 
 
         info = QFileInfo(QFINDTESTDATA("testqrc/test/test/test2.txt"));
-        QTest::addRow("%s test1 text", qPrintable(root))        << QString(root + "test/test/test2.txt")
+        QTest::addRow("%s test2 text", qPrintable(root))        << QString(root + "test/test/test2.txt")
                                                   << QByteArray("def\n")
                                                   << QStringList()
                                                   << QStringList()
@@ -379,7 +382,7 @@ void tst_QResourceEngine::checkStructure_data()
                                                 << qlonglong(info.size());
 
         QFile file(QFINDTESTDATA("testqrc/aliasdir/compressme.txt"));
-        file.open(QFile::ReadOnly);
+        QVERIFY(file.open(QFile::ReadOnly));
         info = QFileInfo(QFINDTESTDATA("testqrc/aliasdir/compressme.txt"));
         QTest::addRow("%s compressed text", qPrintable(root))   << QString(root + "aliasdir/aliasdir.txt")
                                                   << file.readAll()
@@ -565,13 +568,22 @@ void tst_QResourceEngine::doubleSlashInRoot()
     QVERIFY(QFile::exists("://secondary_root/runtime_resource/search_file.txt"));
 }
 
+void tst_QResourceEngine::setLocale_data()
+{
+    QTest::addColumn<QString>("prefix");
+    QTest::newRow("built-in") << QString();
+    QTest::newRow("runtime") << "/runtime_resource/";
+}
+
 void tst_QResourceEngine::setLocale()
 {
+    QFETCH(QString, prefix);
     QLocale::setDefault(QLocale::c());
 
     // default constructed QResource gets the default locale
     QResource resource;
-    resource.setFileName("aliasdir/aliasdir.txt");
+    resource.setFileName(prefix + "aliasdir/aliasdir.txt");
+    QVERIFY(resource.isValid());
     QCOMPARE(resource.compressionAlgorithm(), QResource::NoCompression);
 
     // change the default locale and make sure it doesn't affect the resource
@@ -610,6 +622,14 @@ void tst_QResourceEngine::resourcesInStaticPlugins()
     QVERIFY(QFile::exists(":/staticplugin/main.cpp"));
 }
 
+void tst_QResourceEngine::qtResourceEmpty()
+{
+    QFile f(":/empty/world.txt");
+    QVERIFY(f.exists());
+    QVERIFY(f.open(QIODevice::ReadOnly));
+    QVERIFY(f.readAll().isEmpty());
+}
+
 QTEST_MAIN(tst_QResourceEngine)
 
 #include "tst_qresourceengine.moc"