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

ProjectExplorer: Fix test

Browse Source 
As of 36dca9eb8c, .pro files have mime type
"text/prolog".

Change-Id: Id6a39b1ddb83e48caafce993bd0c46a06fc82052
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2024-09-30 10:41:49 +02:00
parent e47832d483
commit a80195603e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/projectmanager.cpp
View File

@@ -27,6 +27,7 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/mimeutils.h>
#include <utils/persistentsettings.h> #include <utils/persistentsettings.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
@@ -786,10 +787,15 @@ void ProjectExplorerTest::testSessionSwitch()
const OpenProjectResult openResult const OpenProjectResult openResult
= ProjectExplorerPlugin::openProject( = ProjectExplorerPlugin::openProject(
FilePath::fromString(sessionSpec.projectFile.fileName())); FilePath::fromString(sessionSpec.projectFile.fileName()));
if (openResult.errorMessage().contains("text/plain")) if (!ProjectManager::canOpenProjectForMimeType(
QSKIP("This test requires the presence of QmakeProjectManager to be fully functional. " Utils::mimeTypeForFile(sessionSpec.projectFile.fileName()))) {
"Hint: run this test with \"-load QmakeProjectManager\" option."); QEXPECT_FAIL(
QVERIFY(openResult); nullptr,
"This test requires the presence of QmakeProjectManager to be fully functional. "
"Hint: run this test with \"-load QmakeProjectManager\" option.",
Abort);
}
QVERIFY2(openResult, qPrintable(openResult.errorMessage()));
QCOMPARE(openResult.projects().count(), 1); QCOMPARE(openResult.projects().count(), 1);
QVERIFY(openResult.project()); QVERIFY(openResult.project());
QCOMPARE(ProjectManager::projects().count(), 1); QCOMPARE(ProjectManager::projects().count(), 1);