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

Clang: Rename ModelManagerSupportClang::instance to instance_forTestsOnly

Browse Source 
To make it clear that it is for testing only.

Change-Id: If257b0049e87c834b24073991f173bfc1b3e93e7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2015-07-06 11:15:12 +02:00
parent 9d5c85a635
commit 5c74f34ebf
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -50,7 +50,7 @@
using namespace ClangCodeModel; using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal; using namespace ClangCodeModel::Internal;
static ModelManagerSupportClang *m_instance = 0; static ModelManagerSupportClang *m_instance_forTestsOnly = 0;
static CppTools::CppModelManager *cppModelManager() static CppTools::CppModelManager *cppModelManager()
{ {
@@ -60,8 +60,8 @@ static CppTools::CppModelManager *cppModelManager()
ModelManagerSupportClang::ModelManagerSupportClang() ModelManagerSupportClang::ModelManagerSupportClang()
: m_completionAssistProvider(m_ipcCommunicator) : m_completionAssistProvider(m_ipcCommunicator)
{ {
QTC_CHECK(!m_instance); QTC_CHECK(!m_instance_forTestsOnly);
m_instance = this; m_instance_forTestsOnly = this;
Core::EditorManager *editorManager = Core::EditorManager::instance(); Core::EditorManager *editorManager = Core::EditorManager::instance();
connect(editorManager, &Core::EditorManager::currentEditorChanged, connect(editorManager, &Core::EditorManager::currentEditorChanged,
@@ -78,7 +78,7 @@ ModelManagerSupportClang::ModelManagerSupportClang()
ModelManagerSupportClang::~ModelManagerSupportClang() ModelManagerSupportClang::~ModelManagerSupportClang()
{ {
m_instance = 0; m_instance_forTestsOnly = 0;
} }
CppTools::CppCompletionAssistProvider *ModelManagerSupportClang::completionAssistProvider() CppTools::CppCompletionAssistProvider *ModelManagerSupportClang::completionAssistProvider()
@@ -176,10 +176,12 @@ void ModelManagerSupportClang::onProjectPartsRemoved(const QStringList &projectF
m_ipcCommunicator.unregisterProjectPartsForCodeCompletion(projectFiles); m_ipcCommunicator.unregisterProjectPartsForCodeCompletion(projectFiles);
} }
ModelManagerSupportClang *ModelManagerSupportClang::instance() #ifdef QT_TESTLIB_LIB
ModelManagerSupportClang *ModelManagerSupportClang::instance_forTestsOnly()
{ {
return m_instance; return m_instance_forTestsOnly;
} }
#endif
IpcCommunicator &ModelManagerSupportClang::ipcCommunicator() IpcCommunicator &ModelManagerSupportClang::ipcCommunicator()
{ {

5
src/plugins/clangcodemodel/clangmodelmanagersupport.h
View File

@@ -60,8 +60,9 @@ public:
IpcCommunicator &ipcCommunicator(); IpcCommunicator &ipcCommunicator();
public: // for tests #ifdef QT_TESTLIB_LIB
static ModelManagerSupportClang *instance(); static ModelManagerSupportClang *instance_forTestsOnly();
#endif
private: private:
void onEditorOpened(Core::IEditor *editor); void onEditorOpened(Core::IEditor *editor);

8
src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
View File

@@ -241,12 +241,14 @@ class ChangeIpcSender
public: public:
ChangeIpcSender(IpcSenderInterface *ipcSender) ChangeIpcSender(IpcSenderInterface *ipcSender)
{ {
m_previousSender = ModelManagerSupportClang::instance()->ipcCommunicator().setIpcSender(ipcSender); auto &ipc = ModelManagerSupportClang::instance_forTestsOnly()->ipcCommunicator();
m_previousSender = ipc.setIpcSender(ipcSender);
} }
~ChangeIpcSender() ~ChangeIpcSender()
{ {
ModelManagerSupportClang::instance()->ipcCommunicator().setIpcSender(m_previousSender); auto &ipc = ModelManagerSupportClang::instance_forTestsOnly()->ipcCommunicator();
ipc.setIpcSender(m_previousSender);
} }
private: private:
@@ -940,7 +942,7 @@ void ClangCodeCompletionTest::testUpdateBackendAfterRestart()
spy.senderLog.clear(); spy.senderLog.clear();
// Kill backend process... // Kill backend process...
IpcCommunicator &ipcCommunicator = ModelManagerSupportClang::instance()->ipcCommunicator(); auto &ipcCommunicator = ModelManagerSupportClang::instance_forTestsOnly()->ipcCommunicator();
ipcCommunicator.killBackendProcess(); ipcCommunicator.killBackendProcess();
QSignalSpy waitForReinitializedBackend(&ipcCommunicator, QSignalSpy waitForReinitializedBackend(&ipcCommunicator,
SIGNAL(backendReinitialized())); SIGNAL(backendReinitialized()));