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

Designer/CppTools: Fix flaky test_gotoslot_withoutProject

Browse Source 
The document was not always updated in time.

Change-Id: Iac89985d39a8784e3cbf63dfd42b1c5150775068
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-11-13 14:31:50 +01:00
parent 8a1eed2c56
commit 36ce1dbb84
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,7 +461,7 @@ CppEditorSupport *CppModelManager::cppEditorSupport(TextEditor::BaseTextEditor *
QMutexLocker locker(&m_cppEditorSupportsMutex);
CppEditorSupport *editorSupport = m_cppEditorSupports.value(textEditor, 0);
if (!editorSupport) {
if (!editorSupport && isCppEditor(textEditor)) {
editorSupport = new CppEditorSupport(this, textEditor);
m_cppEditorSupports.insert(textEditor, editorSupport);
}

5
src/plugins/cpptools/cpptoolseditorsupport.cpp
View File

@@ -308,6 +308,11 @@ void CppEditorSupport::updateDocumentNow()
}
}
bool CppEditorSupport::isUpdatingDocument()
{
return m_updateDocumentTimer->isActive() || m_documentParser.isRunning();
}
void CppEditorSupport::onDocumentUpdated(Document::Ptr doc)
{
if (doc.isNull())

3
src/plugins/cpptools/cpptoolseditorsupport.h
View File

@@ -125,6 +125,9 @@ public:
QSharedPointer<SnapshotUpdater> snapshotUpdater();
/// Checks whether the document is (re)parsed or about to be (re)parsed.
bool isUpdatingDocument();
signals:
void documentUpdated();
void diagnosticsChanged();

24
src/plugins/designer/gotoslot_test.cpp
View File

@@ -37,6 +37,7 @@
#include <coreplugin/testdatadir.h>
#include <coreplugin/editormanager/editormanager.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolseditorsupport.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/Overview.h>
@@ -91,8 +92,13 @@ public:
const QString functionName = QLatin1String("on_pushButton_clicked");
const QString qualifiedFunctionName = QLatin1String("Form::") + functionName;
foreach (const QString &file, files)
QVERIFY(EditorManager::openEditor(file));
QList<TextEditor::BaseTextEditor *> editors;
foreach (const QString &file, files) {
IEditor *editor = EditorManager::openEditor(file);
TextEditor::BaseTextEditor *e = qobject_cast<TextEditor::BaseTextEditor *>(editor);
QVERIFY(e);
editors << e;
}
QCOMPARE(EditorManager::documentModel()->openedDocuments().size(), files.size());
while (!m_modelManager->snapshot().contains(cppFile)
|| !m_modelManager->snapshot().contains(hFile)) {
@@ -114,15 +120,21 @@ public:
QVERIFY(integration);
integration->emitNavigateToSlot(QLatin1String("pushButton"), QLatin1String("clicked()"),
QStringList());
QApplication::processEvents();
// Checks after
m_modelManager->updateSourceFiles(QStringList() << cppFile << hFile).waitForFinished();
QCOMPARE(EditorManager::currentDocument()->filePath(), cppFile);
QVERIFY(EditorManager::currentDocument()->isModified());
// Wait for updated documents
foreach (TextEditor::BaseTextEditor *editor, editors) {
if (CppEditorSupport *editorSupport = m_modelManager->cppEditorSupport(editor)) {
while (editorSupport->isUpdatingDocument())
QApplication::processEvents();
}
}
// Checks after
Document::Ptr cppDocumentAfter = m_modelManager->snapshot().document(cppFile);
QCOMPARE(cppDocumentAfter->globalSymbolCount(), 3U);
QVERIFY(containsSymbol(cppDocumentAfter->globalNamespace(), qualifiedFunctionName));