diff options
Diffstat (limited to 'storage/src/tests/common')
-rw-r--r-- | storage/src/tests/common/CMakeLists.txt | 1 | ||||
-rw-r--r-- | storage/src/tests/common/make_document_bucket.cpp | 16 | ||||
-rw-r--r-- | storage/src/tests/common/make_document_bucket.h | 13 | ||||
-rw-r--r-- | storage/src/tests/common/storagelinktest.cpp | 4 |
4 files changed, 2 insertions, 32 deletions
diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt index dc322c345e3..c7243e68146 100644 --- a/storage/src/tests/common/CMakeLists.txt +++ b/storage/src/tests/common/CMakeLists.txt @@ -3,7 +3,6 @@ vespa_add_library(storage_testcommon TEST SOURCES dummystoragelink.cpp testhelper.cpp - make_document_bucket.cpp metricstest.cpp storagelinktest.cpp testnodestateupdater.cpp diff --git a/storage/src/tests/common/make_document_bucket.cpp b/storage/src/tests/common/make_document_bucket.cpp deleted file mode 100644 index cef33c515ee..00000000000 --- a/storage/src/tests/common/make_document_bucket.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include "make_document_bucket.h" - -using document::Bucket; -using document::BucketId; -using document::BucketSpace; - -namespace storage::test { - -Bucket makeDocumentBucket(BucketId bucketId) -{ - return Bucket(BucketSpace::placeHolder(), bucketId); -} - -} diff --git a/storage/src/tests/common/make_document_bucket.h b/storage/src/tests/common/make_document_bucket.h deleted file mode 100644 index a95bc501c65..00000000000 --- a/storage/src/tests/common/make_document_bucket.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#pragma once - -#include <vespa/document/bucket/bucket.h> - -namespace storage::test { - -// Helper function used by unit tests - -document::Bucket makeDocumentBucket(document::BucketId bucketId); - -} diff --git a/storage/src/tests/common/storagelinktest.cpp b/storage/src/tests/common/storagelinktest.cpp index 0490581d7ff..95fe8ad23da 100644 --- a/storage/src/tests/common/storagelinktest.cpp +++ b/storage/src/tests/common/storagelinktest.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 <tests/common/storagelinktest.h> -#include <tests/common/make_document_bucket.h> +#include <vespa/document/test/make_document_bucket.h> #include <iostream> #include <string> #include <vespa/storageapi/message/stat.h> -using storage::test::makeDocumentBucket; +using document::test::makeDocumentBucket; namespace storage { |