diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2014-12-10 11:05:52 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2014-12-19 10:25:03 +0100 |
| commit | cb3c7538be3f5ddb26f48b5dfce23bd3ea6daacc (patch) | |
| tree | 900cc57cb18a68ae0a844cfc210781a8c6ec9997 /src/plugins | |
| parent | b94b7b3ee6cbec6df86ebb959d788b9b09933c7e (diff) | |
| download | qt-creator-cb3c7538be3f5ddb26f48b5dfce23bd3ea6daacc.tar.gz | |
CppTools: Fix flaky test_cpplocatorfilters_CppLocatorFilter
The GenericProjectManager tests left over some state in CppModelManager.
Change-Id: I3f5c5bf27b9443e6753eb6c24114e2e5b99e7372
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins')
4 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp index 14ec713d69..292ed257af 100644 --- a/src/plugins/cpptools/cpplocatorfilter_test.cpp +++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp @@ -153,6 +153,8 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter() QFETCH(QString, searchText); QFETCH(ResultDataList, expectedResults); + Tests::VerifyCleanCppModelManager verify; + CppLocatorFilterTestCase(filter, testFile, searchText, expectedResults); } diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 2f176dd433..8258dcf710 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -628,7 +628,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() QVERIFY(temporaryDir.isValid()); const QString projectFile = temporaryDir.absolutePath("testdata_guiproject1.pro"); - ProjectOpenerAndCloser projects(/*waitForFinishedGcOnDestruction=*/ true); + ProjectOpenerAndCloser projects; ProjectInfo projectInfo = projects.open(projectFile, /*configureAsExampleProject=*/ true); QVERIFY(projectInfo.isValid()); diff --git a/src/plugins/cpptools/cpptoolstestcase.h b/src/plugins/cpptools/cpptoolstestcase.h index 458e62b5cf..bbe4629858 100644 --- a/src/plugins/cpptools/cpptoolstestcase.h +++ b/src/plugins/cpptools/cpptoolstestcase.h @@ -111,7 +111,7 @@ class CPPTOOLS_EXPORT ProjectOpenerAndCloser : public QObject Q_OBJECT public: - ProjectOpenerAndCloser(bool waitForFinishedGcOnDestruction = false); + ProjectOpenerAndCloser(bool waitForFinishedGcOnDestruction = true); ~ProjectOpenerAndCloser(); // Closes opened projects ProjectInfo open(const QString &projectFile, bool configureAsExampleProject = false); @@ -138,7 +138,7 @@ private: bool m_isValid; }; -class VerifyCleanCppModelManager +class CPPTOOLS_EXPORT VerifyCleanCppModelManager { public: VerifyCleanCppModelManager() { verify(); } diff --git a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp index 600c7d2909..1a74608f9e 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp @@ -60,6 +60,8 @@ inline QString sourceProjectPath(const QString &project) void GenericProjectPlugin::test_simple() { + Tests::VerifyCleanCppModelManager verify; + TemporaryCopiedDir temporaryDir(sourceProjectPath(_("testdata_simpleproject"))); QVERIFY(temporaryDir.isValid()); const QString mainFile = temporaryDir.absolutePath("main.cpp"); @@ -93,6 +95,8 @@ static QStringList simplify(const QList<CppTools::ProjectFile> &files, const QSt void GenericProjectPlugin::test_mixed1() { + Tests::VerifyCleanCppModelManager verify; + TemporaryCopiedDir temporaryDir(sourceProjectPath(_("testdata_mixedproject1/"))); QVERIFY(temporaryDir.isValid()); const QString projectFile = temporaryDir.absolutePath("mixedproject1.creator"); @@ -140,6 +144,8 @@ void GenericProjectPlugin::test_mixed1() void GenericProjectPlugin::test_mixed2() { + Tests::VerifyCleanCppModelManager verify; + TemporaryCopiedDir temporaryDir(sourceProjectPath(_("testdata_mixedproject2/"))); QVERIFY(temporaryDir.isValid()); const QString projectFile = temporaryDir.absolutePath("mixedproject2.creator"); |