1 files changed, 11 insertions, 17 deletions
diff --git a/storage/src/tests/persistence/splitbitdetectortest.cpp b/storage/src/tests/persistence/splitbitdetectortest.cpp
index 60f76c2df60..30904e3da3d 100644
--- a/storage/src/tests/persistence/splitbitdetectortest.cpp
+++ b/storage/src/tests/persistence/splitbitdetectortest.cpp
@@ -5,10 +5,12 @@
 #include <vespa/storage/persistence/splitbitdetector.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
+#include <vespa/persistence/spi/test.h>
 #include <vespa/document/base/testdocman.h>
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <algorithm>
 
+using storage::spi::test::makeBucket;
 
 namespace storage {
 
@@ -61,8 +63,7 @@ SplitBitDetectorTest::testTwoUsers()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
 
@@ -95,8 +96,7 @@ SplitBitDetectorTest::testSingleUser()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
 
@@ -123,8 +123,7 @@ SplitBitDetectorTest::testMaxBits()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
     int minContentSize = 1, maxContentSize = 1;
@@ -153,7 +152,7 @@ SplitBitDetectorTest::testMaxBitsOneBelowMax()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(15, 1), spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(15, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
     int minContentSize = 1, maxContentSize = 1;
@@ -191,8 +190,7 @@ SplitBitDetectorTest::testUnsplittable()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
 
@@ -220,8 +218,7 @@ SplitBitDetectorTest::testUnsplittableMinCount()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
 
@@ -251,8 +248,7 @@ SplitBitDetectorTest::testEmpty()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
 
@@ -271,8 +267,7 @@ SplitBitDetectorTest::testZeroDocLimitFallbacksToOneBitIncreaseWith1Doc()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));
 
@@ -295,8 +290,7 @@ SplitBitDetectorTest::testZeroDocLimitFallbacksToOneBitIncreaseOnGidCollision()
     document::TestDocMan testDocMan;
     spi::dummy::DummyPersistence provider(testDocMan.getTypeRepoSP(), 1);
     provider.getPartitionStates();
-    spi::Bucket bucket(document::BucketId(1, 1),
-                       spi::PartitionId(0));
+    spi::Bucket bucket(makeBucket(document::BucketId(1, 1)));
     spi::Context context(defaultLoadType, spi::Priority(0),
                          spi::Trace::TraceLevel(0));