diff options
| author | BogDan Vatra <bogdan@kde.org> | 2023-06-15 08:50:40 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2023-06-16 22:54:36 +0300 |
| commit | 76619eae4c4e857721529c87eb3c9d519fa2f0b7 (patch) | |
| tree | 1c58cf010dc605912f6b22b107e9770f78e0b157 /tests/auto/corelib/platform/android/tst_android.cpp | |
| parent | 77d0f3753643fa818c4bef7542f7e5d97812252c (diff) | |
Don't add prefix for BaseName
Adding the "assets:" prefix to BaseName leads to wrong names returned by
QFileInfo{"assets:/path/to/file"}.fileName().
Instead to return "file" it returns "assets:/file" which is not the
expected result.
Fixes: QTBUG-114576
Fixes: QTBUG-114219
Fixes: QTBUG-112261
Pick-to: 6.6 6.5 6.5.2
Change-Id: I574bf325300c0aedef68b1b183fa837144ad63c6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/corelib/platform/android/tst_android.cpp')
| -rw-r--r-- | tests/auto/corelib/platform/android/tst_android.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/auto/corelib/platform/android/tst_android.cpp b/tests/auto/corelib/platform/android/tst_android.cpp index bb1fdcae1c..1be12e0c33 100644 --- a/tests/auto/corelib/platform/android/tst_android.cpp +++ b/tests/auto/corelib/platform/android/tst_android.cpp @@ -13,6 +13,8 @@ #include <qpa/qplatformnativeinterface.h> #include <QtCore/qdiriterator.h> +using namespace Qt::StringLiterals; + class tst_Android : public QObject { Q_OBJECT @@ -64,10 +66,14 @@ void tst_Android::assetsIterating() QDirIterator it("assets:/top_level_dir", QDirIterator::Subdirectories); QStringList iteratorAssets; - while (it.hasNext()) - iteratorAssets.append(it.next()); + while (it.hasNext()) + iteratorAssets.append(it.next()); + + QVERIFY(assets == iteratorAssets); - QVERIFY(assets == iteratorAssets); + auto entryList = QDir{"assets:/"_L1}.entryList(QStringList{"*.txt"_L1}); + QCOMPARE(entryList.size(), 1); + QCOMPARE(entryList[0], "test.txt"_L1); } void tst_Android::testAndroidSdkVersion() |