Set the metric name for alerts in fake config and add a test to make sure the fake config is valid..
Test: unit test passed.
Change-Id: I1879fc523cca9fc6c672332ab4ac383f21dc16fc
diff --git a/cmds/statsd/src/config/ConfigManager.cpp b/cmds/statsd/src/config/ConfigManager.cpp
index 0c9252e..408eeda 100644
--- a/cmds/statsd/src/config/ConfigManager.cpp
+++ b/cmds/statsd/src/config/ConfigManager.cpp
@@ -30,8 +30,6 @@
#define STATS_SERVICE_DIR "/data/system/stats-service"
-static StatsdConfig build_fake_config();
-
using android::base::StringPrintf;
using std::unique_ptr;
@@ -229,7 +227,7 @@
}
}
-static StatsdConfig build_fake_config() {
+StatsdConfig build_fake_config() {
// HACK: Hard code a test metric for counting screen on events...
StatsdConfig config;
config.set_name("CONFIG_12345");
diff --git a/cmds/statsd/src/config/ConfigManager.h b/cmds/statsd/src/config/ConfigManager.h
index 01d7fb9..74a1574 100644
--- a/cmds/statsd/src/config/ConfigManager.h
+++ b/cmds/statsd/src/config/ConfigManager.h
@@ -34,6 +34,9 @@
using std::vector;
using std::pair;
+// Util function to Hard code a test metric for counting screen on events.
+StatsdConfig build_fake_config();
+
/**
* Keeps track of which configurations have been set from various sources.
*
diff --git a/cmds/statsd/src/metrics/MetricsManager.h b/cmds/statsd/src/metrics/MetricsManager.h
index 59ade7c..a6054e3 100644
--- a/cmds/statsd/src/metrics/MetricsManager.h
+++ b/cmds/statsd/src/metrics/MetricsManager.h
@@ -101,7 +101,7 @@
// maps from ConditionTracker to MetricProducer
std::unordered_map<int, std::vector<int>> mConditionToMetricMap;
- bool mConfigValid;
+ bool mConfigValid = false;
};
} // namespace statsd
diff --git a/cmds/statsd/tests/ConfigManager_test.cpp b/cmds/statsd/tests/ConfigManager_test.cpp
index f570522..3b52991 100644
--- a/cmds/statsd/tests/ConfigManager_test.cpp
+++ b/cmds/statsd/tests/ConfigManager_test.cpp
@@ -13,6 +13,7 @@
// limitations under the License.
#include "src/config/ConfigManager.h"
+#include "src/metrics/MetricsManager.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -60,6 +61,11 @@
return arg.name() == name;
}
+TEST(ConfigManagerTest, TestFakeConfig) {
+ auto metricsManager = std::make_unique<MetricsManager>(build_fake_config());
+ EXPECT_TRUE(metricsManager->isConfigValid());
+}
+
/**
* Test the addOrUpdate and remove methods
*/