Fix DeviceStatusCollectorTest.MaxStoredPeriods.

chrome/browser/policy/device_status_collector_unittest.cc

 // Copyright (c) 2012 The Chromium 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 "chrome/browser/policy/device_status_collector.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 20 matching lines @@
 using base::Time;
 
 namespace em = enterprise_management;
 
 namespace {
 
 const int64 kMillisecondsPerDay = Time::kMicrosecondsPerDay / 1000;
 
 scoped_ptr<content::Geoposition> mock_position_to_return_next;
 
+Time TestBaselineTime() {
+  return Time::UnixEpoch() + TimeDelta::FromDays(42);
+}
+
 void SetMockPositionToReturnNext(const content::Geoposition &position) {
   mock_position_to_return_next.reset(new content::Geoposition(position));
 }
 
 void MockPositionUpdateRequester(
     const content::GeolocationUpdateCallback& callback) {
   if (!mock_position_to_return_next.get())
     return;
 
   // If the fix is invalid, the DeviceStatusCollector will immediately request
   // another update when it receives the callback. This is desirable and safe in
   // real life where geolocation updates arrive asynchronously. In this testing
   // harness, the callback is invoked synchronously upon request, leading to a
   // request-callback loop. The loop is broken by returning the mock position
   // only once.
   scoped_ptr<content::Geoposition> position(
       mock_position_to_return_next.release());
   callback.Run(*position);
 }
 
 class TestingDeviceStatusCollector : public policy::DeviceStatusCollector {
  public:
   TestingDeviceStatusCollector(
       PrefService* local_state,
       chromeos::system::StatisticsProvider* provider)
       : policy::DeviceStatusCollector(local_state,
                                       provider,
                                       &MockPositionUpdateRequester) {
-    // Set the baseline time to a fixed value (1 AM) to prevent test flakiness
+    // Set the baseline time to a fixed value to prevent test flakiness
     // due to a single activity period spanning two days.
-    SetBaselineTime(Time::Now().LocalMidnight() + TimeDelta::FromHours(1));
+    SetBaselineTime(TestBaselineTime());
+
+    // Initialize the collector after setting the baseline time.
+    Init();
   }
 
   void Simulate(IdleState* states, int len) {
     for (int i = 0; i < len; i++)
       IdleStateCallback(states[i]);
   }
 
   void set_max_stored_past_activity_days(unsigned int value) {
     max_stored_past_activity_days_ = value;
   }
 
   void set_max_stored_future_activity_days(unsigned int value) {
     max_stored_future_activity_days_ = value;
   }
 
   // Reset the baseline time.
   void SetBaselineTime(Time time) {
     baseline_time_ = time;
     baseline_offset_periods_ = 0;
   }
 
  protected:
   virtual void CheckIdleState() OVERRIDE {
     // This should never be called in testing, as it results in a dbus call.
-    NOTREACHED();
+    ADD_FAILURE();
   }
 
   // Each time this is called, returns a time that is a fixed increment
   // later than the previous time.
   virtual Time GetCurrentTime() OVERRIDE {
     int poll_interval = policy::DeviceStatusCollector::kIdlePollIntervalSeconds;
     return baseline_time_ +
         TimeDelta::FromSeconds(poll_interval * baseline_offset_periods_++);
   }
 
@@ skipping 79 matching lines @@
     EXPECT_TRUE(location.has_timestamp());
     EXPECT_FALSE(location.has_altitude());
     EXPECT_FALSE(location.has_altitude_accuracy());
     EXPECT_FALSE(location.has_heading());
     EXPECT_FALSE(location.has_speed());
     EXPECT_FALSE(location.has_error_message());
     EXPECT_DOUBLE_EQ(4.3, location.latitude());
     EXPECT_DOUBLE_EQ(-7.8, location.longitude());
     EXPECT_DOUBLE_EQ(3., location.accuracy());
     // Check that the timestamp is not older than ten minutes.
-    EXPECT_TRUE(Time::Now() - Time::FromDoubleT(location.timestamp() / 1000.) <
-                TimeDelta::FromMinutes(10));
+    Time timestamp = Time::FromDoubleT(location.timestamp() / 1000.0);
+    EXPECT_TRUE(TestBaselineTime() - timestamp < TimeDelta::FromMinutes(10));

[Patrick Dubroy, 2012/10/26 09:36:46]

Isn't the delta always going to be negative here?

[Joao da Silva, 2012/11/15 13:25:48]

The timestamp is expected to be some time in the past, so this shouldn't
normally be negative. In this test, the timestamp is set to 4 or 5 minutes
before the baseline.

[Patrick Dubroy, 2012/11/15 13:53:01]

Ah, I see.

   }
 
   void CheckThatALocationErrorIsReported() {
     GetStatus();
     EXPECT_TRUE(status_.has_device_location());
     em::DeviceLocation location = status_.device_location();
     EXPECT_TRUE(location.has_error_code());
     EXPECT_EQ(em::DeviceLocation::ERROR_CODE_POSITION_UNAVAILABLE,
               location.error_code());
   }
@@ skipping 118 matching lines @@
     IDLE_STATE_IDLE,
     IDLE_STATE_IDLE
   };
   cros_settings_->SetBoolean(chromeos::kReportDeviceActivityTimes, true);
   status_collector_->Simulate(test_states,
                               sizeof(test_states) / sizeof(IdleState));
   GetStatus();
   EXPECT_EQ(3 * ActivePeriodMilliseconds(), GetActiveMilliseconds(status_));
 }
 
-// Fails after after WebKit roll [132375:132450]
-// http://crbug.com/157848
-TEST_F(DeviceStatusCollectorTest, DISABLED_MaxStoredPeriods) {
+TEST_F(DeviceStatusCollectorTest, MaxStoredPeriods) {
   IdleState test_states[] = {
     IDLE_STATE_ACTIVE,
     IDLE_STATE_IDLE
   };
   unsigned int max_days = 10;
 
   cros_settings_->SetBoolean(chromeos::kReportDeviceActivityTimes, true);
   status_collector_->set_max_stored_past_activity_days(max_days - 1);
   status_collector_->set_max_stored_future_activity_days(1);
-  Time baseline = Time::Now().LocalMidnight();
+  Time baseline = TestBaselineTime();
 
   // Simulate 12 active periods.
   for (int i = 0; i < static_cast<int>(max_days) + 2; i++) {
     status_collector_->Simulate(test_states,
                                 sizeof(test_states) / sizeof(IdleState));
     // Advance the simulated clock by a day.
     baseline += TimeDelta::FromDays(1);
     status_collector_->SetBaselineTime(baseline);
   }
 
@@ skipping 39 matching lines @@
 }
 
 TEST_F(DeviceStatusCollectorTest, ActivityCrossingMidnight) {
   IdleState test_states[] = {
     IDLE_STATE_ACTIVE
   };
   cros_settings_->SetBoolean(chromeos::kReportDeviceActivityTimes, true);
 
   // Set the baseline time to 10 seconds after midnight.
   status_collector_->SetBaselineTime(
-      Time::Now().LocalMidnight() + TimeDelta::FromSeconds(10));
+      TestBaselineTime().LocalMidnight() + TimeDelta::FromSeconds(10));
 
   status_collector_->Simulate(test_states, 1);
   GetStatus();
   ASSERT_EQ(2, status_.active_period_size());
 
   em::ActiveTimePeriod period0 = status_.active_period(0);
   em::ActiveTimePeriod period1 = status_.active_period(1);
   EXPECT_EQ(ActivePeriodMilliseconds() - 10000, period0.active_duration());
   EXPECT_EQ(10000, period1.active_duration());
 
@@ skipping 64 matching lines @@
   // don't have any reasonable values inside the unit test, so those
   // aren't checked.
   EXPECT_NE("", status_.browser_version());
 }
 
 TEST_F(DeviceStatusCollectorTest, Location) {
   content::Geoposition valid_fix;
   valid_fix.latitude = 4.3;
   valid_fix.longitude = -7.8;
   valid_fix.accuracy = 3.;
-  valid_fix.timestamp = Time::Now();
+  valid_fix.timestamp = TestBaselineTime() - TimeDelta::FromMinutes(5);
 
   content::Geoposition invalid_fix;
   invalid_fix.error_code =
       content::Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
-  invalid_fix.timestamp = Time::Now();
+  invalid_fix.timestamp = TestBaselineTime() - TimeDelta::FromMinutes(4);
 
   // Check that when device location reporting is disabled, no location is
   // reported.
   SetMockPositionToReturnNext(valid_fix);
   CheckThatNoLocationIsReported();
 
   // Check that when device location reporting is enabled and a valid fix is
   // available, the location is reported and is stored in local state.
   SetMockPositionToReturnNext(valid_fix);
   cros_settings_->SetBoolean(chromeos::kReportDeviceLocation, true);
@@ skipping 19 matching lines @@
   // Check that after enabling location reporting again, an error is reported
   // if no valid fix is available.
   SetMockPositionToReturnNext(invalid_fix);
   cros_settings_->SetBoolean(chromeos::kReportDeviceLocation, true);
   // Allow the new pref to propagate to the status collector.
   message_loop_.RunAllPending();
   CheckThatALocationErrorIsReported();
 }
 
 }  // namespace policy