feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FilePath: Fix setFromString for short urls

Browse Source 
FilePath::setFromString failed previously for URLs
without a path, e.g. "http://qt.io" as it would add
the scheme and host to its path.

Also added a test for various URLs

Change-Id: I6c22489c0af7154734390aa1e5e12693864210b1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-08-31 08:31:09 +02:00
parent e9d6c0f154
commit 1af0eb3504
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/filepath.cpp
View File

@@ -875,7 +875,8 @@ void FilePath::setFromString(const QString &filename, OsType osType)
m_scheme = filename.left(schemeEnd); m_scheme = filename.left(schemeEnd);
const auto hostEnd = filename.indexOf(slash, schemeEnd + 3); const auto hostEnd = filename.indexOf(slash, schemeEnd + 3);
m_host = filename.mid(schemeEnd + 3, hostEnd - schemeEnd - 3); m_host = filename.mid(schemeEnd + 3, hostEnd - schemeEnd - 3);
setRootAndPath(QStringView(filename).mid(hostEnd), osType); if (hostEnd != -1)
setRootAndPath(QStringView(filename).mid(hostEnd), osType);
return; return;
} }

31
tests/auto/utils/fileutils/tst_fileutils.cpp
View File

@@ -65,6 +65,8 @@ private slots:
void onDevice_data(); void onDevice_data();
void plus(); void plus();
void plus_data(); void plus_data();
void url();
void url_data();
private: private:
QTemporaryDir tempDir; QTemporaryDir tempDir;
@@ -786,5 +788,34 @@ void tst_fileutils::plus()
QCOMPARE(expected, result); QCOMPARE(expected, result);
} }
void tst_fileutils::url()
{
QFETCH(QString, url);
QFETCH(QString, expectedScheme);
QFETCH(QString, expectedHost);
QFETCH(QString, expectedPath);
const FilePath result = FilePath::fromString(url);
QCOMPARE(result.scheme(), expectedScheme);
QCOMPARE(result.host(), expectedHost);
QCOMPARE(result.path(), expectedPath);
}
void tst_fileutils::url_data()
{
QTest::addColumn<QString>("url");
QTest::addColumn<QString>("expectedScheme");
QTest::addColumn<QString>("expectedHost");
QTest::addColumn<QString>("expectedPath");
QTest::newRow("empty") << QString() << QString() << QString() << QString();
QTest::newRow("simple-file") << QString("file:///a/b") << QString("file") << QString() << QString("/a/b");
QTest::newRow("simple-file-root") << QString("file:///") << QString("file") << QString() << QString("/");
QTest::newRow("simple-docker") << QString("docker://1234/a/b") << QString("docker") << QString("1234") << QString("/a/b");
QTest::newRow("simple-ssh") << QString("ssh://user@host/a/b") << QString("ssh") << QString("user@host") << QString("/a/b");
QTest::newRow("simple-ssh-with-port") << QString("ssh://user@host:1234/a/b") << QString("ssh") << QString("user@host:1234") << QString("/a/b");
QTest::newRow("http-qt.io") << QString("http://qt.io") << QString("http") << QString("qt.io") << QString();
QTest::newRow("http-qt.io-index.html") << QString("http://qt.io/index.html") << QString("http") << QString("qt.io") << QString("/index.html");
}
QTEST_GUILESS_MAIN(tst_fileutils) QTEST_GUILESS_MAIN(tst_fileutils)
#include "tst_fileutils.moc" #include "tst_fileutils.moc"