Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1088)

Unified Diff: chrome/browser/policy/device_status_collector_unittest.cc

Issue 11271024: Fix DeviceStatusCollectorTest.MaxStoredPeriods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/device_status_collector.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/device_status_collector_unittest.cc
diff --git a/chrome/browser/policy/device_status_collector_unittest.cc b/chrome/browser/policy/device_status_collector_unittest.cc
index a5a4b1da69a07fd8e6231efa4a87cd5c78f0d92a..8a703854b95e69894549016385f750b825fcd98c 100644
--- a/chrome/browser/policy/device_status_collector_unittest.cc
+++ b/chrome/browser/policy/device_status_collector_unittest.cc
@@ -93,7 +93,7 @@ class TestingDeviceStatusCollector : public policy::DeviceStatusCollector {
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
@@ -344,6 +344,7 @@ TEST_F(DeviceStatusCollectorTest, MaxStoredPeriods) {
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();
Mattias Nissler (ping if slow) 2012/10/25 14:27:19 One thing: Should we convert these tests to starti
Joao da Silva 2012/10/25 15:24:17 That's a good idea. Done.
+ status_collector_->SetBaselineTime(baseline);
// Simulate 12 active periods.
for (int i = 0; i < static_cast<int>(max_days) + 2; i++) {
« no previous file with comments | « chrome/browser/policy/device_status_collector.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698