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

CppTools: Fix flaky test_cpplocatorfilters_CppLocatorFilter

Browse Source 
The GenericProjectManager tests left over some state in CppModelManager.

Change-Id: I3f5c5bf27b9443e6753eb6c24114e2e5b99e7372
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-12-10 11:05:52 +01:00
committed by Erik Verbruggen
parent b94b7b3ee6
commit cb3c7538be
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cpplocatorfilter_test.cpp
View File

@@ -153,6 +153,8 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter()
QFETCH(QString, searchText);
QFETCH(ResultDataList, expectedResults);
Tests::VerifyCleanCppModelManager verify;
CppLocatorFilterTestCase(filter, testFile, searchText, expectedResults);
}

2
src/plugins/cpptools/cppmodelmanager_test.cpp
View File

@@ -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());

4
src/plugins/cpptools/cpptoolstestcase.h
View File

@@ -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(); }

6
src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
View File

@@ -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");