commit 2176a88f197d802924d2a83d368e3efab7a6be4b
author Chris Masone <cmasone@chromium.org> Wed Sep 14 22:29:15 2011 -0700
committer Chris Masone <cmasone@chromium.org> Thu Sep 15 10:26:29 2011 -0700
tree 9dc47309952bb163d993d273f2b56a90f5a8e7b9
parent 9d779936d8f8c2d74b30883e2a2622c4207fe797

[shill] Get rid of protected data members in PropertyStoreTest

BUG=chromium-os:19573
TEST=unit
STATUS=Verified

Change-Id: Ib3a2f19abb8cc4aa0e8410fc26bbb60891e35da7
Reviewed-on: http://gerrit.chromium.org/gerrit/7762
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>

device_unittest.cc

diff --git a/device_unittest.cc b/device_unittest.cc
index 96f6890..a92cfed 100644
--- a/device_unittest.cc
+++ b/device_unittest.cc
@@ -44,14 +44,14 @@
 class DeviceTest : public PropertyStoreTest {
  public:
   DeviceTest()
-      : device_(new Device(&control_interface_,
+      : device_(new Device(control_interface(),
                            NULL,
                            NULL,
                            kDeviceName,
                            kDeviceAddress,
                            0)) {
-    DHCPProvider::GetInstance()->glib_ = &glib_;
-    DHCPProvider::GetInstance()->control_interface_ = &control_interface_;
+    DHCPProvider::GetInstance()->glib_ = glib();
+    DHCPProvider::GetInstance()->control_interface_ = control_interface();
   }
   virtual ~DeviceTest() {}
 
@@ -59,7 +59,6 @@
   static const char kDeviceName[];
   static const char kDeviceAddress[];
 
-  MockGLib glib_;
   MockControl control_interface_;
   DeviceRefPtr device_;
 };
@@ -116,7 +115,7 @@
 
 TEST_F(DeviceTest, DestroyIPConfig) {
   ASSERT_FALSE(device_->ipconfig_.get());
-  device_->ipconfig_ = new IPConfig(&control_interface_, kDeviceName);
+  device_->ipconfig_ = new IPConfig(control_interface(), kDeviceName);
   device_->DestroyIPConfig();
   ASSERT_FALSE(device_->ipconfig_.get());
 }
@@ -128,8 +127,8 @@
 }
 
 TEST_F(DeviceTest, AcquireDHCPConfig) {
-  device_->ipconfig_ = new IPConfig(&control_interface_, "randomname");
-  EXPECT_CALL(glib_, SpawnAsync(_, _, _, _, _, _, _, _))
+  device_->ipconfig_ = new IPConfig(control_interface(), "randomname");
+  EXPECT_CALL(*glib(), SpawnAsync(_, _, _, _, _, _, _, _))
       .WillOnce(Return(false));
   EXPECT_FALSE(device_->AcquireDHCPConfig());
   ASSERT_TRUE(device_->ipconfig_.get());
@@ -156,7 +155,7 @@
   EXPECT_CALL(storage, SetBool(id, _, _))
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
-  scoped_refptr<MockIPConfig> ipconfig = new MockIPConfig(&control_interface_,
+  scoped_refptr<MockIPConfig> ipconfig = new MockIPConfig(control_interface(),
                                                           kDeviceName);
   EXPECT_CALL(*ipconfig.get(), Save(_, _))
       .WillOnce(Return(true));
@@ -175,8 +174,8 @@
   EXPECT_FALSE(device_->selected_service_.get());
   device_->SetServiceState(Service::kStateAssociating);
   scoped_refptr<MockService> service(
-      new StrictMock<MockService>(&control_interface_,
-                                  &dispatcher_,
+      new StrictMock<MockService>(control_interface(),
+                                  dispatcher(),
                                   manager()));
   device_->SelectService(service);
   EXPECT_TRUE(device_->selected_service_.get() == service.get());