diff options
Diffstat (limited to 'storage/src/tests/distributor')
5 files changed, 8 insertions, 8 deletions
diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp index 41f811a77a6..66c8969acc3 100644 --- a/storage/src/tests/distributor/getoperationtest.cpp +++ b/storage/src/tests/distributor/getoperationtest.cpp @@ -3,6 +3,7 @@ #include <tests/distributor/distributor_stripe_test_util.h> #include <vespa/config/helper/configgetter.h> #include <vespa/config/helper/configgetter.hpp> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/fieldset/fieldsets.h> #include <vespa/document/repo/documenttyperepo.h> @@ -20,7 +21,6 @@ using std::shared_ptr; using config::ConfigGetter; -using document::DocumenttypesConfig; using config::FileSpec; using document::test::makeDocumentBucket; using document::BucketId; diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp index dca54e22f0d..2d41b0f4d32 100644 --- a/storage/src/tests/distributor/operationtargetresolvertest.cpp +++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp @@ -34,7 +34,7 @@ struct OperationTargetResolverTest : Test, DistributorStripeTestUtil { void SetUp() override { _repo.reset(new document::DocumentTypeRepo( - *config::ConfigGetter<document::DocumenttypesConfig>::getConfig( + *config::ConfigGetter<DocumenttypesConfig>::getConfig( "config-doctypes", config::FileSpec("../config-doctypes.cfg")))); _html_type = _repo->getDocumentType("text/html"); diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp index 6ad67ab91c2..017207d0b56 100644 --- a/storage/src/tests/distributor/putoperationtest.cpp +++ b/storage/src/tests/distributor/putoperationtest.cpp @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <tests/distributor/distributor_stripe_test_util.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_document_bucket.h> #include <vespa/storage/distributor/top_level_distributor.h> @@ -15,7 +16,6 @@ using std::shared_ptr; using config::ConfigGetter; -using document::DocumenttypesConfig; using config::FileSpec; using vespalib::string; using namespace document; diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp index 9b229198043..c1aece58183 100644 --- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp +++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp @@ -3,6 +3,7 @@ #include <tests/distributor/distributor_stripe_test_util.h> #include <vespa/config/helper/configgetter.h> #include <vespa/document/base/testdocrepo.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/fieldset/fieldsets.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_document_bucket.h> @@ -19,7 +20,6 @@ namespace storage::distributor { using document::test::makeDocumentBucket; using config::ConfigGetter; -using document::DocumenttypesConfig; using namespace document; using namespace storage; using namespace storage::distributor; diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp index db974e2202c..f0cb30368cb 100644 --- a/storage/src/tests/distributor/updateoperationtest.cpp +++ b/storage/src/tests/distributor/updateoperationtest.cpp @@ -14,15 +14,15 @@ #include <vespa/storageapi/message/state.h> #include <vespa/vespalib/gtest/gtest.h> +using config::ConfigGetter; +using config::FileSpec; +using vespalib::string; +using document::test::makeDocumentBucket; using namespace document; using namespace storage::api; using namespace std; using namespace storage::lib; using namespace ::testing; -using config::ConfigGetter; -using config::FileSpec; -using vespalib::string; -using document::test::makeDocumentBucket; namespace storage::distributor { |