diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-25 14:29:52 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-25 14:29:52 +0000 |
commit | a14c13d4407dd355e1f972fb82bf6de0c55cc421 (patch) | |
tree | d8fc4f59f23e474881d0691ca2234c7e7fc952fa /storage | |
parent | 0ec1dddb0e75c235edfc68d72f4471ad186c3399 (diff) |
Don't require gmock library linkage
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/tests/distributor/CMakeLists.txt | 1 | ||||
-rw-r--r-- | storage/src/tests/distributor/statecheckerstest.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt index cf6feca26aa..3148540d86d 100644 --- a/storage/src/tests/distributor/CMakeLists.txt +++ b/storage/src/tests/distributor/CMakeLists.txt @@ -50,7 +50,6 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST storage_testhostreporter storage_distributor gtest - gmock ) vespa_add_test( diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp index eb0902f6dd2..7282d2e7d2a 100644 --- a/storage/src/tests/distributor/statecheckerstest.cpp +++ b/storage/src/tests/distributor/statecheckerstest.cpp @@ -1445,7 +1445,10 @@ TEST_F(StateCheckersTest, context_populates_ideal_state_containers) { StateChecker::Context c(getExternalOperationHandler(), getDistributorBucketSpace(), statsTracker, makeDocumentBucket({17, 0})); ASSERT_THAT(c.idealState, ElementsAre(1, 3)); - ASSERT_THAT(c.unorderedIdealState, UnorderedElementsAre(1, 3)); + // TODO replace with UnorderedElementsAre once we can build gmock without issues + std::vector<uint16_t> ideal_state(c.unorderedIdealState.begin(), c.unorderedIdealState.end()); + std::sort(ideal_state.begin(), ideal_state.end()); + ASSERT_THAT(ideal_state, ElementsAre(1, 3)); } namespace { |