commit 3b29233b12ec948ca2118eefe69842f715d04428
author Darin Petkov <petkov@chromium.org> Thu Jul 28 14:17:24 2011 -0700
committer Darin Petkov <petkov@chromium.org> Thu Jul 28 14:35:03 2011 -0700
tree d9227b6c447039df86e0e44890b0c1da9903179d
parent 51a7e939ed0d260392a40bc5d58e6d2651c6ddc0

shill: Fix memory management for mock proxies in Modem and ModemManager tests.

This way ensures there're no leaks, double deletes or multiple proxies
created. Also, it's consistent with other tests.

BUG=none
TEST=unit tests

Change-Id: I58c1fa7ded7d61bb10458c6315f5ed6263cf9e85
Reviewed-on: http://gerrit.chromium.org/gerrit/4955
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>

modem_unittest.cc

diff --git a/modem_unittest.cc b/modem_unittest.cc
index c37a0a8..8d73530 100644
--- a/modem_unittest.cc
+++ b/modem_unittest.cc
@@ -43,7 +43,8 @@
  public:
   ModemTest()
       : manager_(&control_interface_, &dispatcher_, &glib_),
-        proxy_factory_(&dbus_properties_proxy_),
+        proxy_(new MockDBusPropertiesProxy()),
+        proxy_factory_(this),
         modem_(kOwner, kPath, &control_interface_, &dispatcher_, &manager_) {}
 
   virtual void SetUp();
@@ -56,30 +57,27 @@
  protected:
   class TestProxyFactory : public ProxyFactory {
    public:
-    TestProxyFactory(DBusPropertiesProxyInterface *dbus_properties_proxy)
-        : dbus_properties_proxy_(dbus_properties_proxy) {}
+    TestProxyFactory(ModemTest *test) : test_(test) {}
 
     virtual DBusPropertiesProxyInterface *CreateDBusPropertiesProxy(
         Modem *modem,
         const string &path,
         const string &service) {
-      return dbus_properties_proxy_;
+      return test_->proxy_.release();
     }
 
    private:
-    DBusPropertiesProxyInterface *dbus_properties_proxy_;
+    ModemTest *test_;
   };
 
   static const char kOwner[];
   static const char kPath[];
 
-  void ReleaseDBusPropertiesProxy();
-
   MockGLib glib_;
   MockControl control_interface_;
   EventDispatcher dispatcher_;
   Manager manager_;
-  MockDBusPropertiesProxy dbus_properties_proxy_;
+  scoped_ptr<MockDBusPropertiesProxy> proxy_;
   TestProxyFactory proxy_factory_;
   Modem modem_;
   StrictMock<MockSockets> sockets_;
@@ -96,25 +94,16 @@
 }
 
 void ModemTest::TearDown() {
-  ReleaseDBusPropertiesProxy();
   ProxyFactory::set_factory(NULL);
   SetSockets(NULL);
 }
 
-void ModemTest::ReleaseDBusPropertiesProxy() {
-  DBusPropertiesProxyInterface *dbus_properties_proxy =
-      modem_.dbus_properties_proxy_.release();
-  EXPECT_TRUE(dbus_properties_proxy == NULL ||
-              dbus_properties_proxy == &dbus_properties_proxy_);
-}
-
 TEST_F(ModemTest, Init) {
   DBusPropertiesMap props;
   props[Modem::kPropertyIPMethod].writer().append_uint32(
       MM_MODEM_IP_METHOD_DHCP);
   props[Modem::kPropertyLinkName].writer().append_string("usb1");
-  EXPECT_CALL(dbus_properties_proxy_, GetAll(MM_MODEM_INTERFACE))
-      .WillOnce(Return(props));
+  EXPECT_CALL(*proxy_, GetAll(MM_MODEM_INTERFACE)).WillOnce(Return(props));
   EXPECT_TRUE(modem_.task_factory_.empty());
   modem_.Init();
   EXPECT_FALSE(modem_.task_factory_.empty());