summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/android_content_uri/tst_content_uris.cpp4
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());