diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-18 06:21:31 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-19 14:15:46 +0000 |
commit | 7b3546f050fa2420bb6dc5222f078d2401cdef62 (patch) | |
tree | dded9791b21a4286b930e1556e84e88476c9b6a7 /documentapi/src/tests/policies | |
parent | 561d81f41cf3ac93990c4d13743c97aff932f1c0 (diff) |
Only include what you need
Diffstat (limited to 'documentapi/src/tests/policies')
-rw-r--r-- | documentapi/src/tests/policies/policies_test.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 3baad5b0562..ea82c43a596 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -23,6 +23,7 @@ #include <vespa/messagebus/routing/routingcontext.h> #include <vespa/messagebus/testlib/testserver.h> #include <vespa/vdslib/container/mutabledocumentlist.h> +#include <vespa/vdslib/state/clusterstate.h> #include <vespa/vespalib/testkit/testapp.h> #include "testframe.h" #include <vespa/log/log.h> @@ -34,7 +35,7 @@ using document::DocumentId; using document::DocumentTypeRepo; using document::DocumentUpdate; using document::readDocumenttypesConfig; -using slobrok::api::MirrorAPI; +using slobrok::api::IMirrorAPI; using namespace documentapi; class Test : public vespalib::TestApp { @@ -53,8 +54,8 @@ private: StoragePolicy &setupStoragePolicy(TestFrame &frame, const string ¶m, const string &pattern = "", int32_t numEntries = -1); bool isErrorPolicy(const string &name, const string ¶m); - void assertMirrorReady(const slobrok::api::MirrorAPI &mirror); - void assertMirrorContains(const slobrok::api::MirrorAPI &mirror, const string &pattern, + void assertMirrorReady(const IMirrorAPI &mirror); + void assertMirrorContains(const IMirrorAPI &mirror, const string &pattern, uint32_t numEntries); mbus::Message::UP newPutDocumentMessage(const string &documentId); @@ -286,7 +287,7 @@ Test::setupExternPolicy(TestFrame &frame, mbus::Slobrok &slobrok, const string & } void -Test::assertMirrorReady(const slobrok::api::MirrorAPI &mirror) +Test::assertMirrorReady(const slobrok::api::IMirrorAPI &mirror) { for (uint32_t i = 0; i < 6000; ++i) { if (mirror.ready()) { @@ -298,7 +299,7 @@ Test::assertMirrorReady(const slobrok::api::MirrorAPI &mirror) } void -Test::assertMirrorContains(const slobrok::api::MirrorAPI &mirror, const string &pattern, +Test::assertMirrorContains(const slobrok::api::IMirrorAPI &mirror, const string &pattern, uint32_t numEntries) { for (uint32_t i = 0; i < 6000; ++i) { @@ -927,10 +928,10 @@ namespace { void Test::testLoadBalancer() { LoadBalancer lb("foo", ""); - MirrorAPI::SpecList entries; - entries.push_back(MirrorAPI::Spec("foo/0/default", "tcp/bar:1")); - entries.push_back(MirrorAPI::Spec("foo/1/default", "tcp/bar:2")); - entries.push_back(MirrorAPI::Spec("foo/2/default", "tcp/bar:3")); + IMirrorAPI::SpecList entries; + entries.push_back(IMirrorAPI::Spec("foo/0/default", "tcp/bar:1")); + entries.push_back(IMirrorAPI::Spec("foo/1/default", "tcp/bar:2")); + entries.push_back(IMirrorAPI::Spec("foo/2/default", "tcp/bar:3")); const std::vector<LoadBalancer::NodeInfo>& nodeInfo = lb.getNodeInfo(); |