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

QmlProjectManager: Remove warnings in file format test

Browse Source 
Change-Id: I6c37f7da544c8e568ca33ecd4573cddaba173e04
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-07-25 16:48:11 +02:00
parent 3163ed4feb
commit 47cd385536
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,24 @@
#include "qmlprojectitem.h"
#include "filefilteritems.h"
#include "qmlprojectfileformat.h"
#include <utils/algorithm.h>
#include <QtTest>
//TESTED_COMPONENT=src/plugins/qmlprojectmanager/fileformat
using namespace QmlProjectManager;
#define COMPARE_AS_SETS(actual, expected) \
do {\
if (!QTest::qCompare(Utils::toSet(actual), Utils::toSet(expected), #actual, #expected, __FILE__, __LINE__)) {\
qDebug() << actual << "\nvs." << expected; \
return;\
}\
} while (false)
class tst_FileFormat : public QObject
{
Q_OBJECT
@@ -49,7 +61,7 @@ tst_FileFormat::tst_FileFormat()
{
}
QString testDataDir = QLatin1String(SRCDIR "/data");
static QString testDataDir = QLatin1String(SRCDIR "/data");
static QmlProjectItem *loadQmlProject(QString name, QString *error)
{
@@ -73,7 +85,7 @@ void tst_FileFormat::testFileFilter()
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
<< testDataDir + "/file2.qml"
<< testDataDir + "/subdir/file3.qml");
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
@@ -89,7 +101,7 @@ void tst_FileFormat::testFileFilter()
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
<< testDataDir + "/file2.qml");
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
@@ -104,7 +116,7 @@ void tst_FileFormat::testFileFilter()
project->setSourceDirectory(testDataDir);
QStringList expectedFiles(QStringList() << testDataDir + "/subdir/file3.qml");
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
@@ -122,7 +134,7 @@ void tst_FileFormat::testFileFilter()
<< testDataDir + "/file2.qml"
<< testDataDir + "/subdir/file3.qml");
QCOMPARE(project->files().size(), 3);
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
@@ -138,7 +150,7 @@ void tst_FileFormat::testFileFilter()
QStringList expectedFiles(QStringList() << testDataDir + "/file1.qml"
<< testDataDir + "/file2.qml");
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
@@ -153,8 +165,7 @@ void tst_FileFormat::testFileFilter()
project->setSourceDirectory(testDataDir);
QStringList expectedFiles(QStringList() << testDataDir + "/image.gif");
qDebug() << project->files().toSet() << expectedFiles.toSet();
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
@@ -169,8 +180,7 @@ void tst_FileFormat::testFileFilter()
project->setSourceDirectory(testDataDir);
QStringList expectedFiles(QStringList() << testDataDir + "/image.gif");
qDebug() << project->files().toSet() << expectedFiles.toSet();
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
@@ -185,8 +195,7 @@ void tst_FileFormat::testFileFilter()
project->setSourceDirectory(testDataDir);
QStringList expectedFiles(QStringList() << testDataDir + "/image.gif");
qDebug() << project->files().toSet() << expectedFiles.toSet();
QCOMPARE(project->files().toSet(), expectedFiles.toSet());
COMPARE_AS_SETS(project->files(), expectedFiles);
delete project;
}
}
@@ -226,8 +235,7 @@ void tst_FileFormat::testLibraryPaths()
const QDir base(testDataDir);
const QStringList expectedPaths({base.relativeFilePath(SRCDIR "/otherLibrary"),
base.relativeFilePath(SRCDIR "/data/library")});
qDebug() << expectedPaths << project->importPaths();
QCOMPARE(project->importPaths().toSet(), expectedPaths.toSet());
COMPARE_AS_SETS(project->importPaths(), expectedPaths);
delete project;
}