diff options
Diffstat (limited to 'storage')
8 files changed, 13 insertions, 13 deletions
diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp index 7e34c14a495..f6baffb304d 100644 --- a/storage/src/tests/bucketdb/bucketmanagertest.cpp +++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp @@ -195,7 +195,7 @@ void BucketManagerTest::setupTestEnvironment(bool fakePersistenceLayer, DocumentTypeRepo::SP repo(new DocumentTypeRepo( *ConfigGetter<DocumenttypesConfig>::getConfig( - "config-doctypes", FileSpec(vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg")))); + "config-doctypes", FileSpec(TEST_PATH("config-doctypes.cfg"))))); _top.reset(new DummyStorageLink); _node.reset(new TestServiceLayerApp( DiskCount(2), NodeIndex(0), config.getConfigId())); diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp index a530b918b77..acab4ef1b28 100644 --- a/storage/src/tests/common/testhelper.cpp +++ b/storage/src/tests/common/testhelper.cpp @@ -4,7 +4,7 @@ #include <vespa/log/log.h> #include <vespa/vespalib/io/fileutil.h> -#include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> LOG_SETUP(".testhelper"); @@ -160,7 +160,7 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) { config->set("maxconcurrentvisitors_fixed", "4"); config->set("maxconcurrentvisitors_variable", "0"); config = &dc.addConfig("stor-visitordispatcher"); - addFileConfig(dc, "documenttypes", vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg"); + addFileConfig(dc, "documenttypes", TEST_PATH("config-doctypes.cfg")); addStorageDistributionConfig(dc); return dc; } diff --git a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp index 8cbe2045fd2..3084cb1d389 100644 --- a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp +++ b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp @@ -7,7 +7,7 @@ #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/jsonstream.h> -#include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> #include <tests/common/hostreporter/util.h> namespace storage { @@ -187,7 +187,7 @@ DistributorHostInfoReporterTest::generateExampleJson() std::string jsonString = json.str(); - std::string path = vespalib::TestApp::GetSourceDirectory() + "../../../protocols/getnodestate/distributor.json"; + std::string path = TEST_PATH("../../../protocols/getnodestate/distributor.json"); std::string goldenString = File::readAll(path); vespalib::slime::Memory goldenMemory(goldenString); diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp index 169fdc1c213..d9013ca2c22 100644 --- a/storage/src/tests/distributor/getoperationtest.cpp +++ b/storage/src/tests/distributor/getoperationtest.cpp @@ -56,7 +56,7 @@ public: _repo.reset( new document::DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig>:: getConfig("config-doctypes", - FileSpec(vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg")))); + FileSpec(TEST_PATH("config-doctypes.cfg"))))); createLinks(); docId = document::DocumentId(document::DocIdString("test", "uri")); diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp index 27f1cb722b0..3b62bd20299 100644 --- a/storage/src/tests/distributor/operationtargetresolvertest.cpp +++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp @@ -51,7 +51,7 @@ struct OperationTargetResolverTest : public CppUnit::TestFixture, _repo.reset(new document::DocumentTypeRepo( *config::ConfigGetter<document::DocumenttypesConfig>::getConfig( "config-doctypes", - config::FileSpec(vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg")))); + config::FileSpec(TEST_PATH("config-doctypes.cfg"))))); _html_type = _repo->getDocumentType("text/html"); createLinks(); }; diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp index d2dc7583229..da99ca9e019 100644 --- a/storage/src/tests/distributor/putoperationtest.cpp +++ b/storage/src/tests/distributor/putoperationtest.cpp @@ -12,7 +12,7 @@ #include <tests/common/dummystoragelink.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/vespalib/text/stringtokenizer.h> -#include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> #include <iomanip> #include <iostream> #include <memory> @@ -95,7 +95,7 @@ public: _repo.reset( new DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig> ::getConfig("config-doctypes", - FileSpec(vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg")))); + FileSpec(TEST_PATH("config-doctypes.cfg"))))); _html_type = _repo->getDocumentType("text/html"); createLinks(); }; diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp index 9a2b529eb77..d0b4bf39db6 100644 --- a/storage/src/tests/distributor/updateoperationtest.cpp +++ b/storage/src/tests/distributor/updateoperationtest.cpp @@ -13,7 +13,7 @@ #include <vespa/document/config/config-documenttypes.h> #include <tests/distributor/messagesenderstub.h> #include <vespa/storage/distributor/operations/external/updateoperation.h> -#include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> using std::shared_ptr; using namespace document; @@ -50,7 +50,7 @@ public: _repo.reset( new DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig>:: getConfig("config-doctypes", - FileSpec(vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg")))); + FileSpec(TEST_PATH("config-doctypes.cfg"))))); _html_type = _repo->getDocumentType("text/html"); createLinks(); } diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index 604e849ebe8..15e8cda23b4 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -15,7 +15,7 @@ #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/visitor.h> #include <vespa/vdslib/container/writabledocumentlist.h> -#include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> using document::DataType; using document::DocIdString; @@ -34,7 +34,7 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture DocumentApiConverterTest() : _repo(new DocumentTypeRepo(readDocumenttypesConfig( - vespalib::TestApp::GetSourceDirectory() + "config-doctypes.cfg"))), + TEST_PATH("config-doctypes.cfg")))), _html_type(*_repo->getDocumentType("text/html")) { } |