diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-01-16 21:03:19 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-02-15 02:11:30 +0000 |
| commit | 4699619746190adb56cfc4fa5f521ec8f084ed69 (patch) | |
| tree | 9fab26383b6f0ec852850dde9a143b870edb90e0 /tests | |
| parent | 615e5dd73d7050ed05e6c74ee8c3731b3f99cdd0 (diff) | |
Fix few QFileInfo and QDir calls
Return the file engine impl of QFileInfo::completeBaseName() and
QDir::absolutePath() and QFileInfo::fileName() (based on
QAbstractFileEngine::BaseName) if the file engine impl is valid.
Amends f77668ffec48d8aaad7c74069c6f3e770a305ae1.
Task-number: QTBUG-98974
Change-Id: I28a8c75a6f25e30012b0791c12dbde51bfe8f62c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 249d613a60aa6a1347ebc1c29902049247b93324)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/android_content_uri/tst_content_uris.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/manual/android_content_uri/tst_content_uris.cpp b/tests/manual/android_content_uri/tst_content_uris.cpp index 0ececb7ce2..20b736c3cb 100644 --- a/tests/manual/android_content_uri/tst_content_uris.cpp +++ b/tests/manual/android_content_uri/tst_content_uris.cpp @@ -51,7 +51,6 @@ void tst_ContentUris::dirFacilities() const QDir subDir = dirList.first(); QVERIFY(subDir.dirName() == QLatin1String("Sub")); - QEXPECT_FAIL("", "absolutePath() is returning wrong path, cutting from 'primary' onward", Continue); qWarning() << "subDir.absolutePath()" << subDir.absolutePath() << dirList.first(); QVERIFY(subDir.absolutePath() == dirList.first()); QVERIFY(subDir.path() == dirList.first()); @@ -65,7 +64,6 @@ void tst_ContentUris::dirFacilities() QVERIFY(listFiles(dir, QDirIterator::Subdirectories).size() == 3); QVERIFY(dir.mkpath(QLatin1String("Sub/Sub2/Sub3"))); // Create an existing dir hierarchy QVERIFY(dir.rmdir(QLatin1String("Sub"))); - } void tst_ContentUris::readWriteFile() @@ -81,7 +79,7 @@ void tst_ContentUris::readWriteFile() QVERIFY(file.exists()); QVERIFY(file.size() == 0); QVERIFY(file.fileName() == url); - QVERIFY(QFileInfo(url).baseName() == fileName); + QVERIFY(QFileInfo(url).completeBaseName() == fileName); QVERIFY(file.open(QFile::WriteOnly)); QVERIFY(file.isOpen()); |