summaryrefslogtreecommitdiffstats
path: root/documentapi
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2016-11-02 23:26:40 +0100
committerArnstein Ressem <aressem@gmail.com>2016-11-02 23:26:40 +0100
commit99480b4d72abf3688060d7643816680a30963f74 (patch)
tree966d8494bca9292e6be2877d91ed838953856f0f /documentapi
parent3d18773cf5357250cb2d35d6e8c13477db6e20a3 (diff)
Removed TestApp::GetSourceDirectory
Diffstat (limited to 'documentapi')
-rw-r--r--documentapi/src/tests/messagebus/messagebus_test.cpp2
-rw-r--r--documentapi/src/tests/messages/error_codes_test.cpp2
-rw-r--r--documentapi/src/tests/messages/testbase.cpp4
-rw-r--r--documentapi/src/tests/policies/policies_test.cpp2
-rw-r--r--documentapi/src/tests/priority/priority.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp
index 924325d117a..caa2bb84d46 100644
--- a/documentapi/src/tests/messagebus/messagebus_test.cpp
+++ b/documentapi/src/tests/messagebus/messagebus_test.cpp
@@ -37,7 +37,7 @@ Test::Main()
{
TEST_INIT(_argv[0]);
_repo.reset(new DocumentTypeRepo(readDocumenttypesConfig(
- GetSourceDirectory() + "../../../test/cfg/testdoctypes.cfg")));
+ TEST_PATH("../../../test/cfg/testdoctypes.cfg"))));
testMessage(); TEST_FLUSH();
testProtocol(); TEST_FLUSH();
diff --git a/documentapi/src/tests/messages/error_codes_test.cpp b/documentapi/src/tests/messages/error_codes_test.cpp
index e9ad68f441e..57c97956d0d 100644
--- a/documentapi/src/tests/messages/error_codes_test.cpp
+++ b/documentapi/src/tests/messages/error_codes_test.cpp
@@ -99,7 +99,7 @@ std::string to_sorted_key_value_string(const NamedErrorCodes& codes) {
std::string
ErrorCodesTest::path_prefixed(const std::string& file_name) const {
- return GetSourceDirectory() + "../../../test/crosslanguagefiles/" + file_name;
+ return TEST_PATH("../../../test/crosslanguagefiles/" + file_name);
}
void
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp
index 7ccf681c825..75f569b306f 100644
--- a/documentapi/src/tests/messages/testbase.cpp
+++ b/documentapi/src/tests/messages/testbase.cpp
@@ -12,8 +12,8 @@ using document::readDocumenttypesConfig;
TestBase::TestBase() :
_repo(new DocumentTypeRepo(readDocumenttypesConfig(
- GetSourceDirectory() + "../../../test/cfg/testdoctypes.cfg"))),
- _dataPath(GetSourceDirectory() + "../../../test/crosslanguagefiles"),
+ TEST_PATH("../../../test/cfg/testdoctypes.cfg")))),
+ _dataPath(TEST_PATH("../../../test/crosslanguagefiles")),
_loadTypes(),
_protocol(_loadTypes, _repo),
_tests()
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index 6ee1625954d..81f2057bfde 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -97,7 +97,7 @@ Test::Main() {
TEST_INIT(_argv[0]);
_repo.reset(new DocumentTypeRepo(readDocumenttypesConfig(
- GetSourceDirectory() + "../../../test/cfg/testdoctypes.cfg")));
+ TEST_PATH("../../../test/cfg/testdoctypes.cfg"))));
_docType = _repo->getDocumentType("testdoc");
testProtocol(); TEST_FLUSH();
diff --git a/documentapi/src/tests/priority/priority.cpp b/documentapi/src/tests/priority/priority.cpp
index a9fcd011a5e..d2d7a744380 100644
--- a/documentapi/src/tests/priority/priority.cpp
+++ b/documentapi/src/tests/priority/priority.cpp
@@ -35,7 +35,7 @@ Test::Main()
expected.push_back(Priority::PRI_LOWEST);
std::ifstream in;
- in.open((GetSourceDirectory() + "../../../test/crosslanguagefiles/5.1-Priority.txt").c_str());
+ in.open(TEST_PATH("../../../test/crosslanguagefiles/5.1-Priority.txt").c_str());
ASSERT_TRUE(in.good());
while (in) {
std::string str;