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

Clang: Fix tests without any ASSERTs

Browse Source 
Change-Id: I3148cb85271ab021832caa5bd09dedb6aeeef49f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-01-08 16:12:41 +01:00
parent 747818291d
commit 5f8ac59ef8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/clangbackend/source/clangjobrequest.cpp
View File

@@ -153,7 +153,7 @@ static JobRequest::RunConditions conditionsForType(JobRequest::Type type)
Conditions conditions = Conditions(Condition::DocumentUnsuspended) Conditions conditions = Conditions(Condition::DocumentUnsuspended)
| Conditions(Condition::DocumentVisible); | Conditions(Condition::DocumentVisible);
if (type == Type::RequestReferences) if (type == Type::RequestReferences || type == Type::FollowSymbol)
conditions |= Condition::CurrentDocumentRevision; conditions |= Condition::CurrentDocumentRevision;
if (type != Type::UpdateDocumentAnnotations && type != Type::ParseSupportiveTranslationUnit) if (type != Type::UpdateDocumentAnnotations && type != Type::ParseSupportiveTranslationUnit)

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

@@ -204,7 +204,9 @@ TEST_F(ClangCodeModelServerSlowTest, RequestReferencesTakesRevisionFromMessage)
requestReferences(/*documentRevision=*/ 99); requestReferences(/*documentRevision=*/ 99);
JobRequests &queue = documentProcessorForFile(filePathC).queue(); JobRequests &queue = documentProcessorForFile(filePathC).queue();
Utils::anyOf(queue, [](const JobRequest &request) { return request.documentRevision == 99; }); ASSERT_TRUE(Utils::anyOf(queue, [](const JobRequest &request) {
return request.documentRevision == 99;
}));
queue.clear(); // Avoid blocking queue.clear(); // Avoid blocking
} }
@@ -223,7 +225,9 @@ TEST_F(ClangCodeModelServerSlowTest, RequestFollowSymbolTakesRevisionFromMessage
requestFollowSymbol(/*documentRevision=*/ 99); requestFollowSymbol(/*documentRevision=*/ 99);
JobRequests &queue = documentProcessorForFile(filePathC).queue(); JobRequests &queue = documentProcessorForFile(filePathC).queue();
Utils::anyOf(queue, [](const JobRequest &request) { return request.documentRevision == 99; }); ASSERT_TRUE(Utils::anyOf(queue, [](const JobRequest &request) {
return request.documentRevision == 99;
}));
queue.clear(); // Avoid blocking queue.clear(); // Avoid blocking
} }