diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-10 12:12:52 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-10 12:27:46 (GMT) |
| commit | 98e935eed5549e479f6666680aed1711dc42111c (patch) | |
| tree | cc6a47cfd58d225d98a8377f2b84636010028f61 /tests | |
| parent | cc422e939d671bba8d70a5d02abfb893627303cc (diff) | |
| download | Qt-98e935eed5549e479f6666680aed1711dc42111c.zip Qt-98e935eed5549e479f6666680aed1711dc42111c.tar.gz Qt-98e935eed5549e479f6666680aed1711dc42111c.tar.bz2 | |
Revert "Improve QUrl handling of local file paths"
This reverts commit a2f797b52c4274a62a7cf1f0939aca1429afe211.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qurl/tst_qurl.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 67bf0c1..fa42adc 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -314,7 +314,6 @@ void tst_QUrl::constructing() QUrl buildUNC; - buildUNC.setScheme(QString::fromLatin1("file")); buildUNC.setHost(QString::fromLatin1("somehost")); buildUNC.setPath(QString::fromLatin1("somepath")); QCOMPARE(buildUNC.toLocalFile(), QString::fromLatin1("//somehost/somepath")); @@ -1758,15 +1757,7 @@ void tst_QUrl::toLocalFile_data() QTest::newRow("data7") << QString::fromLatin1("file://somehost/") << QString::fromLatin1("//somehost/"); QTest::newRow("data8") << QString::fromLatin1("file://somehost") << QString::fromLatin1("//somehost"); QTest::newRow("data9") << QString::fromLatin1("file:////somehost/somedir/somefile") << QString::fromLatin1("//somehost/somedir/somefile"); - QTest::newRow("data10") << QString::fromLatin1("FILE:/a.txt") << QString::fromLatin1("/a.txt"); - - // and some that result in empty (i.e., not local) - QTest::newRow("xdata0") << QString::fromLatin1("/a.txt") << QString(); - QTest::newRow("xdata1") << QString::fromLatin1("//a.txt") << QString(); - QTest::newRow("xdata2") << QString::fromLatin1("///a.txt") << QString(); - QTest::newRow("xdata3") << QString::fromLatin1("foo:/a.txt") << QString(); - QTest::newRow("xdata4") << QString::fromLatin1("foo://a.txt") << QString(); - QTest::newRow("xdata5") << QString::fromLatin1("foo:///a.txt") << QString(); + } void tst_QUrl::toLocalFile() |