Merge "Fix invalidConfigRemoved" into tm-dev
diff --git a/statsd/tests/StatsLogProcessor_test.cpp b/statsd/tests/StatsLogProcessor_test.cpp
index 49218ef..9697225 100644
--- a/statsd/tests/StatsLogProcessor_test.cpp
+++ b/statsd/tests/StatsLogProcessor_test.cpp
@@ -14,6 +14,7 @@
#include "StatsLogProcessor.h"
+#include <android-base/stringprintf.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <stdio.h>
@@ -38,9 +39,11 @@
namespace os {
namespace statsd {
+using android::base::StringPrintf;
using android::util::ProtoOutputStream;
#ifdef __ANDROID__
+#define STATS_DATA_DIR "/data/misc/stats-data"
/**
* Mock MetricsManager (ByteSize() is called).
@@ -359,6 +362,8 @@
StatsdStats::getInstance().mConfigStats.find(key));
// Both "config" and "invalidConfig" should be in the icebox.
EXPECT_EQ(2, StatsdStats::getInstance().mIceBox.size());
+ string suffix = StringPrintf("%d_%lld", key.GetUid(), (long long)key.GetId());
+ StorageManager::deleteSuffixedFiles(STATS_DATA_DIR, suffix.c_str());
}