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

Unit: Fix unit-tests

Browse Source 
Since we now destinguish FunctionDefinitionCompletionKind from
FunctionCompletionKind use the proper enum in some tests.

Change-Id: Ia3a47c4632ce4d2a1e42de87289dd08d4cac6ef7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-08-08 12:47:06 +02:00
parent 19b0d837e5
commit 44b931f7f5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/unittest/clangcodemodelserver-test.cpp
View File

@@ -603,7 +603,7 @@ void ClangCodeModelServer::expectCompletionFromFileAUnsavedMethodVersion1()
{ {
const CodeCompletion completion(Utf8StringLiteral("Method2"), const CodeCompletion completion(Utf8StringLiteral("Method2"),
34, 34,
CodeCompletion::FunctionCompletionKind); CodeCompletion::FunctionDefinitionCompletionKind);
expectCompletion(completion); expectCompletion(completion);
} }
@@ -612,7 +612,7 @@ void ClangCodeModelServer::expectCompletionFromFileAUnsavedMethodVersion2()
{ {
const CodeCompletion completion(Utf8StringLiteral("Method3"), const CodeCompletion completion(Utf8StringLiteral("Method3"),
34, 34,
CodeCompletion::FunctionCompletionKind); CodeCompletion::FunctionDefinitionCompletionKind);
expectCompletion(completion); expectCompletion(completion);
} }

14
tests/unit/unittest/codecompletionsextractor-test.cpp
View File

@@ -461,7 +461,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, Method)
completeResults.data()); completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method"), ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method"),
CodeCompletion::FunctionCompletionKind, CodeCompletion::FunctionDefinitionCompletionKind,
CodeCompletion::Available)); CodeCompletion::Available));
ASSERT_FALSE(extractor.currentCodeCompletion().hasParameters); ASSERT_FALSE(extractor.currentCodeCompletion().hasParameters);
} }
@@ -475,7 +475,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, MethodWithParameters)
completeResults.data()); completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("MethodWithParameters"), ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("MethodWithParameters"),
CodeCompletion::FunctionCompletionKind, CodeCompletion::FunctionDefinitionCompletionKind,
CodeCompletion::Available)); CodeCompletion::Available));
ASSERT_TRUE(extractor.currentCodeCompletion().hasParameters); ASSERT_TRUE(extractor.currentCodeCompletion().hasParameters);
} }
@@ -580,7 +580,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, DeprecatedFunction)
completeResults.data()); completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("DeprecatedFunction"), ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("DeprecatedFunction"),
CodeCompletion::FunctionCompletionKind, CodeCompletion::FunctionDefinitionCompletionKind,
CodeCompletion::Deprecated)); CodeCompletion::Deprecated));
} }
@@ -593,7 +593,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, NotAccessibleFunction)
completeResults.data()); completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAccessibleFunction"), ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAccessibleFunction"),
CodeCompletion::FunctionCompletionKind, CodeCompletion::FunctionDefinitionCompletionKind,
CodeCompletion::NotAccessible)); CodeCompletion::NotAccessible));
} }
@@ -606,7 +606,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, NotAvailableFunction)
completeResults.data()); completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAvailableFunction"), ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAvailableFunction"),
CodeCompletion::FunctionCompletionKind, CodeCompletion::FunctionDefinitionCompletionKind,
CodeCompletion::NotAvailable)); CodeCompletion::NotAvailable));
} }
@@ -622,7 +622,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, UnsavedFile)
completeResults.data()); completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method2"), ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method2"),
CodeCompletion::FunctionCompletionKind, CodeCompletion::FunctionDefinitionCompletionKind,
CodeCompletion::Available)); CodeCompletion::Available));
} }
@@ -641,7 +641,7 @@ TEST_F(CodeCompletionsExtractorSlowTest, ChangeUnsavedFile)
completeResults.data()); completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method3"), ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method3"),
CodeCompletion::FunctionCompletionKind, CodeCompletion::FunctionDefinitionCompletionKind,
CodeCompletion::Available)); CodeCompletion::Available));
} }