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

CppEditor: Fix completion tests

Browse Source 
Amends 2c91d4b472.

Change-Id: I6c4e8bc359acd2cd413fe86c1217ccce5321fa1e
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Christian Kandeler
2024-01-24 13:54:36 +01:00
parent 32d31b6eea
commit 1cc1d98601
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/cppcompletion_test.cpp
View File

@@ -63,10 +63,6 @@ public:
m_editor = EditorManager::openEditor(filePath); m_editor = EditorManager::openEditor(filePath);
QVERIFY(m_editor); QVERIFY(m_editor);
TextEditor::BaseTextEditor *cppEditor = qobject_cast<TextEditor::BaseTextEditor *>(m_editor);
QVERIFY(cppEditor);
QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
closeEditorAtEndOfTestCase(m_editor); closeEditorAtEndOfTestCase(m_editor);
m_editorWidget = TextEditorWidget::fromEditor(m_editor); m_editorWidget = TextEditorWidget::fromEditor(m_editor);
QVERIFY(m_editorWidget); QVERIFY(m_editorWidget);
@@ -145,6 +141,19 @@ public:
m_position += text.length(); m_position += text.length();
} }
bool waitForSyntaxHighlighting()
{
TextEditor::BaseTextEditor *cppEditor = qobject_cast<TextEditor::BaseTextEditor *>(m_editor);
if (!cppEditor)
return false;
if (cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated())
return true;
return ::CppEditor::Tests::waitForSignalOrTimeout(
cppEditor->textDocument()->syntaxHighlighterRunner(),
&BaseSyntaxHighlighterRunner::highlightingFinished,
5000);
}
private: private:
QByteArray m_source; QByteArray m_source;
int m_position = -1; int m_position = -1;
@@ -410,6 +419,7 @@ void CompletionTest::testDoxygenTagCompletion()
CompletionTestCase test(code, prefix); CompletionTestCase test(code, prefix);
QVERIFY(test.succeededSoFar()); QVERIFY(test.succeededSoFar());
QVERIFY(test.waitForSyntaxHighlighting());
const QStringList completions = test.getCompletions(); const QStringList completions = test.getCompletions();
QVERIFY(isDoxygenTagCompletion(completions)); QVERIFY(isDoxygenTagCompletion(completions));
} }