feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
3e8f6bbf828e62812c6b81ca66abf955c8afbfac
qt-creator/tests/auto/utils/fileutils/tst_fileutils.cpp

810 lines
33 KiB
C++
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-19 15:59:36 +02:00
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
#include <QtTest>
rename QtDebug to QDebug More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 13:42:46 +02:00
#include <QDebug>
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
#include <QRandomGenerator>
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
#include <utils/fileutils.h>
Utils: More forward declarations / drop unused headers [D-G] Round 1 - focus on headers. For classes with initial in range [D-G]. Try to keep the same separators between different kind of headers. Change-Id: Id42cd7b3743a816f75cecb6b576c0e37cb057473 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
2022-05-24 00:40:44 +02:00
#include <utils/hostosinfo.h>
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
#include <utils/link.h>
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
//TESTED_COMPONENT=src/libs/utils
using namespace Utils;
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
namespace QTest {
template<>
char *toString(const FilePath &filePath)
{
return qstrdup(filePath.toString().toLocal8Bit().constData());
}
}
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
class tst_fileutils : public QObject
{
Q_OBJECT
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
signals:
void asyncTestDone(); // test internal helper signal
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
private slots:
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
void initTestCase();
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
void parentDir_data();
void parentDir();
FileName: Fix isChildOf for some corner cases empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 06:06:09 +02:00
void isChildOf_data();
void isChildOf();
Utils: Introduce FileName::fileName() * Replacement for QFileInfo::fileName() * Supports additional path components Change-Id: I2b3e3dfb02617c8f98f1d67e16396bed97f97526 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-10 23:23:15 +02:00
void fileName_data();
void fileName();
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
void calcRelativePath_data();
void calcRelativePath();
void relativePath_specials();
void relativePath_data();
void relativePath();
Utils: Rework FilePath guts This replaces FilePath::m_url by explicit host and scheme members This removes the unclear duplication of information in m_data and m_url.path() and avoids syntactic restrictions a real url has on scheme and host and complex (and potentially lossy) url parsing: QUrl url; url.setHost("1234"); assert(url.host() == "0.0.4.210") The toString/fromString methods now accept strings of the form scheme://host/path, mimicing the use of urls so far. Relative remote paths are representable, their toString() output looks like scheme://./host/path and can be parsed back by fromString(). Change-Id: Id3b52c270b228e23834faa3f44daad8b1718b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 18:03:10 +02:00
void fromToString_data();
void fromToString();
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
void fromString_data();
void fromString();
void toString_data();
void toString();
Utils: Centralize FilePath case sensitivity handling This could or possibly should the target device's file name case sensitivity into account by diverting to IDevice. However, as this is expensive and we are in time-critical path here, we go with "good enough" for now. The first approximation is "Anything unusual is not case sensitive" which is better than "Any device equals the host". Change-Id: Ib3d4a627abebd96a7285a855af66e0c800767767 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-19 09:28:57 +02:00
void comparison_data();
void comparison();
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
void linkFromString_data();
void linkFromString();
Utils: Avoid adding duplicated slashs in FilePath::pathAppended Change-Id: I791412906e94a967a61d9b3212b704936c447183 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-13 11:39:54 +02:00
void pathAppended_data();
void pathAppended();
Utils: Improve FileUtils::commonPath Make it a worthy FilePath-based counterpart of Utils::commonPath. With tests. Change-Id: I68bae129c5d9d9dd3e46dfa6093e229f8ca0aee1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2022-07-21 18:23:27 +02:00
void commonPath_data();
void commonPath();
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
void resolvePath_data();
void resolvePath();
void relativeChildPath_data();
void relativeChildPath();
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
void asyncLocalCopy();
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
void startsWithDriveLetter();
void startsWithDriveLetter_data();
void onDevice();
void onDevice_data();
FilePath: Fix for operator+(QString) Change-Id: I3b9889c8b2cdc8a9d1bf94c3e7a8627e2ff2ac35 Reviewed-by: hjk <hjk@qt.io>
2022-08-10 15:04:46 +02:00
void plus();
void plus_data();
FilePath: Fix setFromString for short urls 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>
2022-08-31 08:31:09 +02:00
void url();
void url_data();
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
private:
QTemporaryDir tempDir;
QString rootPath;
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
};
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
static void touch(const QDir &dir, const QString &filename, bool fill)
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
{
QFile file(dir.absoluteFilePath(filename));
file.open(QIODevice::WriteOnly);
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
if (fill) {
QRandomGenerator *random = QRandomGenerator::global();
for (int i = 0; i < 10; ++i)
file.write(QString::number(random->generate(), 16).toUtf8());
}
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
file.close();
}
void tst_fileutils::initTestCase()
{
// initialize test for tst_fileutiles::relativePath*()
QVERIFY(tempDir.isValid());
rootPath = tempDir.path();
QDir dir(rootPath);
dir.mkpath("a/b/c/d");
dir.mkpath("a/x/y/z");
dir.mkpath("a/b/x/y/z");
dir.mkpath("x/y/z");
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
touch(dir, "a/b/c/d/file1.txt", false);
touch(dir, "a/x/y/z/file2.txt", false);
touch(dir, "a/file3.txt", false);
touch(dir, "x/y/file4.txt", false);
// initialize test for tst_fileutils::asyncLocalCopy()
touch(dir, "x/y/fileToCopy.txt", true);
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
}
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
void tst_fileutils::parentDir_data()
{
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("parentPath");
QTest::addColumn<QString>("expectFailMessage");
Tests: Cleanup FileUtils test QTestData converts raw string as Utf8. Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-09 10:53:46 +02:00
QTest::newRow("empty path") << "" << "" << "";
QTest::newRow("root only") << "/" << "" << "";
QTest::newRow("//") << "//" << "" << "";
QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << "";
QTest::newRow("relative/path") << "relative/path" << "relative" << "";
Tests: add missing column to tst_fileutils::parentDir testcase The third column was accidentally removed from one data row in commit 271794fbc9cbeaa3393808691742893602de6cf5 Fixes the following fatal error: QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function. Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-10-18 02:43:59 +02:00
QTest::newRow("relativepath") << "relativepath" << "." << "";
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
// Windows stuff:
#ifdef Q_OS_WIN
Tests: Cleanup FileUtils test QTestData converts raw string as Utf8. Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-09 10:53:46 +02:00
QTest::newRow("C:/data") << "C:/data" << "C:/" << "";
QTest::newRow("C:/") << "C:/" << "" << "";
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
QTest::newRow("//./com1") << "//./com1" << "//./" << "";
Fix frequent typo can not -> cannot Change-Id: Ie872ada1bc9b4ed64bffb667c2e44dbb13b4ad11 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-22 16:34:31 +02:00
QTest::newRow("//?/path") << "//?/path" << "/" << "Qt 4 cannot handle this path.";
Tests: Break trigraphs Change-Id: I9bc0e5f6080adfb518ff6e4d22052013728e6458 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-02 22:29:51 +02:00
QTest::newRow("/Global?\?/UNC/host") << "/Global?\?/UNC/host" << "/Global?\?/UNC/host"
Fix frequent typo can not -> cannot Change-Id: Ie872ada1bc9b4ed64bffb667c2e44dbb13b4ad11 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-22 16:34:31 +02:00
<< "Qt 4 cannot handle this path.";
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
QTest::newRow("//server/directory/file")
Tests: Cleanup FileUtils test QTestData converts raw string as Utf8. Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-09 10:53:46 +02:00
<< "//server/directory/file" << "//server/directory" << "";
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
QTest::newRow("//server/directory") << "//server/directory" << "//server/" << "";
QTest::newRow("//server") << "//server/" << "" << "";
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
#endif
}
void tst_fileutils::parentDir()
{
QFETCH(QString, path);
QFETCH(QString, parentPath);
QFETCH(QString, expectFailMessage);
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
FilePath result = FilePath::fromString(path).parentDir();
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
if (!expectFailMessage.isEmpty())
QEXPECT_FAIL("", expectFailMessage.toUtf8().constData(), Continue);
QCOMPARE(result.toString(), parentPath);
}
FileName: Fix isChildOf for some corner cases empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 06:06:09 +02:00
void tst_fileutils::isChildOf_data()
{
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("childPath");
QTest::addColumn<bool>("result");
Tests: Cleanup FileUtils test QTestData converts raw string as Utf8. Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-09 10:53:46 +02:00
QTest::newRow("empty path") << "" << "/tmp" << false;
QTest::newRow("root only") << "/" << "/tmp" << true;
QTest::newRow("/tmp/dir") << "/tmp" << "/tmp/dir" << true;
QTest::newRow("relative/path") << "relative" << "relative/path" << true;
QTest::newRow("/tmpdir") << "/tmp" << "/tmpdir" << false;
QTest::newRow("same") << "/tmp/dir" << "/tmp/dir" << false;
FileName: Fix isChildOf for some corner cases empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 06:06:09 +02:00
// Windows stuff:
#ifdef Q_OS_WIN
Tests: Cleanup FileUtils test QTestData converts raw string as Utf8. Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-09 10:53:46 +02:00
QTest::newRow("C:/data") << "C:/" << "C:/data" << true;
QTest::newRow("C:/") << "" << "C:/" << false;
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
QTest::newRow("//./com1") << "/" << "//./com1" << false;
QTest::newRow("//?/path") << "/" << "//?/path" << false;
Tests: Break trigraphs Change-Id: I9bc0e5f6080adfb518ff6e4d22052013728e6458 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-02 22:29:51 +02:00
QTest::newRow("/Global?\?/UNC/host") << "/Global?\?/UNC/host"
<< "/Global?\?/UNC/host/file" << true;
FileName: Fix isChildOf for some corner cases empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 06:06:09 +02:00
QTest::newRow("//server/directory/file")
Tests: Cleanup FileUtils test QTestData converts raw string as Utf8. Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-09 10:53:46 +02:00
<< "//server/directory" << "//server/directory/file" << true;
FileName: Fix isChildOf for some corner cases empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 06:06:09 +02:00
QTest::newRow("//server/directory")
Tests: Cleanup FileUtils test QTestData converts raw string as Utf8. Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-09 10:53:46 +02:00
<< "//server" << "//server/directory" << true;
FileName: Fix isChildOf for some corner cases empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 06:06:09 +02:00
#endif
}
void tst_fileutils::isChildOf()
{
QFETCH(QString, path);
QFETCH(QString, childPath);
QFETCH(bool, result);
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
const FilePath child = FilePath::fromString(childPath);
const FilePath parent = FilePath::fromString(path);
QCOMPARE(child.isChildOf(parent), result);
FileName: Fix isChildOf for some corner cases empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 06:06:09 +02:00
}
Utils: Introduce FileName::fileName() * Replacement for QFileInfo::fileName() * Supports additional path components Change-Id: I2b3e3dfb02617c8f98f1d67e16396bed97f97526 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-10 23:23:15 +02:00
void tst_fileutils::fileName_data()
{
QTest::addColumn<QString>("path");
QTest::addColumn<int>("components");
QTest::addColumn<QString>("result");
QTest::newRow("empty 1") << "" << 0 << "";
QTest::newRow("empty 2") << "" << 1 << "";
QTest::newRow("basic") << "/foo/bar/baz" << 0 << "baz";
QTest::newRow("2 parts") << "/foo/bar/baz" << 1 << "bar/baz";
QTest::newRow("root no depth") << "/foo" << 0 << "foo";
QTest::newRow("root full") << "/foo" << 1 << "/foo";
QTest::newRow("root included") << "/foo/bar/baz" << 2 << "/foo/bar/baz";
QTest::newRow("too many parts") << "/foo/bar/baz" << 5 << "/foo/bar/baz";
QTest::newRow("windows root") << "C:/foo/bar/baz" << 2 << "C:/foo/bar/baz";
QTest::newRow("smb share") << "//server/share/file" << 2 << "//server/share/file";
QTest::newRow("no slashes") << "foobar" << 0 << "foobar";
QTest::newRow("no slashes with depth") << "foobar" << 1 << "foobar";
QTest::newRow("multiple slashes 1") << "/foo/bar////baz" << 0 << "baz";
QTest::newRow("multiple slashes 2") << "/foo/bar////baz" << 1 << "bar////baz";
QTest::newRow("multiple slashes 3") << "/foo////bar/baz" << 2 << "/foo////bar/baz";
QTest::newRow("single char 1") << "/a/b/c" << 0 << "c";
QTest::newRow("single char 2") << "/a/b/c" << 1 << "b/c";
QTest::newRow("single char 3") << "/a/b/c" << 2 << "/a/b/c";
QTest::newRow("slash at end 1") << "/a/b/" << 0 << "";
QTest::newRow("slash at end 2") << "/a/b/" << 1 << "b/";
QTest::newRow("slashes at end 1") << "/a/b//" << 0 << "";
QTest::newRow("slashes at end 2") << "/a/b//" << 1 << "b//";
QTest::newRow("root only 1") << "/" << 0 << "";
QTest::newRow("root only 2") << "/" << 1 << "/";
}
void tst_fileutils::fileName()
{
QFETCH(QString, path);
QFETCH(int, components);
QFETCH(QString, result);
Tests: Fix compile Broke with e027ed5e964e3e9. Change-Id: Ic79537865f42c4d6190d262fcf73399ed42b3035 Reviewed-by: hjk <hjk@qt.io>
2019-08-14 13:37:35 +02:00
QCOMPARE(FilePath::fromString(path).fileNameWithPathComponents(components), result);
Utils: Introduce FileName::fileName() * Replacement for QFileInfo::fileName() * Supports additional path components Change-Id: I2b3e3dfb02617c8f98f1d67e16396bed97f97526 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-10 23:23:15 +02:00
}
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
void tst_fileutils::calcRelativePath_data()
{
QTest::addColumn<QString>("absolutePath");
QTest::addColumn<QString>("anchorPath");
QTest::addColumn<QString>("result");
QTest::newRow("empty") << "" << "" << "";
QTest::newRow("leftempty") << "" << "/" << "";
QTest::newRow("rightempty") << "/" << "" << "";
Utils: Adjust FilePath::relativePath() When using the same path for the anchor and the relative path we end up in an empty path which is conceptually wrong. Especially when passing such a result directly without further checking may lead to bad issues. Return a path containing just the '.' (dot) instead. Change-Id: I86e1ab91e6610831fc05bd81776d278e9fe10105 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: hjk <hjk@qt.io>
2021-08-17 08:49:57 +02:00
QTest::newRow("root") << "/" << "/" << ".";
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
QTest::newRow("simple1") << "/a" << "/" << "a";
QTest::newRow("simple2") << "/" << "/a" << "..";
Utils: Adjust FilePath::relativePath() When using the same path for the anchor and the relative path we end up in an empty path which is conceptually wrong. Especially when passing such a result directly without further checking may lead to bad issues. Return a path containing just the '.' (dot) instead. Change-Id: I86e1ab91e6610831fc05bd81776d278e9fe10105 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: hjk <hjk@qt.io>
2021-08-17 08:49:57 +02:00
QTest::newRow("simple3") << "/a" << "/a" << ".";
QTest::newRow("extraslash1") << "/a/b/c" << "/a/b/c" << ".";
QTest::newRow("extraslash2") << "/a/b/c" << "/a/b/c/" << ".";
QTest::newRow("extraslash3") << "/a/b/c/" << "/a/b/c" << ".";
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
QTest::newRow("normal1") << "/a/b/c" << "/a/x" << "../b/c";
QTest::newRow("normal2") << "/a/b/c" << "/a/x/y" << "../../b/c";
QTest::newRow("normal3") << "/a/b/c" << "/x/y" << "../../a/b/c";
}
void tst_fileutils::calcRelativePath()
{
QFETCH(QString, absolutePath);
QFETCH(QString, anchorPath);
QFETCH(QString, result);
QString relativePath = Utils::FilePath::calcRelativePath(absolutePath, anchorPath);
QCOMPARE(relativePath, result);
}
void tst_fileutils::relativePath_specials()
{
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
QString path = FilePath("").relativePath("").toString();
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
QCOMPARE(path, "");
}
void tst_fileutils::relativePath_data()
{
QTest::addColumn<QString>("relative");
QTest::addColumn<QString>("anchor");
QTest::addColumn<QString>("result");
Utils: Adjust FilePath::relativePath() When using the same path for the anchor and the relative path we end up in an empty path which is conceptually wrong. Especially when passing such a result directly without further checking may lead to bad issues. Return a path containing just the '.' (dot) instead. Change-Id: I86e1ab91e6610831fc05bd81776d278e9fe10105 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: hjk <hjk@qt.io>
2021-08-17 08:49:57 +02:00
QTest::newRow("samedir") << "/" << "/" << ".";
QTest::newRow("samedir_but_file") << "a/b/c/d/file1.txt" << "a/b/c/d" << "file1.txt";
QTest::newRow("samedir_but_file2") << "a/b/c/d" << "a/b/c/d/file1.txt" << ".";
Extend Utils::FilePath for relative paths The new methods allows converting a path to a file or directory into a path relative to another path to a file or directory. Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 10:46:25 +02:00
QTest::newRow("dir2dir_1") << "a/b/c/d" << "a/x/y/z" << "../../../b/c/d";
QTest::newRow("dir2dir_2") << "a/b" <<"a/b/c" << "..";
QTest::newRow("file2file_1") << "a/b/c/d/file1.txt" << "a/file3.txt" << "b/c/d/file1.txt";
QTest::newRow("dir2file_1") << "a/b/c" << "a/x/y/z/file2.txt" << "../../../b/c";
QTest::newRow("file2dir_1") << "a/b/c/d/file1.txt" << "x/y" << "../../a/b/c/d/file1.txt";
}
void tst_fileutils::relativePath()
{
QFETCH(QString, relative);
QFETCH(QString, anchor);
QFETCH(QString, result);
FilePath actualPath = FilePath::fromString(rootPath + "/" + relative)
.relativePath(FilePath::fromString(rootPath + "/" + anchor));
QCOMPARE(actualPath.toString(), result);
}
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
void tst_fileutils::toString_data()
{
QTest::addColumn<QString>("scheme");
QTest::addColumn<QString>("host");
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("result");
QTest::addColumn<QString>("userResult");
QTest::newRow("empty") << "" << "" << "" << "" << "";
QTest::newRow("scheme") << "http" << "" << "" << QDir::rootPath() + "__qtc_devices__/http//./" << "http:///./";
QTest::newRow("scheme-and-host") << "http" << "127.0.0.1" << "" << QDir::rootPath() + "__qtc_devices__/http/127.0.0.1/./" << "http://127.0.0.1/./";
QTest::newRow("root") << "http" << "127.0.0.1" << "/" << QDir::rootPath() + "__qtc_devices__/http/127.0.0.1/" << "http://127.0.0.1/";
QTest::newRow("root-folder") << "" << "" << "/" << "/" << "/";
QTest::newRow("qtc-dev-root-folder") << "" << "" << QDir::rootPath() + "__qtc_devices__" << QDir::rootPath() + "__qtc_devices__" << QDir::rootPath() + "__qtc_devices__";
QTest::newRow("qtc-dev-type-root-folder") << "" << "" << QDir::rootPath() + "__qtc_devices__/docker" << QDir::rootPath() + "__qtc_devices__/docker" << QDir::rootPath() + "__qtc_devices__/docker";
QTest::newRow("qtc-root-folder") << "docker" << "alpine:latest" << "/" << QDir::rootPath() + "__qtc_devices__/docker/alpine:latest/" << "docker://alpine:latest/";
QTest::newRow("qtc-root-folder-rel") << "docker" << "alpine:latest" << "" << QDir::rootPath() + "__qtc_devices__/docker/alpine:latest/./" << "docker://alpine:latest/./";
}
void tst_fileutils::toString()
{
QFETCH(QString, scheme);
QFETCH(QString, host);
QFETCH(QString, path);
QFETCH(QString, result);
QFETCH(QString, userResult);
Utils: Replace FilePath part setters ... by a combined version. This will make it easier to store the parts in one QString object. Change-Id: Ie85a77e3957c78a30e49998fe2e617af35a8ad17 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-04 15:00:24 +02:00
FilePath filePath = FilePath::fromParts(scheme, host, path);
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
QCOMPARE(filePath.toString(), result);
fsengine: Fix toLower / compare test Fixed test on windows Change-Id: I1652af82499e6820eb9850a3d79d3d1c5bc18614 Reviewed-by: hjk <hjk@qt.io>
2022-07-21 15:19:04 +02:00
QString cleanedOutput = filePath.needsDevice() ? filePath.toUserOutput() : QDir::cleanPath(filePath.toUserOutput());
QCOMPARE(cleanedOutput, userResult);
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
}
void tst_fileutils::fromString_data()
{
QTest::addColumn<QString>("input");
QTest::addColumn<QString>("scheme");
QTest::addColumn<QString>("host");
QTest::addColumn<QString>("path");
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
QTest::addColumn<OsType>("osType");
QTest::newRow("empty") << "" << "" << "" << "" << HostOsInfo::hostOs();
FilePath: Fix parsing of qrc paths Change-Id: I50d404bafb8d1cb4f0663cd424e1034ae26bb903 Reviewed-by: hjk <hjk@qt.io>
2022-08-08 09:17:50 +02:00
QTest::newRow("single-slash") << ":" << "" << "" << ":" << HostOsInfo::hostOs();
QTest::newRow("single-colon") << "/" << "" << "" << "/" << HostOsInfo::hostOs();
QTest::newRow("single-char") << "a" << "" << "" << "a" << HostOsInfo::hostOs();
QTest::newRow("qrc-no-slash") << ":test.txt" << "" << "" << ":test.txt" << HostOsInfo::hostOs();
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
QTest::newRow("qrc") << ":/test.txt" << "" << "" << ":/test.txt" << HostOsInfo::hostOs();
QTest::newRow("unc-incomplete") << "//" << "" << "" << "" << OsType::OsTypeWindows;
QTest::newRow("unc-incomplete-only-server") << "//server" << "" << "" << "//server/" << OsType::OsTypeWindows;
QTest::newRow("unc-incomplete-only-server-2") << "//server/" << "" << "" << "//server/" << OsType::OsTypeWindows;
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
QTest::newRow("unc-server-and-share") << "//server/share" << "" << "" << "//server/share" << OsType::OsTypeWindows;
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
QTest::newRow("unc-server-and-share-2") << "//server/share/" << "" << "" << "//server/share/" << OsType::OsTypeWindows;
QTest::newRow("unc-full") << "//server/share/test.txt" << "" << "" << "//server/share/test.txt" << OsType::OsTypeWindows;
QTest::newRow("unix-root") << "/" << "" << "" << "/" << OsType::OsTypeLinux;
QTest::newRow("unix-folder") << "/tmp" << "" << "" << "/tmp" << OsType::OsTypeLinux;
QTest::newRow("unix-folder-with-trailing-slash") << "/tmp/" << "" << "" << "/tmp/" << OsType::OsTypeLinux;
QTest::newRow("windows-root") << "c:" << "" << "" << "c:/" << OsType::OsTypeWindows;
QTest::newRow("windows-folder") << "c:\\Windows" << "" << "" << "c:/Windows" << OsType::OsTypeWindows;
QTest::newRow("windows-folder-with-trailing-slash") << "c:\\Windows\\" << "" << "" << "c:/Windows\\" << OsType::OsTypeWindows;
QTest::newRow("windows-folder-slash") << "C:/Windows" << "" << "" << "C:/Windows" << OsType::OsTypeWindows;
QTest::newRow("docker-root-url") << "docker://1234/" << "docker" << "1234" << "/" << OsType::OsTypeLinux;
QTest::newRow("docker-root-url-special") << QDir::rootPath() + "__qtc_devices__/docker/1234/" << "docker" << "1234" << "/" << OsType::OsTypeLinux;
QTest::newRow("qtc-dev") << QDir::rootPath() + "__qtc_devices__" << "" << "" << QDir::rootPath() + "__qtc_devices__" << HostOsInfo::hostOs();
QTest::newRow("qtc-dev-type") << QDir::rootPath() + "__qtc_devices__/docker" << "" << "" << QDir::rootPath() + "__qtc_devices__/docker" << HostOsInfo::hostOs();
QTest::newRow("qtc-dev-type-dev") << QDir::rootPath() + "__qtc_devices__/docker/1234" << "docker" << "1234" << "/" << OsType::OsTypeLinux;
QTest::newRow("cross-os") << QDir::rootPath() + "__qtc_devices__/docker/1234/c:/test.txt" << "docker" << "1234" << "c:/test.txt" << OsType::OsTypeWindows;
QTest::newRow("cross-os-unclean") << QDir::rootPath() + "__qtc_devices__/docker/1234/c:\\test.txt" << "docker" << "1234" << "c:/test.txt" << OsType::OsTypeWindows;
QTest::newRow("unc-full-in-docker") << QDir::rootPath() + "__qtc_devices__/docker/1234//server/share/test.txt" << "docker" << "1234" << "//server/share/test.txt" << OsType::OsTypeWindows;
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
QTest::newRow("unc-dos-1") << "//?/c:" << "" << "" << "//?/c:" << OsType::OsTypeWindows;
QTest::newRow("unc-dos-com") << "//./com1" << "" << "" << "//./com1" << OsType::OsTypeWindows;
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
}
void tst_fileutils::fromString()
{
QFETCH(QString, input);
QFETCH(QString, scheme);
QFETCH(QString, host);
QFETCH(QString, path);
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
QFETCH(OsType, osType);
FilePath filePath = FilePath::fromString(input, osType);
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
QCOMPARE(filePath.scheme(), scheme);
QCOMPARE(filePath.host(), host);
QCOMPARE(filePath.path(), path);
}
Utils: Rework FilePath guts This replaces FilePath::m_url by explicit host and scheme members This removes the unclear duplication of information in m_data and m_url.path() and avoids syntactic restrictions a real url has on scheme and host and complex (and potentially lossy) url parsing: QUrl url; url.setHost("1234"); assert(url.host() == "0.0.4.210") The toString/fromString methods now accept strings of the form scheme://host/path, mimicing the use of urls so far. Relative remote paths are representable, their toString() output looks like scheme://./host/path and can be parsed back by fromString(). Change-Id: Id3b52c270b228e23834faa3f44daad8b1718b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 18:03:10 +02:00
void tst_fileutils::fromToString_data()
{
QTest::addColumn<QString>("scheme");
QTest::addColumn<QString>("host");
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("full");
QTest::newRow("s0") << "" << "" << "" << "";
QTest::newRow("s1") << "" << "" << "/" << "/";
QTest::newRow("s2") << "" << "" << "a/b/c/d" << "a/b/c/d";
QTest::newRow("s3") << "" << "" << "/a/b" << "/a/b";
QTest::newRow("s4")
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
<< "docker" << "1234abcdef" << "/bin/ls" << QDir::rootPath() + "__qtc_devices__/docker/1234abcdef/bin/ls";
Utils: Rework FilePath guts This replaces FilePath::m_url by explicit host and scheme members This removes the unclear duplication of information in m_data and m_url.path() and avoids syntactic restrictions a real url has on scheme and host and complex (and potentially lossy) url parsing: QUrl url; url.setHost("1234"); assert(url.host() == "0.0.4.210") The toString/fromString methods now accept strings of the form scheme://host/path, mimicing the use of urls so far. Relative remote paths are representable, their toString() output looks like scheme://./host/path and can be parsed back by fromString(). Change-Id: Id3b52c270b228e23834faa3f44daad8b1718b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 18:03:10 +02:00
QTest::newRow("s5")
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
<< "docker" << "1234" << "/bin/ls" << QDir::rootPath() + "__qtc_devices__/docker/1234/bin/ls";
Utils: Rework FilePath guts This replaces FilePath::m_url by explicit host and scheme members This removes the unclear duplication of information in m_data and m_url.path() and avoids syntactic restrictions a real url has on scheme and host and complex (and potentially lossy) url parsing: QUrl url; url.setHost("1234"); assert(url.host() == "0.0.4.210") The toString/fromString methods now accept strings of the form scheme://host/path, mimicing the use of urls so far. Relative remote paths are representable, their toString() output looks like scheme://./host/path and can be parsed back by fromString(). Change-Id: Id3b52c270b228e23834faa3f44daad8b1718b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 18:03:10 +02:00
// This is not a proper URL.
QTest::newRow("s6")
filesystem: Add QFSEngine for filepaths Change-Id: Ibd0c88c69863c0877138d8cc45541530c359bd9c Reviewed-by: hjk <hjk@qt.io>
2022-05-31 11:16:44 +02:00
<< "docker" << "1234" << "somefile" << QDir::rootPath() + "__qtc_devices__/docker/1234/./somefile";
Utils: Rework FilePath guts This replaces FilePath::m_url by explicit host and scheme members This removes the unclear duplication of information in m_data and m_url.path() and avoids syntactic restrictions a real url has on scheme and host and complex (and potentially lossy) url parsing: QUrl url; url.setHost("1234"); assert(url.host() == "0.0.4.210") The toString/fromString methods now accept strings of the form scheme://host/path, mimicing the use of urls so far. Relative remote paths are representable, their toString() output looks like scheme://./host/path and can be parsed back by fromString(). Change-Id: Id3b52c270b228e23834faa3f44daad8b1718b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 18:03:10 +02:00
// Local Windows paths:
QTest::newRow("w1") << "" << "" << "C:/data" << "C:/data";
QTest::newRow("w2") << "" << "" << "C:/" << "C:/";
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
QTest::newRow("w3") << "" << "" << "/Global?\?/UNC/host" << "/Global?\?/UNC/host";
QTest::newRow("w4") << "" << "" << "//server/dir/file" << "//server/dir/file";
Utils: Rework FilePath guts This replaces FilePath::m_url by explicit host and scheme members This removes the unclear duplication of information in m_data and m_url.path() and avoids syntactic restrictions a real url has on scheme and host and complex (and potentially lossy) url parsing: QUrl url; url.setHost("1234"); assert(url.host() == "0.0.4.210") The toString/fromString methods now accept strings of the form scheme://host/path, mimicing the use of urls so far. Relative remote paths are representable, their toString() output looks like scheme://./host/path and can be parsed back by fromString(). Change-Id: Id3b52c270b228e23834faa3f44daad8b1718b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 18:03:10 +02:00
}
void tst_fileutils::fromToString()
{
QFETCH(QString, full);
QFETCH(QString, scheme);
QFETCH(QString, host);
QFETCH(QString, path);
FilePath filePath = FilePath::fromString(full);
QCOMPARE(filePath.toString(), full);
QCOMPARE(filePath.scheme(), scheme);
QCOMPARE(filePath.host(), host);
QCOMPARE(filePath.path(), path);
Utils: Replace FilePath part setters ... by a combined version. This will make it easier to store the parts in one QString object. Change-Id: Ie85a77e3957c78a30e49998fe2e617af35a8ad17 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-04 15:00:24 +02:00
FilePath copy = FilePath::fromParts(scheme, host, path);
Utils: Rework FilePath guts This replaces FilePath::m_url by explicit host and scheme members This removes the unclear duplication of information in m_data and m_url.path() and avoids syntactic restrictions a real url has on scheme and host and complex (and potentially lossy) url parsing: QUrl url; url.setHost("1234"); assert(url.host() == "0.0.4.210") The toString/fromString methods now accept strings of the form scheme://host/path, mimicing the use of urls so far. Relative remote paths are representable, their toString() output looks like scheme://./host/path and can be parsed back by fromString(). Change-Id: Id3b52c270b228e23834faa3f44daad8b1718b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 18:03:10 +02:00
QCOMPARE(copy.toString(), full);
}
Utils: Centralize FilePath case sensitivity handling This could or possibly should the target device's file name case sensitivity into account by diverting to IDevice. However, as this is expensive and we are in time-critical path here, we go with "good enough" for now. The first approximation is "Anything unusual is not case sensitive" which is better than "Any device equals the host". Change-Id: Ib3d4a627abebd96a7285a855af66e0c800767767 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-19 09:28:57 +02:00
void tst_fileutils::comparison()
{
QFETCH(QString, left);
QFETCH(QString, right);
QFETCH(bool, hostSensitive);
QFETCH(bool, expected);
HostOsInfo::setOverrideFileNameCaseSensitivity(
hostSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
FilePath l = FilePath::fromString(left);
FilePath r = FilePath::fromString(right);
QCOMPARE(l == r, expected);
}
void tst_fileutils::comparison_data()
{
QTest::addColumn<QString>("left");
QTest::addColumn<QString>("right");
QTest::addColumn<bool>("hostSensitive");
QTest::addColumn<bool>("expected");
QTest::newRow("r1") << "Abc" << "abc" << true << false;
QTest::newRow("r2") << "Abc" << "abc" << false << true;
QTest::newRow("r3") << "x://y/Abc" << "x://y/abc" << true << false;
QTest::newRow("r4") << "x://y/Abc" << "x://y/abc" << false << false;
QTest::newRow("s1") << "abc" << "abc" << true << true;
QTest::newRow("s2") << "abc" << "abc" << false << true;
QTest::newRow("s3") << "x://y/abc" << "x://y/abc" << true << true;
QTest::newRow("s4") << "x://y/abc" << "x://y/abc" << false << true;
}
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
void tst_fileutils::linkFromString()
{
QFETCH(QString, testFile);
QFETCH(Utils::FilePath, filePath);
QFETCH(QString, postfix);
QFETCH(int, line);
QFETCH(int, column);
QString extractedPostfix;
Link link = Link::fromString(testFile, true, &extractedPostfix);
QCOMPARE(link.targetFilePath, filePath);
QCOMPARE(extractedPostfix, postfix);
QCOMPARE(link.targetLine, line);
QCOMPARE(link.targetColumn, column);
}
void tst_fileutils::linkFromString_data()
{
QTest::addColumn<QString>("testFile");
QTest::addColumn<Utils::FilePath>("filePath");
QTest::addColumn<QString>("postfix");
QTest::addColumn<int>("line");
QTest::addColumn<int>("column");
QTest::newRow("no-line-no-column")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< QString("someFile.txt") << FilePath("someFile.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString() << -1 << -1;
QTest::newRow(": at end") << QString::fromLatin1("someFile.txt:")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("someFile.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":") << 0 << -1;
QTest::newRow("+ at end") << QString::fromLatin1("someFile.txt+")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("someFile.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1("+") << 0 << -1;
QTest::newRow(": for column") << QString::fromLatin1("someFile.txt:10:")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("someFile.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":10:") << 10 << -1;
QTest::newRow("+ for column") << QString::fromLatin1("someFile.txt:10+")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("someFile.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":10+") << 10 << -1;
QTest::newRow(": and + at end")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< QString::fromLatin1("someFile.txt:+") << FilePath("someFile.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":+") << 0 << -1;
QTest::newRow("empty line") << QString::fromLatin1("someFile.txt:+10")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("someFile.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":+10") << 0 << 9;
QTest::newRow(":line-no-column") << QString::fromLatin1("/some/path/file.txt:42")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":42") << 42 << -1;
QTest::newRow("+line-no-column") << QString::fromLatin1("/some/path/file.txt+42")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1("+42") << 42 << -1;
QTest::newRow(":line-:column") << QString::fromLatin1("/some/path/file.txt:42:3")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":42:3") << 42 << 2;
QTest::newRow(":line-+column") << QString::fromLatin1("/some/path/file.txt:42+33")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1(":42+33") << 42 << 32;
QTest::newRow("+line-:column") << QString::fromLatin1("/some/path/file.txt+142:30")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1("+142:30") << 142 << 29;
QTest::newRow("+line-+column") << QString::fromLatin1("/some/path/file.txt+142+33")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1("+142+33") << 142 << 32;
QTest::newRow("( at end") << QString::fromLatin1("/some/path/file.txt(")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1("(") << -1 << -1;
QTest::newRow("(42 at end") << QString::fromLatin1("/some/path/file.txt(42")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1("(42") << 42 << -1;
QTest::newRow("(42) at end") << QString::fromLatin1("/some/path/file.txt(42)")
Utils: Introduce a FilePath constructor from char arrays Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for decorations in user code. At the same time, drop some convenience constructors and functions in CommandLine and Icon essentially serving the same purpose. Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 16:19:02 +02:00
<< FilePath("/some/path/file.txt")
Move filename line split into Utils::Link Since we already have a container for file path, line and column move the parse function there. Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:10:31 +02:00
<< QString::fromLatin1("(42)") << 42 << -1;
}
Utils: Avoid adding duplicated slashs in FilePath::pathAppended Change-Id: I791412906e94a967a61d9b3212b704936c447183 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-13 11:39:54 +02:00
void tst_fileutils::pathAppended()
{
QFETCH(QString, left);
QFETCH(QString, right);
QFETCH(QString, expected);
const FilePath fleft = FilePath::fromString(left);
const FilePath fexpected = FilePath::fromString(expected);
const FilePath result = fleft.pathAppended(right);
QCOMPARE(fexpected, result);
}
void tst_fileutils::pathAppended_data()
{
QTest::addColumn<QString>("left");
QTest::addColumn<QString>("right");
QTest::addColumn<QString>("expected");
QTest::newRow("p0") << "" << "" << "";
QTest::newRow("p1") << "" << "/" << "/";
QTest::newRow("p2") << "" << "c/" << "c/";
QTest::newRow("p3") << "" << "/d" << "/d";
QTest::newRow("p4") << "" << "c/d" << "c/d";
QTest::newRow("r0") << "/" << "" << "/";
QTest::newRow("r1") << "/" << "/" << "/";
QTest::newRow("r2") << "/" << "c/" << "/c/";
QTest::newRow("r3") << "/" << "/d" << "/d";
QTest::newRow("r4") << "/" << "c/d" << "/c/d";
QTest::newRow("s0") << "/b" << "" << "/b";
QTest::newRow("s1") << "/b" << "/" << "/b/";
QTest::newRow("s2") << "/b" << "c/" << "/b/c/";
QTest::newRow("s3") << "/b" << "/d" << "/b/d";
QTest::newRow("s4") << "/b" << "c/d" << "/b/c/d";
QTest::newRow("t0") << "a/" << "" << "a/";
QTest::newRow("t1") << "a/" << "/" << "a/";
QTest::newRow("t2") << "a/" << "c/" << "a/c/";
QTest::newRow("t3") << "a/" << "/d" << "a/d";
QTest::newRow("t4") << "a/" << "c/d" << "a/c/d";
QTest::newRow("u0") << "a/b" << "" << "a/b";
QTest::newRow("u1") << "a/b" << "/" << "a/b/";
QTest::newRow("u2") << "a/b" << "c/" << "a/b/c/";
QTest::newRow("u3") << "a/b" << "/d" << "a/b/d";
QTest::newRow("u4") << "a/b" << "c/d" << "a/b/c/d";
FilePath: Fix UNC root/path parsing * Fixed UNC path parsing to correctly split between root and path * Fixed tst_fileutils to correspond to windows path handling. Change-Id: I2849738696a39e8282068ab164514f806f2c5fcf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
2022-08-11 10:50:06 +02:00
if (HostOsInfo::isWindowsHost()) {
QTest::newRow("win-1") << "c:" << "/a/b" << "c:/a/b";
QTest::newRow("win-2") << "c:/" << "/a/b" << "c:/a/b";
QTest::newRow("win-3") << "c:/" << "a/b" << "c:/a/b";
}
Utils: Avoid adding duplicated slashs in FilePath::pathAppended Change-Id: I791412906e94a967a61d9b3212b704936c447183 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-13 11:39:54 +02:00
}
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
void tst_fileutils::resolvePath_data()
{
QTest::addColumn<FilePath>("left");
QTest::addColumn<FilePath>("right");
QTest::addColumn<FilePath>("expected");
QTest::newRow("empty") << FilePath() << FilePath() << FilePath();
QTest::newRow("s0") << FilePath("/") << FilePath("b") << FilePath("/b");
QTest::newRow("s1") << FilePath() << FilePath("b") << FilePath("b");
QTest::newRow("s2") << FilePath("a") << FilePath() << FilePath("a");
QTest::newRow("s3") << FilePath("a") << FilePath("b") << FilePath("a/b");
QTest::newRow("s4") << FilePath("/a") << FilePath("/b") << FilePath("/b");
QTest::newRow("s5") << FilePath("a") << FilePath("/b") << FilePath("/b");
QTest::newRow("s6") << FilePath("/a") << FilePath("b") << FilePath("/a/b");
}
void tst_fileutils::resolvePath()
{
QFETCH(FilePath, left);
QFETCH(FilePath, right);
QFETCH(FilePath, expected);
const FilePath result = left.resolvePath(right);
QCOMPARE(result, expected);
}
void tst_fileutils::relativeChildPath_data()
{
QTest::addColumn<FilePath>("parent");
QTest::addColumn<FilePath>("child");
QTest::addColumn<FilePath>("expected");
QTest::newRow("empty") << FilePath() << FilePath() << FilePath();
QTest::newRow("simple-0") << FilePath("/a") << FilePath("/a/b") << FilePath("b");
QTest::newRow("simple-1") << FilePath("/a/") << FilePath("/a/b") << FilePath("b");
QTest::newRow("simple-2") << FilePath("/a") << FilePath("/a/b/c/d/e/f") << FilePath("b/c/d/e/f");
QTest::newRow("not-0") << FilePath("/x") << FilePath("/a/b") << FilePath();
QTest::newRow("not-1") << FilePath("/a/b/c") << FilePath("/a/b") << FilePath();
}
void tst_fileutils::relativeChildPath()
{
QFETCH(FilePath, parent);
QFETCH(FilePath, child);
QFETCH(FilePath, expected);
const FilePath result = child.relativeChildPath(parent);
QCOMPARE(result, expected);
}
Utils: Improve FileUtils::commonPath Make it a worthy FilePath-based counterpart of Utils::commonPath. With tests. Change-Id: I68bae129c5d9d9dd3e46dfa6093e229f8ca0aee1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2022-07-21 18:23:27 +02:00
void tst_fileutils::commonPath()
{
QFETCH(FilePaths, list);
QFETCH(FilePath, expected);
const FilePath result = FileUtils::commonPath(list);
QCOMPARE(expected.toString(), result.toString());
}
void tst_fileutils::commonPath_data()
{
QTest::addColumn<FilePaths>("list");
QTest::addColumn<FilePath>("expected");
const FilePath p1 = FilePath::fromString("c:/Program Files(x86)");
const FilePath p2 = FilePath::fromString("c:/Program Files(x86)/Ide");
const FilePath p3 = FilePath::fromString("c:/Program Files(x86)/Ide/Qt Creator");
const FilePath p4 = FilePath::fromString("c:/Program Files");
const FilePath p5 = FilePath::fromString("c:");
const FilePath url1 = FilePath::fromString("http://127.0.0.1/./");
const FilePath url2 = FilePath::fromString("https://127.0.0.1/./");
const FilePath url3 = FilePath::fromString("http://www.qt.io/./");
const FilePath url4 = FilePath::fromString("https://www.qt.io/./");
const FilePath url5 = FilePath::fromString("https://www.qt.io/ide/");
const FilePath url6 = FilePath::fromString("http:///./");
QTest::newRow("Zero paths") << FilePaths{} << FilePath();
QTest::newRow("Single path") << FilePaths{ p1 } << p1;
QTest::newRow("3 identical paths") << FilePaths{ p1, p1, p1 } << p1;
QTest::newRow("3 paths, common path") << FilePaths{ p1, p2, p3 } << p1;
QTest::newRow("3 paths, no common path") << FilePaths{ p1, p2, p4 } << p5;
QTest::newRow("3 paths, first is part of second") << FilePaths{ p4, p1, p3 } << p5;
QTest::newRow("Common scheme") << FilePaths{ url1, url3 } << url6;
QTest::newRow("Different scheme") << FilePaths{ url1, url2 } << FilePath();
QTest::newRow("Common host") << FilePaths{ url4, url5 } << url4;
QTest::newRow("Different host") << FilePaths{ url1, url3 } << url6;
}
Tests: Add test for async copying via FilePath Change-Id: Idbc18d43ea81d395cc76f7bf9cfb32df1350b3ed Reviewed-by: hjk <hjk@qt.io>
2021-09-01 12:37:34 +02:00
void tst_fileutils::asyncLocalCopy()
{
const FilePath orig = FilePath::fromString(rootPath).pathAppended("x/y/fileToCopy.txt");
QVERIFY(orig.exists());
const FilePath dest = FilePath::fromString(rootPath).pathAppended("x/fileToCopyDest.txt");
auto afterCopy = [&orig, &dest, this] (bool result) {
QVERIFY(result);
// check existence, size and content
QVERIFY(dest.exists());
QCOMPARE(dest.fileSize(), orig.fileSize());
QCOMPARE(dest.fileContents(), orig.fileContents());
emit asyncTestDone();
};
QSignalSpy spy(this, &tst_fileutils::asyncTestDone);
orig.asyncCopyFile(afterCopy, dest);
// we usually have already received the signal, but if it fails wait 3s
QVERIFY(spy.count() == 1 || spy.wait(3000));
}
filepath: Adds m_root to store root part of path Change-Id: I9e32a2806e9ecd231886749357404b4bf94bef10 Reviewed-by: hjk <hjk@qt.io>
2022-07-27 11:38:01 +02:00
void tst_fileutils::startsWithDriveLetter_data()
{
if (!HostOsInfo::isWindowsHost()) {
QSKIP("This test is only relevant on Windows");
}
QTest::addColumn<FilePath>("path");
QTest::addColumn<bool>("expected");
QTest::newRow("empty") << FilePath() << false;
QTest::newRow("simple-win") << FilePath("c:/a", OsType::OsTypeWindows) << true;
QTest::newRow("simple-linux") << FilePath("/c:/a", OsType::OsTypeLinux) << false;
QTest::newRow("relative") << FilePath("a/b") << false;
}
void tst_fileutils::startsWithDriveLetter()
{
QFETCH(FilePath, path);
QFETCH(bool, expected);
QCOMPARE(path.startsWithDriveLetter(), expected);
}
void tst_fileutils::onDevice_data() {
QTest::addColumn<FilePath>("path");
QTest::addColumn<FilePath>("templatePath");
QTest::addColumn<FilePath>("expected");
QTest::newRow("empty") << FilePath() << FilePath() << FilePath();
QTest::newRow("same-local") << FilePath("/a/b") << FilePath("/a/b") << FilePath("/a/b");
QTest::newRow("same-docker") << FilePath("docker://1234/a/b") << FilePath("docker://1234/e") << FilePath("docker://1234/a/b");
QTest::newRow("docker-to-local") << FilePath("docker://1234/a/b") << FilePath("/c/d") << FilePath("/a/b");
QTest::newRow("local-to-docker") << FilePath("/a/b") << FilePath("docker://1234/c/d") << FilePath("docker://1234/a/b");
}
void tst_fileutils::onDevice() {
QFETCH(FilePath, path);
QFETCH(FilePath, templatePath);
QFETCH(FilePath, expected);
QCOMPARE(path.onDevice(templatePath), expected);
}
FilePath: Fix for operator+(QString) Change-Id: I3b9889c8b2cdc8a9d1bf94c3e7a8627e2ff2ac35 Reviewed-by: hjk <hjk@qt.io>
2022-08-10 15:04:46 +02:00
void tst_fileutils::plus_data() {
FilePath: Fix operator+ to use stringAppend instead of pathAppended Change-Id: I643a2e9eed22fafc793bbc75cba0344c4005b3f3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-16 09:47:23 +02:00
QTest::addColumn<FilePath>("left");
QTest::addColumn<QString>("right");
QTest::addColumn<FilePath>("expected");
QTest::newRow("empty") << FilePath() << QString() << FilePath();
QTest::newRow("empty-left") << FilePath() << "a" << FilePath("a");
QTest::newRow("empty-right") << FilePath("a") << QString() << FilePath("a");
QTest::newRow("add-root") << FilePath() << QString("/") << FilePath("/");
QTest::newRow("add-root-and-more") << FilePath() << QString("/test/blah") << FilePath("/test/blah");
QTest::newRow("add-extension") << FilePath::fromString("/a") << QString(".txt") << FilePath("/a.txt");
QTest::newRow("trailing-slash") << FilePath::fromString("/a") << QString("b/") << FilePath("/ab/");
QTest::newRow("slash-trailing-slash") << FilePath::fromString("/a/") << QString("b/") << FilePath("/a/b/");
FilePath: Fix for operator+(QString) Change-Id: I3b9889c8b2cdc8a9d1bf94c3e7a8627e2ff2ac35 Reviewed-by: hjk <hjk@qt.io>
2022-08-10 15:04:46 +02:00
}
void tst_fileutils::plus()
{
FilePath: Fix operator+ to use stringAppend instead of pathAppended Change-Id: I643a2e9eed22fafc793bbc75cba0344c4005b3f3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-16 09:47:23 +02:00
QFETCH(FilePath, left);
FilePath: Fix for operator+(QString) Change-Id: I3b9889c8b2cdc8a9d1bf94c3e7a8627e2ff2ac35 Reviewed-by: hjk <hjk@qt.io>
2022-08-10 15:04:46 +02:00
QFETCH(QString, right);
FilePath: Fix operator+ to use stringAppend instead of pathAppended Change-Id: I643a2e9eed22fafc793bbc75cba0344c4005b3f3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-16 09:47:23 +02:00
QFETCH(FilePath, expected);
FilePath: Fix for operator+(QString) Change-Id: I3b9889c8b2cdc8a9d1bf94c3e7a8627e2ff2ac35 Reviewed-by: hjk <hjk@qt.io>
2022-08-10 15:04:46 +02:00
FilePath: Fix operator+ to use stringAppend instead of pathAppended Change-Id: I643a2e9eed22fafc793bbc75cba0344c4005b3f3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-16 09:47:23 +02:00
const FilePath result = left + right;
FilePath: Fix for operator+(QString) Change-Id: I3b9889c8b2cdc8a9d1bf94c3e7a8627e2ff2ac35 Reviewed-by: hjk <hjk@qt.io>
2022-08-10 15:04:46 +02:00
FilePath: Fix operator+ to use stringAppend instead of pathAppended Change-Id: I643a2e9eed22fafc793bbc75cba0344c4005b3f3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-16 09:47:23 +02:00
QCOMPARE(expected, result);
FilePath: Fix for operator+(QString) Change-Id: I3b9889c8b2cdc8a9d1bf94c3e7a8627e2ff2ac35 Reviewed-by: hjk <hjk@qt.io>
2022-08-10 15:04:46 +02:00
}
FilePath: Fix setFromString for short urls 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>
2022-08-31 08:31:09 +02:00
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");
}
Use QTEST_GUILESS_MAIN where applicable instead of QTEST_MAIN. Reduces the initialization that is done by the Qt test applications, and can also reduce interference with normal OS operations like the current window loosing focus. Change-Id: If88f289281aa1c8703ac7d4dbe0799d067c16588 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-10 12:21:30 +02:00
QTEST_GUILESS_MAIN(tst_fileutils)
FileName: Add method to find parent directories Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:26:54 +01:00
#include "tst_fileutils.moc"
Copy Permalink