diff options
| -rw-r--r-- | cmds/statsd/src/config/ConfigManager.cpp | 16 | ||||
| -rw-r--r-- | cmds/statsd/src/config/ConfigManager.h | 5 | ||||
| -rw-r--r-- | cmds/statsd/tests/ConfigManager_test.cpp | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/cmds/statsd/src/config/ConfigManager.cpp b/cmds/statsd/src/config/ConfigManager.cpp index de75c71d36c2..876c7fb11af5 100644 --- a/cmds/statsd/src/config/ConfigManager.cpp +++ b/cmds/statsd/src/config/ConfigManager.cpp @@ -49,15 +49,13 @@ ConfigManager::~ConfigManager() { void ConfigManager::Startup() { map<ConfigKey, StatsdConfig> configsFromDisk; StorageManager::readConfigFromDisk(configsFromDisk); - // TODO(b/70667694): Make the configs from disk be used. And remove the fake config, - // and tests shouldn't call this Startup(), maybe call StartupForTest() so we don't read - // configs from disk for tests. - // for (const auto& pair : configsFromDisk) { - // UpdateConfig(pair.first, pair.second); - //} - - // Uncomment the following line and use the hard coded config for development. - // UpdateConfig(ConfigKey(1000, "fake"), build_fake_config()); + for (const auto& pair : configsFromDisk) { + UpdateConfig(pair.first, pair.second); + } +} + +void ConfigManager::StartupForTest() { + // Dummy function to avoid reading configs from disks for tests. } void ConfigManager::AddListener(const sp<ConfigListener>& listener) { diff --git a/cmds/statsd/src/config/ConfigManager.h b/cmds/statsd/src/config/ConfigManager.h index ea42a3595d98..ad666bc15b84 100644 --- a/cmds/statsd/src/config/ConfigManager.h +++ b/cmds/statsd/src/config/ConfigManager.h @@ -48,6 +48,11 @@ public: */ void Startup(); + /* + * Dummy initializer for tests. + */ + void StartupForTest(); + /** * Someone else wants to know about the configs. */ diff --git a/cmds/statsd/tests/ConfigManager_test.cpp b/cmds/statsd/tests/ConfigManager_test.cpp index 3eac5d213c22..cc02f34519cd 100644 --- a/cmds/statsd/tests/ConfigManager_test.cpp +++ b/cmds/statsd/tests/ConfigManager_test.cpp @@ -153,7 +153,7 @@ TEST(ConfigManagerTest, TestRemoveUid) { EXPECT_CALL(*(listener.get()), OnConfigRemoved(ConfigKeyEq(2, StringToId("yyy")))); EXPECT_CALL(*(listener.get()), OnConfigRemoved(ConfigKeyEq(2, StringToId("zzz")))); - manager->Startup(); + manager->StartupForTest(); manager->UpdateConfig(ConfigKey(1, StringToId("aaa")), config); manager->UpdateConfig(ConfigKey(2, StringToId("xxx")), config); manager->UpdateConfig(ConfigKey(2, StringToId("yyy")), config); |