diff options
author | Geir Storli <geirst@oath.com> | 2017-11-21 14:18:58 +0000 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2017-11-22 12:09:09 +0000 |
commit | b4f4418cee4f6fca48c1148cab8dac65ca74d8d9 (patch) | |
tree | f8e06a22657205cb1c35a763afe996b6f33ec578 /documentapi/src/tests | |
parent | dc7744b33f8266b3dcd92c74650d842d1f13947a (diff) |
Add named bucket space to GetBucketListMessage.
Diffstat (limited to 'documentapi/src/tests')
-rw-r--r-- | documentapi/src/tests/messagebus/messagebus_test.cpp | 9 | ||||
-rw-r--r-- | documentapi/src/tests/messages/messages50test.cpp | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp index fc4295278da..077ea52e255 100644 --- a/documentapi/src/tests/messagebus/messagebus_test.cpp +++ b/documentapi/src/tests/messagebus/messagebus_test.cpp @@ -1,12 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include <vespa/document/base/testdocrepo.h> -#include <vespa/document/fieldvalue/document.h> #include <vespa/document/datatype/documenttype.h> -#include <vespa/document/test/make_document_bucket.h> +#include <vespa/document/fieldvalue/document.h> #include <vespa/documentapi/documentapi.h> +#include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/documentapi/loadtypes/loadtypeset.h> using document::DocumentTypeRepo; using document::readDocumenttypesConfig; @@ -14,7 +14,6 @@ using namespace documentapi; using mbus::Blob; using mbus::Routable; using mbus::IRoutingPolicy; -using document::test::makeDocumentBucket; class Test : public vespalib::TestApp { DocumentTypeRepo::SP _repo; @@ -115,6 +114,6 @@ void Test::stat_bucket_message_is_not_sequenced() { } void Test::get_bucket_list_message_is_not_sequenced() { - GetBucketListMessage message(makeDocumentBucket(document::BucketId(16, 1))); + GetBucketListMessage message(document::BucketId(16, 1)); EXPECT_FALSE(message.hasSequenceId()); } diff --git a/documentapi/src/tests/messages/messages50test.cpp b/documentapi/src/tests/messages/messages50test.cpp index a3627522562..b50f30c1f91 100644 --- a/documentapi/src/tests/messages/messages50test.cpp +++ b/documentapi/src/tests/messages/messages50test.cpp @@ -1,17 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "messages50test.h" -#include <vespa/documentapi/documentapi.h> -#include <vespa/vdslib/container/writabledocumentlist.h> -#include <vespa/document/update/fieldpathupdates.h> -#include <vespa/document/datatype/documenttype.h> #include <vespa/document/bucket/bucketidfactory.h> +#include <vespa/document/datatype/documenttype.h> #include <vespa/document/select/parser.h> -#include <vespa/document/test/make_document_bucket.h> +#include <vespa/document/update/fieldpathupdates.h> +#include <vespa/documentapi/documentapi.h> +#include <vespa/vdslib/container/writabledocumentlist.h> using document::DataType; using document::DocumentTypeRepo; -using document::test::makeDocumentBucket; /////////////////////////////////////////////////////////////////////////////// // @@ -90,7 +88,7 @@ createDoc(const DocumentTypeRepo &repo, const string &type_name, const string &i bool Messages50Test::testGetBucketListMessage() { - GetBucketListMessage msg(makeDocumentBucket(document::BucketId(16, 123))); + GetBucketListMessage msg(document::BucketId(16, 123)); msg.setLoadType(_loadTypes["foo"]); EXPECT_EQUAL(string("foo"), msg.getLoadType().getName()); EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 12u, serialize("GetBucketListMessage", msg)); @@ -100,7 +98,7 @@ Messages50Test::testGetBucketListMessage() if (EXPECT_TRUE(obj.get() != NULL)) { GetBucketListMessage &ref = static_cast<GetBucketListMessage&>(*obj); EXPECT_EQUAL(string("foo"), ref.getLoadType().getName()); - EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucket().getBucketId()); + EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucketId()); } } return true; |