From 44b931f7f5bfc1ccdfb456300f13297d88397298 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Wed, 8 Aug 2018 12:47:06 +0200 Subject: [PATCH] Unit: Fix unit-tests Since we now destinguish FunctionDefinitionCompletionKind from FunctionCompletionKind use the proper enum in some tests. Change-Id: Ia3a47c4632ce4d2a1e42de87289dd08d4cac6ef7 Reviewed-by: Marco Bubke --- tests/unit/unittest/clangcodemodelserver-test.cpp | 4 ++-- .../unittest/codecompletionsextractor-test.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/unit/unittest/clangcodemodelserver-test.cpp b/tests/unit/unittest/clangcodemodelserver-test.cpp index bde56e21608..9a1cc8c7b46 100644 --- a/tests/unit/unittest/clangcodemodelserver-test.cpp +++ b/tests/unit/unittest/clangcodemodelserver-test.cpp @@ -603,7 +603,7 @@ void ClangCodeModelServer::expectCompletionFromFileAUnsavedMethodVersion1() { const CodeCompletion completion(Utf8StringLiteral("Method2"), 34, - CodeCompletion::FunctionCompletionKind); + CodeCompletion::FunctionDefinitionCompletionKind); expectCompletion(completion); } @@ -612,7 +612,7 @@ void ClangCodeModelServer::expectCompletionFromFileAUnsavedMethodVersion2() { const CodeCompletion completion(Utf8StringLiteral("Method3"), 34, - CodeCompletion::FunctionCompletionKind); + CodeCompletion::FunctionDefinitionCompletionKind); expectCompletion(completion); } diff --git a/tests/unit/unittest/codecompletionsextractor-test.cpp b/tests/unit/unittest/codecompletionsextractor-test.cpp index 308582dd41f..0facfadecb9 100644 --- a/tests/unit/unittest/codecompletionsextractor-test.cpp +++ b/tests/unit/unittest/codecompletionsextractor-test.cpp @@ -461,7 +461,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, Method) completeResults.data()); ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method"), - CodeCompletion::FunctionCompletionKind, + CodeCompletion::FunctionDefinitionCompletionKind, CodeCompletion::Available)); ASSERT_FALSE(extractor.currentCodeCompletion().hasParameters); } @@ -475,7 +475,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, MethodWithParameters) completeResults.data()); ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("MethodWithParameters"), - CodeCompletion::FunctionCompletionKind, + CodeCompletion::FunctionDefinitionCompletionKind, CodeCompletion::Available)); ASSERT_TRUE(extractor.currentCodeCompletion().hasParameters); } @@ -580,7 +580,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, DeprecatedFunction) completeResults.data()); ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("DeprecatedFunction"), - CodeCompletion::FunctionCompletionKind, + CodeCompletion::FunctionDefinitionCompletionKind, CodeCompletion::Deprecated)); } @@ -593,7 +593,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, NotAccessibleFunction) completeResults.data()); ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAccessibleFunction"), - CodeCompletion::FunctionCompletionKind, + CodeCompletion::FunctionDefinitionCompletionKind, CodeCompletion::NotAccessible)); } @@ -606,7 +606,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, NotAvailableFunction) completeResults.data()); ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAvailableFunction"), - CodeCompletion::FunctionCompletionKind, + CodeCompletion::FunctionDefinitionCompletionKind, CodeCompletion::NotAvailable)); } @@ -622,7 +622,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, UnsavedFile) completeResults.data()); ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method2"), - CodeCompletion::FunctionCompletionKind, + CodeCompletion::FunctionDefinitionCompletionKind, CodeCompletion::Available)); } @@ -641,7 +641,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, ChangeUnsavedFile) completeResults.data()); ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method3"), - CodeCompletion::FunctionCompletionKind, + CodeCompletion::FunctionDefinitionCompletionKind, CodeCompletion::Available)); }