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

ProjectExplorer tests: Do not use QVERIFY2() for std::expected values

Browse Source 
QVERIFY2 evaluates its second argument even if the first one is false.
Uncovered by 768f12e033.

Change-Id: I57a175791c21fe416efaabd69920cdcb5e6da38c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Christian Kandeler
2023-09-20 13:23:41 +02:00
parent 4b29b43a2a
commit 1a64a179aa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/project.cpp
View File

@@ -1500,8 +1500,10 @@ void ProjectExplorerPlugin::testProject_multipleBuildConfigs()
QVERIFY(tempDir->isValid()); QVERIFY(tempDir->isValid());
const FilePath projectDir = FilePath::fromString(tempDir->path() + "/generic-project"); const FilePath projectDir = FilePath::fromString(tempDir->path() + "/generic-project");
const auto copyResult = FilePath(":/projectexplorer/testdata/generic-project").copyRecursively(projectDir); const auto copyResult = FilePath(":/projectexplorer/testdata/generic-project").copyRecursively(projectDir);
if (!copyResult)
qDebug() << copyResult.error();
QVERIFY(copyResult);
QVERIFY2(copyResult, qPrintable(copyResult.error()));
const QFileInfoList files = QDir(projectDir.toString()).entryInfoList(QDir::Files | QDir::Dirs); const QFileInfoList files = QDir(projectDir.toString()).entryInfoList(QDir::Files | QDir::Dirs);
for (const QFileInfo &f : files) for (const QFileInfo &f : files)
QFile(f.absoluteFilePath()).setPermissions(f.permissions() | QFile::WriteUser); QFile(f.absoluteFilePath()).setPermissions(f.permissions() | QFile::WriteUser);
@@ -1562,7 +1564,9 @@ void ProjectExplorerPlugin::testSourceToBinaryMapping()
if (!projectDir.exists()) { if (!projectDir.exists()) {
const auto result = FilePath(":/projectexplorer/testdata/multi-target-project") const auto result = FilePath(":/projectexplorer/testdata/multi-target-project")
.copyRecursively(projectDir); .copyRecursively(projectDir);
QVERIFY2(result, qPrintable(result.error())); if (!result)
qDebug() << result.error();
QVERIFY(result);
const QFileInfoList files = QDir(projectDir.toString()).entryInfoList(QDir::Files); const QFileInfoList files = QDir(projectDir.toString()).entryInfoList(QDir::Files);
for (const QFileInfo &f : files) for (const QFileInfo &f : files)
QFile(f.absoluteFilePath()).setPermissions(f.permissions() | QFile::WriteUser); QFile(f.absoluteFilePath()).setPermissions(f.permissions() | QFile::WriteUser);