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

CppTools: Fix test_modelmanager_extraeditorsupport_uiFiles

Browse Source 
The test was broken since the QmakeProject was changed to work
asynchronously.

FAIL!  : CppTools::Internal::CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() Compared values are not the same
   Actual   (workingCopy.size()): 1
   Expected (2)                 : 2

Change-Id: I6f7d05fb70af3def5fc371a9783b606309686e32
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-12-09 17:09:45 +01:00
committed by Erik Verbruggen
parent ef403a4515
commit b94b7b3ee6
7 changed files with 78 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,15 +106,21 @@ private:
bool m_runGarbageCollector;
};
class CPPTOOLS_EXPORT ProjectOpenerAndCloser
class CPPTOOLS_EXPORT ProjectOpenerAndCloser : public QObject
{
Q_OBJECT
public:
ProjectOpenerAndCloser();
ProjectOpenerAndCloser(bool waitForFinishedGcOnDestruction = false);
~ProjectOpenerAndCloser(); // Closes opened projects
ProjectInfo open(const QString &projectFile);
ProjectInfo open(const QString &projectFile, bool configureAsExampleProject = false);
private:
void onGcFinished();
bool m_waitForFinishedGcOnDestruction;
bool m_gcFinished;
QList<ProjectExplorer::Project *> m_openProjects;
};
@@ -132,6 +138,14 @@ private:
bool m_isValid;
};
class VerifyCleanCppModelManager
{
public:
VerifyCleanCppModelManager() { verify(); }
~VerifyCleanCppModelManager() { verify(); }
static void verify();
};
class FileWriterAndRemover
{
public: