commit bccbc387ed23ec18adcd0ef8b50d958ef38cd619
author Alex Deymo <deymo@chromium.org> Thu Apr 03 13:38:55 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Apr 04 20:27:16 2014 +0000
tree 98acd5a354c10a7ef4e13a65de684a125f23c05b
parent f9c599920bd41a6a245d7fa645ffe14b51e96c14

Move IsOOBEComplete to HardwareInterface.

This patch moves the mockable IsOOBEComplete to the HardwareInterface
which already has a fake implemented. This is required as a first
step to make it available on the PolicyManager.

This patch also passes a null pointer when the timestamp isn't
required.

BUG=chromium:358269
TEST=Unittests adjusted and passing.

Change-Id: I620e0f4521832b3f2c0170811116251cdfe58f26
Reviewed-on: https://chromium-review.googlesource.com/193101
Reviewed-by: David Zeuthen <zeuthen@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>

omaha_request_action_unittest.cc

diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index fdfb590..0bc5538 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -2255,30 +2255,24 @@
   // prefs. However, first try with an invalid date and check we do
   // nothing.
   {
-    NiceMock<MockSystemState> system_state;
-    system_state.set_prefs(&prefs);
+    NiceMock<MockSystemState> mock_system_state;
+    mock_system_state.set_prefs(&prefs);
 
     Time oobe_date = Time::FromTimeT(42); // Dec 31, 1969 16:00:42 PST.
-    EXPECT_CALL(system_state,
-                IsOOBEComplete(_))
-                .WillRepeatedly(DoAll(SetArgumentPointee<0>(oobe_date),
-                                      Return(true)));
-    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&system_state), -1);
+    mock_system_state.get_fake_hardware()->SetIsOOBEComplete(oobe_date);
+    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), -1);
     EXPECT_FALSE(prefs.Exists(kPrefsInstallDateDays));
   }
 
   // Then check with a valid date. The date Jan 20, 2007 0:00 PST
   // should yield an InstallDate of 14.
   {
-    NiceMock<MockSystemState> system_state;
-    system_state.set_prefs(&prefs);
+    NiceMock<MockSystemState> mock_system_state;
+    mock_system_state.set_prefs(&prefs);
 
     Time oobe_date = Time::FromTimeT(1169280000); // Jan 20, 2007 0:00 PST.
-    EXPECT_CALL(system_state,
-                IsOOBEComplete(_))
-                .WillRepeatedly(DoAll(SetArgumentPointee<0>(oobe_date),
-                                      Return(true)));
-    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&system_state), 14);
+    mock_system_state.get_fake_hardware()->SetIsOOBEComplete(oobe_date);
+    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), 14);
     EXPECT_TRUE(prefs.Exists(kPrefsInstallDateDays));
 
     int64_t prefs_days;
@@ -2291,15 +2285,12 @@
   // 2007 0:00 PST should yield an InstallDate of 28... but since
   // there's a prefs file, we should still get 14.
   {
-    NiceMock<MockSystemState> system_state;
-    system_state.set_prefs(&prefs);
+    NiceMock<MockSystemState> mock_system_state;
+    mock_system_state.set_prefs(&prefs);
 
     Time oobe_date = Time::FromTimeT(1170144000); // Jan 30, 2007 0:00 PST.
-    EXPECT_CALL(system_state,
-                IsOOBEComplete(_))
-                .WillRepeatedly(DoAll(SetArgumentPointee<0>(oobe_date),
-                                      Return(true)));
-    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&system_state), 14);
+    mock_system_state.get_fake_hardware()->SetIsOOBEComplete(oobe_date);
+    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), 14);
 
     int64_t prefs_days;
     EXPECT_TRUE(prefs.GetInt64(kPrefsInstallDateDays, &prefs_days));
@@ -2307,7 +2298,7 @@
 
     // If we delete the prefs file, we should get 28 days.
     EXPECT_TRUE(prefs.Delete(kPrefsInstallDateDays));
-    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&system_state), 28);
+    EXPECT_EQ(OmahaRequestAction::GetInstallDate(&mock_system_state), 28);
     EXPECT_TRUE(prefs.GetInt64(kPrefsInstallDateDays, &prefs_days));
     EXPECT_EQ(prefs_days, 28);
   }