Add metrics library tests. Some metrics daemon API cleanup.

src/platform/metrics/metrics_daemon_test.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "metrics_daemon.h"
 #include "metrics_library_mock.h"
 
 #include <sys/file.h>
 
 #include <base/eintr_wrapper.h>
 #include <base/file_util.h>
 #include <base/logging.h>
 #include <base/string_util.h>
 #include <gtest/gtest.h>
 
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::StrictMock;
 
 static const char kTestDailyUseRecordFile[] = "daily-usage-test";
 static const char kDoesNotExistFile[] = "/does/not/exist";
 
 static const int kSecondsPerDay = 24 * 60 * 60;
 
 class MetricsDaemonTest : public testing::Test {
  protected:
   virtual void SetUp() {
+    EXPECT_EQ(NULL, daemon_.daily_use_record_file_);
     daemon_.Init(true, &metrics_lib_);
+    EXPECT_TRUE(NULL != daemon_.daily_use_record_file_);
     daemon_.daily_use_record_file_ = kTestDailyUseRecordFile;
 
     // The test fixture object will be used by the log message handler.
     daemon_test_ = this;
     logging::SetLogMessageHandler(HandleLogMessages);
   }
 
   virtual void TearDown() {
     logging::SetLogMessageHandler(NULL);
     daemon_test_ = NULL;
@@ skipping 377 matching lines @@
   EXPECT_EQ(7 * kSecondsPerDay + 45, daemon_.user_active_last_);
   EXPECT_PRED_FORMAT2(AssertDailyUseRecord, /* day */ 7, /* seconds */ 30);
 
   daemon_.PowerStateChanged("otherstate", 7 * kSecondsPerDay + 185);
   EXPECT_EQ(MetricsDaemon::kUnknownPowerState, daemon_.power_state_);
   EXPECT_FALSE(daemon_.user_active_);
   EXPECT_EQ(7 * kSecondsPerDay + 185, daemon_.user_active_last_);
   EXPECT_PRED_FORMAT2(AssertDailyUseRecord, /* day */ 7, /* seconds */ 30);
 }
 
-TEST_F(MetricsDaemonTest, PublishMetric) {
-  ExpectMetric("Dummy.Metric", 3, 1, 100, 50);
-  daemon_.PublishMetric("Dummy.Metric", /* sample */ 3,
-                        /* min */ 1, /* max */ 100, /* buckets */ 50);
-}
-
 TEST_F(MetricsDaemonTest, ScreenSaverStateChanged) {
   EXPECT_EQ(MetricsDaemon::kUnknownScreenSaverState,
             daemon_.screensaver_state_);
   EXPECT_FALSE(daemon_.user_active_);
   EXPECT_EQ(0, daemon_.user_active_last_);
   EXPECT_EQ(0, daemon_.daily_use_day_last_);
   EXPECT_TRUE(AssertNoOrEmptyUseRecordFile());
 
   daemon_.ScreenSaverStateChanged("locked", 5 * kSecondsPerDay + 10);
   EXPECT_EQ(MetricsDaemon::kScreenSaverStateLocked,
@@ skipping 11 matching lines @@
   EXPECT_TRUE(AssertNoOrEmptyUseRecordFile());
 
   daemon_.ScreenSaverStateChanged("otherstate", 5 * kSecondsPerDay + 300);
   EXPECT_EQ(MetricsDaemon::kUnknownScreenSaverState,
             daemon_.screensaver_state_);
   EXPECT_FALSE(daemon_.user_active_);
   EXPECT_EQ(5 * kSecondsPerDay + 300, daemon_.user_active_last_);
   EXPECT_PRED_FORMAT2(AssertDailyUseRecord, /* day */ 5, /* seconds */ 200);
 }
 
+TEST_F(MetricsDaemonTest, SendMetric) {
+  ExpectMetric("Dummy.Metric", 3, 1, 100, 50);
+  daemon_.SendMetric("Dummy.Metric", /* sample */ 3,
+                     /* min */ 1, /* max */ 100, /* buckets */ 50);
+}
+
 TEST_F(MetricsDaemonTest, SessionStateChanged) {
   EXPECT_EQ(MetricsDaemon::kUnknownSessionState, daemon_.session_state_);
   EXPECT_FALSE(daemon_.user_active_);
   EXPECT_EQ(0, daemon_.user_active_last_);
   EXPECT_EQ(0, daemon_.daily_use_day_last_);
   EXPECT_TRUE(AssertNoOrEmptyUseRecordFile());
 
   daemon_.SessionStateChanged("started", 15 * kSecondsPerDay + 20);
   EXPECT_EQ(MetricsDaemon::kSessionStateStarted, daemon_.session_state_);
   EXPECT_TRUE(daemon_.user_active_);
@@ skipping 81 matching lines @@
   EXPECT_TRUE(daemon_.user_active_);
   EXPECT_EQ(9 * kSecondsPerDay + 400, daemon_.user_active_last_);
   EXPECT_EQ(9, daemon_.daily_use_day_last_);
   EXPECT_PRED_FORMAT2(AssertDailyUseRecord, /* day */ 9, /* seconds */ 800);
 }
 
 int main(int argc, char **argv) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }