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

Clang: Move completion test

Browse Source 
Change-Id: I61cd72c131407415732ed1231a4614be57c1454b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-06-12 12:20:32 +02:00
parent 706da24733
commit cd6bd3c4d8
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/unit/unittest/clangcompletecodejob-test.cpp
View File

@@ -30,6 +30,8 @@
using namespace ClangBackEnd; using namespace ClangBackEnd;
using testing::_; using testing::_;
using testing::Eq;
using testing::Property;
namespace { namespace {
@@ -70,6 +72,21 @@ TEST_F(CompleteCodeJob, SendAnnotations)
ASSERT_TRUE(waitUntilJobFinished(job)); ASSERT_TRUE(waitUntilJobFinished(job));
} }
TEST_F(CompleteCodeJob, ForwardTicketNumber)
{
jobRequest.ticketNumber = static_cast<quint64>(99);
jobContextWithMockClient = JobContext(jobRequest, &documents, &unsavedFiles, &mockIpcClient);
job.setContext(jobContextWithMockClient);
job.prepareAsyncRun();
EXPECT_CALL(mockIpcClient,
codeCompleted(Property(&CodeCompletedMessage::ticketNumber, Eq(99))))
.Times(1);
job.runAsync();
ASSERT_TRUE(waitUntilJobFinished(job));
}
TEST_F(CompleteCodeJob, DontSendCompletionsIfDocumentWasClosed) TEST_F(CompleteCodeJob, DontSendCompletionsIfDocumentWasClosed)
{ {
job.setContext(jobContextWithMockClient); job.setContext(jobContextWithMockClient);

18
tests/unit/unittest/clangipcserver-test.cpp
View File

@@ -142,7 +142,6 @@ protected:
void expectCompletionFromFileBEnabledByMacro(); void expectCompletionFromFileBEnabledByMacro();
void expectCompletionFromFileAUnsavedMethodVersion1(); void expectCompletionFromFileAUnsavedMethodVersion1();
void expectCompletionFromFileAUnsavedMethodVersion2(); void expectCompletionFromFileAUnsavedMethodVersion2();
void expectCompletionWithTicketNumber(quint64 ticketNumber);
void expectNoCompletionWithUnsavedMethod(); void expectNoCompletionWithUnsavedMethod();
void expectDocumentAnnotationsChangedForFileBWithSpecificHighlightingMark(); void expectDocumentAnnotationsChangedForFileBWithSpecificHighlightingMark();
@@ -260,15 +259,6 @@ TEST_F(ClangCodeModelServerSlowTest, GetNewCodeCompletionAfterUpdatingUnsavedFil
completeCodeInFileA(); completeCodeInFileA();
} }
TEST_F(ClangCodeModelServerSlowTest, TicketNumberIsForwarded)
{
registerProjectAndFile(filePathA, 1);
const CompleteCodeMessage message(filePathA, 20, 1, projectPartId);
expectCompletionWithTicketNumber(message.ticketNumber());
clangServer.completeCode(message);
}
TEST_F(ClangCodeModelServerSlowTest, TranslationUnitAfterCreationIsNotDirty) TEST_F(ClangCodeModelServerSlowTest, TranslationUnitAfterCreationIsNotDirty)
{ {
registerProjectAndFile(filePathA, 1); registerProjectAndFile(filePathA, 1);
@@ -510,14 +500,6 @@ void ClangCodeModelServer::expectCompletionFromFileAUnsavedMethodVersion2()
expectCompletion(completion); expectCompletion(completion);
} }
void ClangCodeModelServer::expectCompletionWithTicketNumber(quint64 ticketNumber)
{
EXPECT_CALL(mockClangCodeModelClient,
codeCompleted(Property(&CodeCompletedMessage::ticketNumber,
Eq(ticketNumber))))
.Times(1);
}
void ClangCodeModelServer::expectNoCompletionWithUnsavedMethod() void ClangCodeModelServer::expectNoCompletionWithUnsavedMethod()
{ {
const CodeCompletion completion(Utf8StringLiteral("Method2"), const CodeCompletion completion(Utf8StringLiteral("Method2"),