diff options
author | Tor Egge <Tor.Egge@oath.com> | 2017-11-13 11:14:29 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2017-11-13 13:14:46 +0000 |
commit | 61a4023b39195912d642ad5256f30730c5567feb (patch) | |
tree | 555f02ae217ed1411944d48966c504c861169419 /storage/src/tests/distributor | |
parent | 372b70b09f7abba1aafe4931b44f01d7f9415d4a (diff) |
Partially change BucketDBUpdater to use document::Bucket instead of
document::BucketId.
Diffstat (limited to 'storage/src/tests/distributor')
-rw-r--r-- | storage/src/tests/distributor/bucketdbupdatertest.cpp | 12 | ||||
-rw-r--r-- | storage/src/tests/distributor/distributortest.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp index 03a51cf6180..9f931c3f5c0 100644 --- a/storage/src/tests/distributor/bucketdbupdatertest.cpp +++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp @@ -880,7 +880,7 @@ BucketDBUpdaterTest::testInitializingWhileRecheck() CPPUNIT_ASSERT_EQUAL(size_t(2), _sender.commands.size()); CPPUNIT_ASSERT_EQUAL(size_t(0), _senderDown.commands.size()); - getBucketDBUpdater().recheckBucketInfo(1, document::BucketId(16, 3)); + getBucketDBUpdater().recheckBucketInfo(1, makeDocumentBucket(document::BucketId(16, 3))); for (int i=0; i<2; i++) { fakeBucketReply(systemState, @@ -1010,7 +1010,7 @@ BucketDBUpdaterTest::testRecheckNodeWithFailure() _sender.clear(); - getBucketDBUpdater().recheckBucketInfo(1, document::BucketId(16, 3)); + getBucketDBUpdater().recheckBucketInfo(1, makeDocumentBucket(document::BucketId(16, 3))); CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size()); @@ -1060,7 +1060,7 @@ BucketDBUpdaterTest::testRecheckNode() _sender.clear(); - getBucketDBUpdater().recheckBucketInfo(1, document::BucketId(16, 3)); + getBucketDBUpdater().recheckBucketInfo(1, makeDocumentBucket(document::BucketId(16, 3))); CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size()); @@ -1954,7 +1954,7 @@ BucketDBUpdaterTest::testNoDbResurrectionForBucketNotOwnedInCurrentState() } _sender.clear(); - getBucketDBUpdater().recheckBucketInfo(0, bucket); + getBucketDBUpdater().recheckBucketInfo(0, makeDocumentBucket(bucket)); CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size()); std::shared_ptr<api::RequestBucketInfoCommand> rbi( @@ -1986,7 +1986,7 @@ BucketDBUpdaterTest::testNoDbResurrectionForBucketNotOwnedInPendingState() } _sender.clear(); - getBucketDBUpdater().recheckBucketInfo(0, bucket); + getBucketDBUpdater().recheckBucketInfo(0, makeDocumentBucket(bucket)); CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size()); std::shared_ptr<api::RequestBucketInfoCommand> rbi( @@ -1999,7 +1999,7 @@ BucketDBUpdaterTest::testNoDbResurrectionForBucketNotOwnedInPendingState() CPPUNIT_ASSERT(getBucketDBUpdater().getDistributorComponent() .ownsBucketInCurrentState(makeDocumentBucket(bucket))); CPPUNIT_ASSERT(!getBucketDBUpdater() - .checkOwnershipInPendingState(bucket).isOwned()); + .checkOwnershipInPendingState(makeDocumentBucket(bucket)).isOwned()); sendFakeReplyForSingleBucketRequest(*rbi); diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp index cbc78157911..1640af0f871 100644 --- a/storage/src/tests/distributor/distributortest.cpp +++ b/storage/src/tests/distributor/distributortest.cpp @@ -556,7 +556,7 @@ Distributor_Test::testNoDbResurrectionForBucketNotOwnedInPendingState() document::BucketId nonOwnedBucket(16, 3); CPPUNIT_ASSERT(!getBucketDBUpdater() - .checkOwnershipInPendingState(nonOwnedBucket).isOwned()); + .checkOwnershipInPendingState(makeDocumentBucket(nonOwnedBucket)).isOwned()); CPPUNIT_ASSERT(!getBucketDBUpdater().getDistributorComponent() .checkOwnershipInPendingAndCurrentState(makeDocumentBucket(nonOwnedBucket)) .isOwned()); |