diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2022-10-25 04:31:17 +0000 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-10-25 13:38:46 +0000 |
commit | 283e29e5394b6b13916feb96303491f8804bcc67 (patch) | |
tree | e39601a2cb70f97f5e070472635caac0b630f14e /tests/auto/corelib/platform/android/tst_android.cpp | |
parent | 2c639aea76226d0971f6995b2a4a5132a8a3de50 (diff) |
Revert "Android: fix Android assets handler not listing dirs with only sub dirs"
This reverts commit 89f89cedc0e62f4b66de340da57d6c56dc61baf0.
Reason for revert: QTBUG-107879
Task-number: QTBUG-107627
Fixes: QTBUG-107879
Change-Id: I31ceec5156837281b25fd17024c01e3477550ce0
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 | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/tests/auto/corelib/platform/android/tst_android.cpp b/tests/auto/corelib/platform/android/tst_android.cpp index 0906926edc..2fa6ec6415 100644 --- a/tests/auto/corelib/platform/android/tst_android.cpp +++ b/tests/auto/corelib/platform/android/tst_android.cpp @@ -6,7 +6,6 @@ #include <QTest> #include <QtCore/qnativeinterface.h> #include <QtCore/qjniobject.h> -#include <QtCore/qdiriterator.h> class tst_Android : public QObject { @@ -14,7 +13,6 @@ Q_OBJECT private slots: void assetsRead(); void assetsNotWritable(); - void assetsIterating(); void testAndroidSdkVersion(); void testAndroidActivity(); void testRunOnAndroidMainThread(); @@ -43,27 +41,6 @@ void tst_Android::assetsNotWritable() QVERIFY(!file.open(QIODevice::Append)); } -void tst_Android::assetsIterating() -{ - QStringList assets = {"assets:/top_level_dir/file_in_top_dir.txt", - "assets:/top_level_dir/sub_dir", - "assets:/top_level_dir/sub_dir/file_in_sub_dir.txt", - "assets:/top_level_dir/sub_dir/sub_dir_2", - "assets:/top_level_dir/sub_dir/sub_dir_2/sub_dir_3", - "assets:/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt"}; - - // Note that we have an "assets:/top_level_dir/sub_dir/empty_sub_dir" in the test's - // assets physical directory, but empty folders are not packaged in the built apk, - // so it's expected to not have such folder be listed in the assets on runtime - - QDirIterator it("assets:/top_level_dir", QDirIterator::Subdirectories); - QStringList iteratorAssets; - while (it.hasNext()) - iteratorAssets.append(it.next()); - - QVERIFY(assets == iteratorAssets); -} - void tst_Android::testAndroidSdkVersion() { QVERIFY(QNativeInterface::QAndroidApplication::sdkVersion() > 0); |