diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2017-10-23 22:11:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 22:11:15 +0200 |
| commit | cb7e6e776512be898c73505dc7d6b65ca9ea5d1b (patch) | |
| tree | 1ded1bb660b6200b2c624228038a248696ce6c79 /storage/src/tests/distributor/visitoroperationtest.cpp | |
| parent | 6679ccc72890b11073703624720c2b0292250e93 (diff) | |
Revert "Revert "Use existing bucket space instead of placeholder value""
Diffstat (limited to 'storage/src/tests/distributor/visitoroperationtest.cpp')
| -rw-r--r-- | storage/src/tests/distributor/visitoroperationtest.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp index c8f339f6626..f12e1fa4e33 100644 --- a/storage/src/tests/distributor/visitoroperationtest.cpp +++ b/storage/src/tests/distributor/visitoroperationtest.cpp @@ -13,11 +13,13 @@ #include <vespa/storage/distributor/distributor.h> #include <tests/common/dummystoragelink.h> #include <vespa/vdstestlib/cppunit/macros.h> +#include <vespa/document/test/make_bucket_space.h> using namespace document; using namespace storage::api; using namespace storage::lib; using namespace std::string_literals; +using document::test::makeBucketSpace; namespace storage { namespace distributor { @@ -148,7 +150,7 @@ private: const std::string& docSelection = "") { api::CreateVisitorCommand::SP cmd( - new api::CreateVisitorCommand(libraryName, instanceId, docSelection)); + new api::CreateVisitorCommand(makeBucketSpace(), libraryName, instanceId, docSelection)); cmd->setControlDestination("controldestination"); cmd->setDataDestination("datadestination"); cmd->setFieldSet("[header]"); @@ -265,7 +267,8 @@ VisitorOperationTest::doStandardVisitTest(const std::string& clusterState) vespalib::string libraryName("dumpvisitor"); vespalib::string docSelection(""); api::CreateVisitorCommand::SP msg( - new api::CreateVisitorCommand(libraryName, + new api::CreateVisitorCommand(makeBucketSpace(), + libraryName, instanceId, docSelection)); vespalib::string controlDestination("controldestination"); @@ -333,7 +336,8 @@ VisitorOperationTest::testShutdown() vespalib::string libraryName("dumpvisitor"); vespalib::string docSelection(""); api::CreateVisitorCommand::SP msg( - new api::CreateVisitorCommand(libraryName, + new api::CreateVisitorCommand(makeBucketSpace(), + libraryName, instanceId, docSelection)); msg->addBucketToBeVisited(id); @@ -361,7 +365,7 @@ VisitorOperationTest::testNoBucket() // Send create visitor api::CreateVisitorCommand::SP msg(new api::CreateVisitorCommand( - "dumpvisitor", "instance", "")); + makeBucketSpace(), "dumpvisitor", "instance", "")); CPPUNIT_ASSERT_EQUAL(std::string( "CreateVisitorReply(last=BucketId(0x0000000000000000)) " @@ -377,7 +381,7 @@ VisitorOperationTest::testOnlySuperBucketAndProgressAllowed() // Send create visitor api::CreateVisitorCommand::SP msg(new api::CreateVisitorCommand( - "dumpvisitor", "instance", "")); + makeBucketSpace(), "dumpvisitor", "instance", "")); msg->addBucketToBeVisited(nullId); msg->addBucketToBeVisited(nullId); msg->addBucketToBeVisited(nullId); |