commit 0e5debf2d5f8e929dea4c35915174b77a86fbdce
author Julian Pastarmov <pastarmovj@chromium.org> Thu Aug 04 11:15:13 2011 +0200
committer Julian Pastarmov <pastarmovj@chromium.org> Thu Aug 04 02:17:26 2011 -0700
tree 925033e5f834620d5920fa1ab2958aff38020af0
parent 70b7abd84fc7b101d46a3f01d543b3fb3a9c268a

Fixed a test where a method was expected to be called but it wasn't.

A recent optimization in the code made that second call unneeded as so
our expectation is not met anymore (for good so).

BUG=chromium-os:18430
TEST=Metrics unit tests should pass.

Change-Id: I1162dc657156ee9207b904ab544b0f151eec0453
Reviewed-on: http://gerrit.chromium.org/gerrit/5302
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Tested-by: Julian Pastarmov <pastarmovj@chromium.org>

metrics/metrics_library_test.cc

diff --git a/metrics/metrics_library_test.cc b/metrics/metrics_library_test.cc
index 3b3dd95..0e58e01 100644
--- a/metrics/metrics_library_test.cc
+++ b/metrics/metrics_library_test.cc
@@ -135,8 +135,8 @@
     EXPECT_CALL(*device_policy_, GetMetricsEnabled(_))
         .WillOnce(SetMetricsPolicy(!to_value));
     ASSERT_EQ(!to_value, lib_.AreMetricsEnabled());
-    EXPECT_CALL(*device_policy_, GetMetricsEnabled(_))
-        .WillOnce(SetMetricsPolicy(to_value));
+    ON_CALL(*device_policy_, GetMetricsEnabled(_))
+        .WillByDefault(SetMetricsPolicy(to_value));
     if (lib_.AreMetricsEnabled() == !to_value)
       return;
   }