diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-11 12:11:01 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-14 16:19:13 +0200 |
| commit | 75d878681e71d54863d82eff4349c1f04ba73492 (patch) | |
| tree | b5b919cc7deb8c161f0773ea6e6a425512f75a37 /tests | |
| parent | 8ace707d5798d4ea3506a6f73a10c99c8a7c0f54 (diff) | |
| download | qbs-75d878681e71d54863d82eff4349c1f04ba73492.tar.gz | |
Fix FileInfo.path().
Remove the trailing slash for directories if the file name is empty.
This makes sense, since repeated invocations of path() will strip off
additional components, as one would expect. It is also how
QFileInfo::path() behaves.
Change-Id: Idc28fcaba5d3a8c907b8d6ce8f55001909f00fa8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata/jsextensions/fileinfo.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/tests/auto/blackbox/testdata/jsextensions/fileinfo.qbs b/tests/auto/blackbox/testdata/jsextensions/fileinfo.qbs index b16228107..3a47450e6 100644 --- a/tests/auto/blackbox/testdata/jsextensions/fileinfo.qbs +++ b/tests/auto/blackbox/testdata/jsextensions/fileinfo.qbs @@ -17,6 +17,8 @@ Product { output.writeLine(FileInfo.joinPaths("/", "tmp", "blubb.tar.gz")); output.writeLine(FileInfo.path("/tmp/blubb.tar.gz")); output.writeLine(FileInfo.path("/tmp/")); + output.writeLine(FileInfo.path("/")); + output.writeLine(FileInfo.path("d:/")); output.writeLine(FileInfo.relativePath("/tmp", "/tmp/blubb.tar.gz")); output.writeLine(FileInfo.relativePath("/", "/tmp/blubb.tar.gz")); output.writeLine(FileInfo.relativePath("/tmp", "/blubb.tar.gz")); diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 9152c200d..e554cd88b 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1184,7 +1184,7 @@ void TestBlackbox::jsExtensionsFileInfo() QVERIFY(output.exists()); QVERIFY(output.open(QIODevice::ReadOnly)); const QList<QByteArray> lines = output.readAll().trimmed().split('\n'); - QCOMPARE(lines.count(), 17); + QCOMPARE(lines.count(), 19); QCOMPARE(lines.at(0).trimmed().constData(), "blubb"); QCOMPARE(lines.at(1).trimmed().constData(), "blubb.tar"); QCOMPARE(lines.at(2).trimmed().constData(), "blubb.tar.gz"); @@ -1196,12 +1196,14 @@ void TestBlackbox::jsExtensionsFileInfo() QCOMPARE(lines.at(8).trimmed().constData(), "false"); QCOMPARE(lines.at(9).trimmed().constData(), "/tmp/blubb.tar.gz"); QCOMPARE(lines.at(10).trimmed().constData(), "/tmp"); - QCOMPARE(lines.at(11).trimmed().constData(), "/tmp/"); - QCOMPARE(lines.at(12).trimmed().constData(), "blubb.tar.gz"); - QCOMPARE(lines.at(13).trimmed().constData(), "tmp/blubb.tar.gz"); - QCOMPARE(lines.at(14).trimmed().constData(), "../blubb.tar.gz"); - QCOMPARE(lines.at(15).trimmed().constData(), "\\tmp\\blubb.tar.gz"); - QCOMPARE(lines.at(16).trimmed().constData(), "c:\\tmp\\blubb.tar.gz"); + QCOMPARE(lines.at(11).trimmed().constData(), "/tmp"); + QCOMPARE(lines.at(12).trimmed().constData(), "/"); + QCOMPARE(lines.at(13).trimmed().constData(), "d:/"); + QCOMPARE(lines.at(14).trimmed().constData(), "blubb.tar.gz"); + QCOMPARE(lines.at(15).trimmed().constData(), "tmp/blubb.tar.gz"); + QCOMPARE(lines.at(16).trimmed().constData(), "../blubb.tar.gz"); + QCOMPARE(lines.at(17).trimmed().constData(), "\\tmp\\blubb.tar.gz"); + QCOMPARE(lines.at(18).trimmed().constData(), "c:\\tmp\\blubb.tar.gz"); } void TestBlackbox::jsExtensionsProcess() |