summaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/persistenceengine
diff options
context:
space:
mode:
authorGeir Storli <geirst@oath.com>2017-10-06 11:16:03 +0000
committerGeir Storli <geirst@oath.com>2017-10-06 11:16:03 +0000
commit8c4d49f36f0c9c85076f2b2d3e74580610f6e550 (patch)
treeb333d4de98733a62cbeae69a27214b19aa7c8d57 /searchcore/src/tests/proton/persistenceengine
parentbb999bf3807c6f46c22ad5725ba7e3f590489744 (diff)
Use storage::spi::test::makeBucketSpace() in tests when creating bucket space.
Diffstat (limited to 'searchcore/src/tests/proton/persistenceengine')
-rw-r--r--searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
index 4422c67c5bd..76204b60e4e 100644
--- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
+++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
@@ -1,16 +1,18 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/document/repo/documenttyperepo.h>
+
+#include <vespa/config-stor-distribution.h>
#include <vespa/document/datatype/documenttype.h>
+#include <vespa/document/fieldset/fieldsets.h>
+#include <vespa/document/repo/documenttyperepo.h>
#include <vespa/persistence/spi/documentselection.h>
#include <vespa/persistence/spi/test.h>
+#include <vespa/persistence/spi/test.h>
#include <vespa/searchcore/proton/persistenceengine/bucket_guard.h>
#include <vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h>
#include <vespa/searchcore/proton/persistenceengine/persistenceengine.h>
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/document/fieldset/fieldsets.h>
#include <vespa/vdslib/distribution/distribution.h>
#include <vespa/vdslib/state/clusterstate.h>
-#include <vespa/config-stor-distribution.h>
+#include <vespa/vespalib/testkit/testapp.h>
#include <set>
using document::BucketId;
@@ -24,13 +26,13 @@ using storage::spi::BucketChecksum;
using storage::spi::BucketIdListResult;
using storage::spi::BucketInfo;
using storage::spi::BucketInfoResult;
-using storage::spi::Context;
using storage::spi::ClusterState;
+using storage::spi::Context;
using storage::spi::CreateIteratorResult;
using storage::spi::DocumentSelection;
using storage::spi::GetResult;
-using storage::spi::IteratorId;
using storage::spi::IterateResult;
+using storage::spi::IteratorId;
using storage::spi::PartitionId;
using storage::spi::RemoveResult;
using storage::spi::Result;
@@ -433,8 +435,8 @@ struct SimpleFixture {
engine(_owner, _writeFilter, -1, false),
hset()
{
- engine.putHandler(BucketSpace::placeHolder(), DocTypeName(doc1->getType()), hset.phandler1);
- engine.putHandler(BucketSpace::placeHolder(), DocTypeName(doc2->getType()), hset.phandler2);
+ engine.putHandler(makeBucketSpace(), DocTypeName(doc1->getType()), hset.phandler1);
+ engine.putHandler(makeBucketSpace(), DocTypeName(doc2->getType()), hset.phandler2);
}
};