diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-08-23 15:10:36 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-08-23 15:10:36 +0200 |
| commit | 55e5a91901109161186e05d3a6e959e06958bbba (patch) | |
| tree | f312bab2c60207ee305dbcfa047fcc4fa8fd2dc1 /document/src/tests/testxml.cpp | |
| parent | d337a29392fb752dc725e4aea5efa0cc0df5f17a (diff) | |
Aressem/cmake more out of source tests (#441)
* vespalib tests run out of source.
* staging_vespalib run tests out of source.
* fastos tests run out of source.
* Fixed storage tests out of source.
* Fixed some of the config tests.
* config* tests run out of source.
* document_* tests run out of source.
* documentapi_ tests run out of source.
* Fixed fsa out of source tests.
* Fix jrt_test out of source.
* More tests run out of source.
* Fix some slobrok and messagebus tests.
* More fixes for out of source tests.
* Done with first pass of regular tests out of source.
* Only use SOURCE_DIRECTORY in a limited set of places.
* Fix some remaining tests.
* Some cleanups.
* No need for extra slash.
Diffstat (limited to 'document/src/tests/testxml.cpp')
| -rw-r--r-- | document/src/tests/testxml.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/document/src/tests/testxml.cpp b/document/src/tests/testxml.cpp index 7729c748b3f..90849060598 100644 --- a/document/src/tests/testxml.cpp +++ b/document/src/tests/testxml.cpp @@ -16,6 +16,7 @@ #include <vespa/document/update/removevalueupdate.h> #include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/vespalib/text/stringtokenizer.h> +#include <vespa/vespalib/testkit/testapp.h> using vespalib::StringTokenizer; @@ -97,7 +98,8 @@ createTestDocumentUpdate(const DocumentTypeRepo& repo) void TestXml::testSimpleUsage() { - DocumentTypeRepo repo(readDocumenttypesConfig("data/defaultdoctypes.cfg")); + DocumentTypeRepo repo(readDocumenttypesConfig( + vespalib::TestApp::GetSourceDirectory() + "data/defaultdoctypes.cfg")); Document::UP doc1(createTestDocument(repo)); doc1->setValue(doc1->getField("stringattr"), StringFieldValue("tjohei���")); @@ -126,7 +128,8 @@ void TestXml::testSimpleUsage() void TestXml::testDocumentUpdate() { - DocumentTypeRepo repo(readDocumenttypesConfig("data/defaultdoctypes.cfg")); + DocumentTypeRepo repo(readDocumenttypesConfig( + vespalib::TestApp::GetSourceDirectory() + "data/defaultdoctypes.cfg")); DocumentUpdate::UP up1(createTestDocumentUpdate(repo)); std::string expected = |