1 files changed, 8 insertions, 5 deletions
diff --git a/documentapi/src/tests/messages/messages50test.cpp b/documentapi/src/tests/messages/messages50test.cpp
index 964e4e12288..f25e3f19b08 100644
--- a/documentapi/src/tests/messages/messages50test.cpp
+++ b/documentapi/src/tests/messages/messages50test.cpp
@@ -7,9 +7,12 @@
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/document/select/parser.h>
+#include <vespa/document/test/make_document_bucket.h>
 
 using document::DataType;
 using document::DocumentTypeRepo;
+using document::test::makeDocumentBucket;
+using document::BucketSpace;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -88,7 +91,7 @@ createDoc(const DocumentTypeRepo &repo, const string &type_name, const string &i
 bool
 Messages50Test::testGetBucketListMessage()
 {
-    GetBucketListMessage msg(document::BucketId(16, 123));
+    GetBucketListMessage msg(makeDocumentBucket(document::BucketId(16, 123)));
     msg.setLoadType(_loadTypes["foo"]);
     EXPECT_EQUAL(string("foo"), msg.getLoadType().getName());
     EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 12u, serialize("GetBucketListMessage", msg));
@@ -98,7 +101,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.getBucketId());
+            EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucket().getBucketId());
         }
     }
     return true;
@@ -132,7 +135,7 @@ Messages50Test::testEmptyBucketsMessage()
 bool
 Messages50Test::testStatBucketMessage()
 {
-    StatBucketMessage msg(document::BucketId(16, 123), "id.user=123");
+    StatBucketMessage msg(makeDocumentBucket(document::BucketId(16, 123)), "id.user=123");
 
     EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 27u, serialize("StatBucketMessage", msg));
 
@@ -140,7 +143,7 @@ Messages50Test::testStatBucketMessage()
         mbus::Routable::UP obj = deserialize("StatBucketMessage", DocumentProtocol::MESSAGE_STATBUCKET, lang);
         if (EXPECT_TRUE(obj.get() != NULL)) {
             StatBucketMessage &ref = static_cast<StatBucketMessage&>(*obj);
-            EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucketId());
+            EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucket().getBucketId());
             EXPECT_EQUAL("id.user=123", ref.getDocumentSelection());
         }
     }
@@ -1110,7 +1113,7 @@ Messages50Test::testWrongDistributionReply()
 bool
 Messages50Test::testGetBucketListReply()
 {
-    GetBucketListReply reply;
+    GetBucketListReply reply(BucketSpace::placeHolder());
     reply.getBuckets().push_back(GetBucketListReply::BucketInfo(document::BucketId(16, 123), "foo"));
     reply.getBuckets().push_back(GetBucketListReply::BucketInfo(document::BucketId(17, 1123), "bar"));
     reply.getBuckets().push_back(GetBucketListReply::BucketInfo(document::BucketId(18, 11123), "zoink"));