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

ClangCodeModel: Fix libclang tests

Browse Source 
We must make sure clangd doesn't get in the way.

Change-Id: Ica053cce6928920b39602c7c467b5d16f8232fe6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-02-17 16:12:02 +01:00
parent f87c25acb5
commit 5866f78049
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,10 +35,12 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <cppeditor/cppcodemodelsettings.h>
#include <cppeditor/cpptoolsreuse.h> #include <cppeditor/cpptoolsreuse.h>
#include <cppeditor/cpptoolstestcase.h> #include <cppeditor/cpptoolstestcase.h>
#include <cppeditor/modelmanagertesthelper.h> #include <cppeditor/modelmanagertesthelper.h>
#include <cppeditor/projectinfo.h> #include <cppeditor/projectinfo.h>
#include <languageclient/languageclientmanager.h>
#include <texteditor/codeassist/assistproposalitem.h> #include <texteditor/codeassist/assistproposalitem.h>
#include <texteditor/codeassist/genericproposalmodel.h> #include <texteditor/codeassist/genericproposalmodel.h>
#include <texteditor/textdocument.h> #include <texteditor/textdocument.h>
@@ -514,6 +516,13 @@ namespace ClangCodeModel {
namespace Internal { namespace Internal {
namespace Tests { namespace Tests {
void ClangCodeCompletionTest::initTestCase()
{
CppEditor::ClangdSettings::setUseClangd(false);
for (LanguageClient::Client * const c : LanguageClient::LanguageClientManager::clients())
LanguageClient::LanguageClientManager::shutdownClient(c);
}
void ClangCodeCompletionTest::testCompleteDoxygenKeywords() void ClangCodeCompletionTest::testCompleteDoxygenKeywords()
{ {
ProjectLessCompletionTest t("doxygenKeywordsCompletion.cpp"); ProjectLessCompletionTest t("doxygenKeywordsCompletion.cpp");

2
src/plugins/clangcodemodel/test/clangcodecompletion_test.h
View File

@@ -38,6 +38,8 @@ class ClangCodeCompletionTest : public QObject
Q_OBJECT Q_OBJECT
private slots: private slots:
void initTestCase();
void testCompleteDoxygenKeywords(); void testCompleteDoxygenKeywords();
void testCompletePreprocessorKeywords(); void testCompletePreprocessorKeywords();
void testCompleteIncludeDirective(); void testCompleteIncludeDirective();