aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2018-01-08 16:12:41 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2018-01-08 15:21:23 +0000
commit5f8ac59ef8c4577e14063bd41f80103fe4fac7bc (patch)
treecfe6c721df8097a3b648729823aaa7bfc432e8bd
parent747818291d001d5ea0afdeb5839ec52a748fe047 (diff)
Clang: Fix tests without any ASSERTs
Change-Id: I3148cb85271ab021832caa5bd09dedb6aeeef49f Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
-rw-r--r--src/tools/clangbackend/source/clangjobrequest.cpp2
-rw-r--r--tests/unit/unittest/clangcodemodelserver-test.cpp8
2 files changed, 7 insertions, 3 deletions
diff --git a/src/tools/clangbackend/source/clangjobrequest.cpp b/src/tools/clangbackend/source/clangjobrequest.cpp
index 93017fc9569..b40ea424257 100644
--- a/src/tools/clangbackend/source/clangjobrequest.cpp
+++ b/src/tools/clangbackend/source/clangjobrequest.cpp
@@ -153,7 +153,7 @@ static JobRequest::RunConditions conditionsForType(JobRequest::Type type)
Conditions conditions = Conditions(Condition::DocumentUnsuspended)
| Conditions(Condition::DocumentVisible);
- if (type == Type::RequestReferences)
+ if (type == Type::RequestReferences || type == Type::FollowSymbol)
conditions |= Condition::CurrentDocumentRevision;
if (type != Type::UpdateDocumentAnnotations && type != Type::ParseSupportiveTranslationUnit)
diff --git a/tests/unit/unittest/clangcodemodelserver-test.cpp b/tests/unit/unittest/clangcodemodelserver-test.cpp
index 1b2c95c8a1b..36efb1597a8 100644
--- a/tests/unit/unittest/clangcodemodelserver-test.cpp
+++ b/tests/unit/unittest/clangcodemodelserver-test.cpp
@@ -204,7 +204,9 @@ TEST_F(ClangCodeModelServerSlowTest, RequestReferencesTakesRevisionFromMessage)
requestReferences(/*documentRevision=*/ 99);
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
}
@@ -223,7 +225,9 @@ TEST_F(ClangCodeModelServerSlowTest, RequestFollowSymbolTakesRevisionFromMessage
requestFollowSymbol(/*documentRevision=*/ 99);
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
}