commit 61c0eace942806af6a21d84d5e522218f0c4889b
author Gaurav Shah <gauravsh@google.com> Tue Apr 09 17:09:42 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Apr 15 12:06:09 2013 -0700
tree 15a37a2cd44139b61326589360a523acb594e454
parent bb9fca2e550f92d694867f0bcf0efe9426dfc2bb

shill: Change how mock ipconfig expectations are set on a device

EXPECT_CALL() doesn't seem to to do the right thing on gtest/gmock-1.6
resulting in a unit test. Instead, use Device::set_ipconfig() to set
the mock IPConfig object to use on a MockDevice.

BUG=chromium:211445
TEST=built and ran shill unit tests

Change-Id: I63ec481235eccfa2a3a1594dc6ff94acca07d23c
Reviewed-on: https://gerrit.chromium.org/gerrit/47701
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Gaurav Shah <gauravsh@chromium.org>
Tested-by: Gaurav Shah <gauravsh@chromium.org>

mock_device.h

diff --git a/mock_device.h b/mock_device.h
index 54b6a7a..dc9060b 100644
--- a/mock_device.h
+++ b/mock_device.h
@@ -47,7 +47,6 @@
   MOCK_METHOD0(GetTransmitByteCount, uint64());
   MOCK_CONST_METHOD1(IsConnectedToService, bool(const ServiceRefPtr &service));
   MOCK_CONST_METHOD0(technology, Technology::Identifier());
-  MOCK_CONST_METHOD0(ipconfig, const IPConfigRefPtr &());
   MOCK_METHOD0(OnBeforeSuspend, void());
   MOCK_METHOD0(OnAfterResume, void());
   MOCK_METHOD0(OnConnectionUpdated, void());

traffic_monitor_unittest.cc

diff --git a/traffic_monitor_unittest.cc b/traffic_monitor_unittest.cc
index 695790b..cd078ef 100644
--- a/traffic_monitor_unittest.cc
+++ b/traffic_monitor_unittest.cc
@@ -67,11 +67,10 @@
     monitor_.socket_info_reader_.reset(
         mock_socket_info_reader_);  // Passes ownership
 
+    device_->set_ipconfig(ipconfig_);
     ipconfig_properties_.address = kLocalIpAddr;
     EXPECT_CALL(*ipconfig_.get(), properties())
         .WillRepeatedly(ReturnRef(ipconfig_properties_));
-    EXPECT_CALL(*device_.get(), ipconfig())
-        .WillRepeatedly(ReturnRef(ipconfig_));
   }
 
   void VerifyStopped() {