summaryrefslogtreecommitdiffstats
path: root/config/src/tests/file_subscription/file_subscription.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'config/src/tests/file_subscription/file_subscription.cpp')
-rw-r--r--config/src/tests/file_subscription/file_subscription.cpp67
1 files changed, 34 insertions, 33 deletions
diff --git a/config/src/tests/file_subscription/file_subscription.cpp b/config/src/tests/file_subscription/file_subscription.cpp
index 69090f4bb8e..9c40e2ffd77 100644
--- a/config/src/tests/file_subscription/file_subscription.cpp
+++ b/config/src/tests/file_subscription/file_subscription.cpp
@@ -5,7 +5,6 @@
#include <vespa/config/file/filesource.h>
#include <vespa/config/common/exceptions.h>
#include <vespa/vespalib/util/sync.h>
-#include <vespa/fastos/time.h>
#include <fstream>
#include <config-my.h>
#include <config-foo.h>
@@ -13,9 +12,12 @@
#include <config-bar.h>
#include <config-foobar.h>
#include <vespa/log/log.h>
+#include <vespa/fastos/timestamp.h>
+
LOG_SETUP(".filesubscription_test");
using namespace config;
+using namespace std::chrono_literals;
namespace {
@@ -60,15 +62,15 @@ TEST("requireThatFileSpecGivesCorrectSource") {
FileSpec spec("my.cfg");
SourceFactory::UP factory(spec.createSourceFactory(TimingValues()));
- ASSERT_TRUE(factory.get() != NULL);
+ ASSERT_TRUE(factory);
IConfigHolder::SP holder(new ConfigHolder());
Source::UP src = factory->createSource(holder, ConfigKey("my", "my", "bar", "foo"));
- ASSERT_TRUE(src.get() != NULL);
+ ASSERT_TRUE(src);
src->getConfig();
ASSERT_TRUE(holder->poll());
ConfigUpdate::UP update(holder->provide());
- ASSERT_TRUE(update.get() != NULL);
+ ASSERT_TRUE(update);
const ConfigValue & value(update->getValue());
ASSERT_EQUAL(1u, value.numLines());
ASSERT_EQUAL("myField \"foobar\"", value.getLine(0));
@@ -78,12 +80,12 @@ TEST("requireThatFileSubscriptionReturnsCorrectConfig") {
writeFile("my.cfg", "foobar");
ConfigSubscriber s(FileSpec("my.cfg"));
std::unique_ptr<ConfigHandle<MyConfig> > handle = s.subscribe<MyConfig>("my");
- s.nextConfig(0);
+ s.nextConfigNow();
std::unique_ptr<MyConfig> cfg = handle->getConfig();
- ASSERT_TRUE(cfg.get() != NULL);
+ ASSERT_TRUE(cfg);
ASSERT_EQUAL("foobar", cfg->myField);
ASSERT_EQUAL("my", cfg->defName());
- ASSERT_FALSE(s.nextConfig(100));
+ ASSERT_FALSE(s.nextConfig(100ms));
}
TEST("requireThatReconfigIsCalledWhenConfigChanges") {
@@ -92,28 +94,27 @@ TEST("requireThatReconfigIsCalledWhenConfigChanges") {
IConfigContext::SP context(new ConfigContext(FileSpec("my.cfg")));
ConfigSubscriber s(context);
std::unique_ptr<ConfigHandle<MyConfig> > handle = s.subscribe<MyConfig>("");
- s.nextConfig(0);
+ s.nextConfigNow();
std::unique_ptr<MyConfig> cfg = handle->getConfig();
- ASSERT_TRUE(cfg.get() != NULL);
+ ASSERT_TRUE(cfg);
ASSERT_EQUAL("foo", cfg->myField);
ASSERT_EQUAL("my", cfg->defName());
- ASSERT_FALSE(s.nextConfig(3000));
+ ASSERT_FALSE(s.nextConfig(3000ms));
writeFile("my.cfg", "bar");
context->reload();
bool correctValue = false;
- FastOS_Time timer;
- timer.SetNow();
- while (!correctValue && timer.MilliSecsToNow() < 20000.0) {
+ fastos::StopWatch timer;
+ while (!correctValue && timer.elapsed().ms() < 20000.0) {
LOG(info, "Testing value...");
- if (s.nextConfig(1000)) {
+ if (s.nextConfig(1000ms)) {
break;
}
}
cfg = handle->getConfig();
- ASSERT_TRUE(cfg.get() != NULL);
+ ASSERT_TRUE(cfg);
ASSERT_EQUAL("bar", cfg->myField);
ASSERT_EQUAL("my", cfg->defName());
- ASSERT_FALSE(s.nextConfig(1000));
+ ASSERT_FALSE(s.nextConfig(1000ms));
}
}
@@ -123,10 +124,10 @@ TEST("requireThatMultipleSubscribersCanSubscribeToSameFile") {
{
ConfigSubscriber s1(spec);
std::unique_ptr<ConfigHandle<MyConfig> > h1 = s1.subscribe<MyConfig>("");
- ASSERT_TRUE(s1.nextConfig(0));
+ ASSERT_TRUE(s1.nextConfigNow());
ConfigSubscriber s2(spec);
std::unique_ptr<ConfigHandle<MyConfig> > h2 = s2.subscribe<MyConfig>("");
- ASSERT_TRUE(s2.nextConfig(0));
+ ASSERT_TRUE(s2.nextConfigNow());
}
}
@@ -135,13 +136,13 @@ TEST("requireThatCanSubscribeToDirectory") {
ConfigSubscriber s(spec);
ConfigHandle<FooConfig>::UP fooHandle = s.subscribe<FooConfig>("");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
- ASSERT_TRUE(s.nextConfig(0));
+ ASSERT_TRUE(s.nextConfigNow());
ASSERT_TRUE(fooHandle->isChanged());
ASSERT_TRUE(barHandle->isChanged());
std::unique_ptr<FooConfig> fooCfg = fooHandle->getConfig();
std::unique_ptr<BarConfig> barCfg = barHandle->getConfig();
- ASSERT_TRUE(fooCfg.get() != NULL);
- ASSERT_TRUE(barCfg.get() != NULL);
+ ASSERT_TRUE(fooCfg);
+ ASSERT_TRUE(barCfg);
ASSERT_EQUAL("foofoo", fooCfg->fooValue);
ASSERT_EQUAL("barbar", barCfg->barValue);
}
@@ -151,13 +152,13 @@ TEST("requireThatCanSubscribeToDirectoryWithEmptyCfgFile") {
ConfigSubscriber s(spec);
ConfigHandle<FoodefaultConfig>::UP fooHandle = s.subscribe<FoodefaultConfig>("");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
- ASSERT_TRUE(s.nextConfig(0));
+ ASSERT_TRUE(s.nextConfigNow());
ASSERT_TRUE(fooHandle->isChanged());
ASSERT_TRUE(barHandle->isChanged());
std::unique_ptr<FoodefaultConfig> fooCfg = fooHandle->getConfig();
std::unique_ptr<BarConfig> barCfg = barHandle->getConfig();
- ASSERT_TRUE(fooCfg.get() != NULL);
- ASSERT_TRUE(barCfg.get() != NULL);
+ ASSERT_TRUE(fooCfg);
+ ASSERT_TRUE(barCfg);
ASSERT_EQUAL("per", fooCfg->fooValue);
ASSERT_EQUAL("barbar", barCfg->barValue);
}
@@ -167,13 +168,13 @@ TEST("requireThatCanSubscribeToDirectoryWithNonExistingCfgFile") {
ConfigSubscriber s(spec);
ConfigHandle<FoodefaultConfig>::UP fooHandle = s.subscribe<FoodefaultConfig>("");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
- ASSERT_TRUE(s.nextConfig(0));
+ ASSERT_TRUE(s.nextConfigNow());
ASSERT_TRUE(fooHandle->isChanged());
ASSERT_TRUE(barHandle->isChanged());
std::unique_ptr<FoodefaultConfig> fooCfg = fooHandle->getConfig();
std::unique_ptr<BarConfig> barCfg = barHandle->getConfig();
- ASSERT_TRUE(fooCfg.get() != NULL);
- ASSERT_TRUE(barCfg.get() != NULL);
+ ASSERT_TRUE(fooCfg);
+ ASSERT_TRUE(barCfg);
ASSERT_EQUAL("per", fooCfg->fooValue);
ASSERT_EQUAL("barbar", barCfg->barValue);
}
@@ -183,11 +184,11 @@ TEST_F("requireThatDirSpecDoesNotMixNames",
ConfigSubscriber s(f);
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("");
ConfigHandle<FoobarConfig>::UP foobarHandle = s.subscribe<FoobarConfig>("");
- s.nextConfig(0);
+ s.nextConfigNow();
std::unique_ptr<BarConfig> bar = barHandle->getConfig();
std::unique_ptr<FoobarConfig> foobar = foobarHandle->getConfig();
- ASSERT_TRUE(bar.get() != NULL);
- ASSERT_TRUE(foobar.get() != NULL);
+ ASSERT_TRUE(bar);
+ ASSERT_TRUE(foobar);
ASSERT_EQUAL("barbar", bar->barValue);
ASSERT_EQUAL("foobarlol", foobar->fooBarValue);
}
@@ -197,11 +198,11 @@ TEST_F("require that can subscribe multiple config ids of same config",
ConfigSubscriber s(f1);
ConfigHandle<BarConfig>::UP fooHandle = s.subscribe<BarConfig>("foo");
ConfigHandle<BarConfig>::UP barHandle = s.subscribe<BarConfig>("bar");
- s.nextConfig(0);
+ s.nextConfigNow();
std::unique_ptr<BarConfig> bar1 = fooHandle->getConfig();
std::unique_ptr<BarConfig> bar2 = barHandle->getConfig();
- ASSERT_TRUE(bar1.get() != NULL);
- ASSERT_TRUE(bar2.get() != NULL);
+ ASSERT_TRUE(bar1);
+ ASSERT_TRUE(bar2);
ASSERT_EQUAL("barbar", bar1->barValue);
ASSERT_EQUAL("foobarlol", bar2->barValue);
}