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

QmlProjectManager: Even more FilePath use

Browse Source 
Change-Id: I4990b9171598d7f277f8e8e5a2b3e0fb1a3375d0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-12-13 12:58:35 +01:00
parent 5c7c102f3e
commit 6a4123a96f
5 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
View File

@@ -12,6 +12,7 @@
//TESTED_COMPONENT=src/plugins/qmlprojectmanager/fileformat
using namespace QmlProjectManager;
using namespace Utils;
#define COMPARE_AS_SETS(actual, expected) \
do {\
@@ -39,7 +40,8 @@ tst_FileFormat::tst_FileFormat()
{
}
static QString testDataDir = QLatin1String(SRCDIR "/data");
const QString testDataDir = QLatin1String(SRCDIR "/data");
const FilePath testDataDirPath = FilePath::fromString(testDataDir);
static std::unique_ptr<QmlProjectItem> loadQmlProject(QString name, QString *error)
{
@@ -50,6 +52,7 @@ static std::unique_ptr<QmlProjectItem> loadQmlProject(QString name, QString *err
void tst_FileFormat::testFileFilter()
{
QString error;
//
// Search for qml files in directory + subdirectories
//
@@ -58,7 +61,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
<< testDataDir + "/file2.qml"
@@ -74,7 +77,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
<< testDataDir + "/file2.qml");
@@ -89,7 +92,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/subdir/file3.qml");
COMPARE_AS_SETS(project->files(), expectedFiles);
@@ -103,7 +106,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
<< testDataDir + "/file2.qml"
@@ -120,7 +123,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
<< testDataDir + "/file2.qml");
@@ -135,7 +138,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/image.gif");
COMPARE_AS_SETS(project->files(), expectedFiles);
@@ -149,7 +152,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/image.gif");
COMPARE_AS_SETS(project->files(), expectedFiles);
@@ -163,7 +166,7 @@ void tst_FileFormat::testFileFilter()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QStringList expectedFiles(QStringList() << testDataDir + "/image.gif");
COMPARE_AS_SETS(project->files(), expectedFiles);
@@ -180,7 +183,7 @@ void tst_FileFormat::testMatchesFile()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
QVERIFY(project->matchesFile(testDataDir + "/file1.qml"));
QVERIFY(project->matchesFile(testDataDir + "/notyetexistingfile.qml"));
@@ -199,7 +202,7 @@ void tst_FileFormat::testLibraryPaths()
QVERIFY(project);
QVERIFY(error.isEmpty());
project->setSourceDirectory(testDataDir);
project->setSourceDirectory(testDataDirPath);
const QDir base(testDataDir);
const QStringList expectedPaths({base.relativeFilePath(SRCDIR "/otherLibrary"),