diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-02 10:33:46 +0000 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-11-02 18:50:02 +0000 |
commit | fdff8cb9c8a1551d23dc282063b66ba80125ef52 (patch) | |
tree | c9d3fd2f01ff9e40fd13d0410757a7518eb71c9c /tests/auto/corelib | |
parent | 95dae4b932814dc8a798bb07757ef11d804f50c3 (diff) |
Revert "Android: fix Android assets handler not listing dirs with only sub dirs"
This reverts commit a9b036eb84ec2cd4aa22fe93bf1ad7ddcf23c9d7.
Reason for revert: QTBUG-107879
Task-number: QTBUG-107627
Fixes: QTBUG-107879
Change-Id: I24f61cb7abc2c4966c772da5b4eca6eb8df454f6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/corelib')
4 files changed, 0 insertions, 26 deletions
diff --git a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/file_in_top_dir.txt b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/file_in_top_dir.txt deleted file mode 100644 index 61e2c47c25..0000000000 --- a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/file_in_top_dir.txt +++ /dev/null @@ -1 +0,0 @@ -FooBar
\ No newline at end of file diff --git a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/file_in_sub_dir.txt b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/file_in_sub_dir.txt deleted file mode 100644 index 61e2c47c25..0000000000 --- a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/file_in_sub_dir.txt +++ /dev/null @@ -1 +0,0 @@ -FooBar
\ No newline at end of file diff --git a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt deleted file mode 100644 index 61e2c47c25..0000000000 --- a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt +++ /dev/null @@ -1 +0,0 @@ -FooBar
\ No newline at end of file diff --git a/tests/auto/corelib/platform/android/tst_android.cpp b/tests/auto/corelib/platform/android/tst_android.cpp index 6f5484f2b1..710e5b2ecf 100644 --- a/tests/auto/corelib/platform/android/tst_android.cpp +++ b/tests/auto/corelib/platform/android/tst_android.cpp @@ -31,7 +31,6 @@ #include <QTest> #include <QtCore/qnativeinterface.h> #include <QtCore/qjniobject.h> -#include <QtCore/qdiriterator.h> class tst_Android : public QObject { @@ -39,7 +38,6 @@ Q_OBJECT private slots: void assetsRead(); void assetsNotWritable(); - void assetsIterating(); void testAndroidSdkVersion(); void testAndroidActivity(); void testRunOnAndroidMainThread(); @@ -68,27 +66,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); |