aboutsummaryrefslogtreecommitdiffstats
path: root/config/src/tests/file_subscription/file_subscription.cpp
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2016-08-23 15:10:36 +0200
committerVegard Sjonfjell <vegardsjo@gmail.com>2016-08-23 15:10:36 +0200
commit55e5a91901109161186e05d3a6e959e06958bbba (patch)
treef312bab2c60207ee305dbcfa047fcc4fa8fd2dc1 /config/src/tests/file_subscription/file_subscription.cpp
parentd337a29392fb752dc725e4aea5efa0cc0df5f17a (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 'config/src/tests/file_subscription/file_subscription.cpp')
-rw-r--r--config/src/tests/file_subscription/file_subscription.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/config/src/tests/file_subscription/file_subscription.cpp b/config/src/tests/file_subscription/file_subscription.cpp
index 4b2c84281e9..19aa43297a6 100644
--- a/config/src/tests/file_subscription/file_subscription.cpp
+++ b/config/src/tests/file_subscription/file_subscription.cpp
@@ -5,6 +5,7 @@
#include <vespa/config/common/configholder.h>
#include <vespa/config/file/filesource.h>
#include <vespa/vespalib/util/sync.h>
+#include <vespa/vespalib/testkit/testapp.h>
#include <fstream>
#include <config-my.h>
#include <config-foo.h>
@@ -27,6 +28,7 @@ namespace {
}
}
+
TEST("requireThatFileSpecGivesCorrectKey") {
std::string str("/home/my/config.cfg");
FileSpec spec(str);
@@ -129,7 +131,7 @@ TEST("requireThatMultipleSubscribersCanSubscribeToSameFile") {
}
TEST("requireThatCanSubscribeToDirectory") {
- DirSpec spec("cfgdir");
+ DirSpec spec(vespalib::TestApp::GetSourceDirectory() + "cfgdir");
ConfigSubscriber s(spec);
ConfigHandle<FooConfig>::UP fooHandle = s.subscribe<FooConfig>("");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
@@ -145,7 +147,7 @@ TEST("requireThatCanSubscribeToDirectory") {
}
TEST("requireThatCanSubscribeToDirectoryWithEmptyCfgFile") {
- DirSpec spec("cfgemptyfile");
+ DirSpec spec(vespalib::TestApp::GetSourceDirectory() + "cfgemptyfile");
ConfigSubscriber s(spec);
ConfigHandle<FoodefaultConfig>::UP fooHandle = s.subscribe<FoodefaultConfig>("");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
@@ -161,7 +163,7 @@ TEST("requireThatCanSubscribeToDirectoryWithEmptyCfgFile") {
}
TEST("requireThatCanSubscribeToDirectoryWithNonExistingCfgFile") {
- DirSpec spec("cfgnonexistingfile");
+ DirSpec spec(vespalib::TestApp::GetSourceDirectory() + "cfgnonexistingfile");
ConfigSubscriber s(spec);
ConfigHandle<FoodefaultConfig>::UP fooHandle = s.subscribe<FoodefaultConfig>("");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
@@ -176,7 +178,8 @@ TEST("requireThatCanSubscribeToDirectoryWithNonExistingCfgFile") {
ASSERT_EQUAL("barbar", barCfg->barValue);
}
-TEST_F("requireThatDirSpecDoesNotMixNames", DirSpec("cfgdir2")) {
+TEST_F("requireThatDirSpecDoesNotMixNames",
+ DirSpec(vespalib::TestApp::GetSourceDirectory() + "cfgdir2")) {
ConfigSubscriber s(f);
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
ConfigHandle<FoobarConfig>::UP foobarHandle = s.subscribe<FoobarConfig>("");
@@ -189,7 +192,8 @@ TEST_F("requireThatDirSpecDoesNotMixNames", DirSpec("cfgdir2")) {
ASSERT_EQUAL("foobarlol", foobar->fooBarValue);
}
-TEST_F("require that can subscribe multiple config ids of same config", DirSpec("cfgdir3")) {
+TEST_F("require that can subscribe multiple config ids of same config",
+ DirSpec(vespalib::TestApp::GetSourceDirectory() + "cfgdir3")) {
ConfigSubscriber s(f1);
ConfigHandle<BarConfig>::UP fooHandle = s.subscribe<BarConfig>("foo");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("bar");