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>

dhcp_config_unittest.cc

diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 9ca6592..a8c7b8a 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -38,10 +38,10 @@
       : proxy_(new MockDHCPProxy()),
         proxy_factory_(this),
         config_(new DHCPConfig(&control_,
-                               &dispatcher_,
+                               dispatcher(),
                                DHCPProvider::GetInstance(),
                                kDeviceName,
-                               &glib_)) {}
+                               glib())) {}
 
   virtual void SetUp() {
     ProxyFactory::set_factory(&proxy_factory_);
@@ -64,7 +64,6 @@
     DHCPConfigTest *test_;
   };
 
-  MockGLib glib_;
   scoped_ptr<MockDHCPProxy> proxy_;
   TestProxyFactory proxy_factory_;
   MockControl control_;
@@ -85,7 +84,7 @@
 
   EXPECT_TRUE(proxy_.get());
   EXPECT_FALSE(config_->proxy_.get());
-  dispatcher_.DispatchPendingEvents();
+  dispatcher()->DispatchPendingEvents();
   EXPECT_FALSE(proxy_.get());
   EXPECT_TRUE(config_->proxy_.get());
 
@@ -146,9 +145,9 @@
 }
 
 TEST_F(DHCPConfigTest, StartFail) {
-  EXPECT_CALL(glib_, SpawnAsync(_, _, _, _, _, _, _, _))
+  EXPECT_CALL(*glib(), SpawnAsync(_, _, _, _, _, _, _, _))
       .WillOnce(Return(false));
-  EXPECT_CALL(glib_, ChildWatchAdd(_, _, _)).Times(0);
+  EXPECT_CALL(*glib(), ChildWatchAdd(_, _, _)).Times(0);
   EXPECT_FALSE(config_->Start());
   EXPECT_EQ(0, config_->pid_);
 }
@@ -261,11 +260,11 @@
   config_->pid_ = kPID1;
   config_->child_watch_tag_ = kTag1;
   DHCPProvider::GetInstance()->BindPID(kPID1, config_);
-  EXPECT_CALL(glib_, SourceRemove(kTag1)).WillOnce(Return(true));
-  EXPECT_CALL(glib_, SpawnClosePID(kPID1)).Times(1);
-  EXPECT_CALL(glib_, SpawnAsync(_, _, _, _, _, _, _, _))
+  EXPECT_CALL(*glib(), SourceRemove(kTag1)).WillOnce(Return(true));
+  EXPECT_CALL(*glib(), SpawnClosePID(kPID1)).Times(1);
+  EXPECT_CALL(*glib(), SpawnAsync(_, _, _, _, _, _, _, _))
       .WillOnce(DoAll(SetArgumentPointee<6>(kPID2), Return(true)));
-  EXPECT_CALL(glib_, ChildWatchAdd(kPID2, _, _)).WillOnce(Return(kTag2));
+  EXPECT_CALL(*glib(), ChildWatchAdd(kPID2, _, _)).WillOnce(Return(kTag2));
   EXPECT_TRUE(config_->Restart());
   EXPECT_EQ(kPID2, config_->pid_);
   EXPECT_EQ(config_.get(), DHCPProvider::GetInstance()->GetConfig(kPID2).get());
@@ -278,11 +277,11 @@
 TEST_F(DHCPConfigTest, RestartNoClient) {
   const int kPID = 777;
   const unsigned int kTag = 66;
-  EXPECT_CALL(glib_, SourceRemove(_)).Times(0);
-  EXPECT_CALL(glib_, SpawnClosePID(_)).Times(0);
-  EXPECT_CALL(glib_, SpawnAsync(_, _, _, _, _, _, _, _))
+  EXPECT_CALL(*glib(), SourceRemove(_)).Times(0);
+  EXPECT_CALL(*glib(), SpawnClosePID(_)).Times(0);
+  EXPECT_CALL(*glib(), SpawnAsync(_, _, _, _, _, _, _, _))
       .WillOnce(DoAll(SetArgumentPointee<6>(kPID), Return(true)));
-  EXPECT_CALL(glib_, ChildWatchAdd(kPID, _, _)).WillOnce(Return(kTag));
+  EXPECT_CALL(*glib(), ChildWatchAdd(kPID, _, _)).WillOnce(Return(kTag));
   EXPECT_TRUE(config_->Restart());
   EXPECT_EQ(kPID, config_->pid_);
   EXPECT_EQ(config_.get(), DHCPProvider::GetInstance()->GetConfig(kPID).get());
@@ -295,9 +294,9 @@
 TEST_F(DHCPConfigTest, StartSuccess) {
   const int kPID = 123456;
   const unsigned int kTag = 55;
-  EXPECT_CALL(glib_, SpawnAsync(_, _, _, _, _, _, _, _))
+  EXPECT_CALL(*glib(), SpawnAsync(_, _, _, _, _, _, _, _))
       .WillOnce(DoAll(SetArgumentPointee<6>(kPID), Return(true)));
-  EXPECT_CALL(glib_, ChildWatchAdd(kPID, _, _)).WillOnce(Return(kTag));
+  EXPECT_CALL(*glib(), ChildWatchAdd(kPID, _, _)).WillOnce(Return(kTag));
   EXPECT_TRUE(config_->Start());
   EXPECT_EQ(kPID, config_->pid_);
   EXPECT_EQ(config_.get(), DHCPProvider::GetInstance()->GetConfig(kPID).get());
@@ -316,7 +315,7 @@
   ASSERT_TRUE(file_util::PathExists(pid_file));
   ASSERT_TRUE(file_util::PathExists(lease_file));
 
-  EXPECT_CALL(glib_, SpawnClosePID(kPID)).Times(1);
+  EXPECT_CALL(*glib(), SpawnClosePID(kPID)).Times(1);
   DHCPConfig::ChildWatchCallback(kPID, 0, config_.get());
   EXPECT_EQ(NULL, DHCPProvider::GetInstance()->GetConfig(kPID).get());
   EXPECT_FALSE(file_util::PathExists(pid_file));
@@ -329,7 +328,7 @@
   config_->Stop();
   config_->pid_ = kPID;
   config_->Stop();
-  EXPECT_CALL(glib_, SpawnClosePID(kPID)).Times(1);  // Invoked by destructor.
+  EXPECT_CALL(*glib(), SpawnClosePID(kPID)).Times(1);  // Invoked by destructor.
 }
 
 TEST_F(DHCPConfigTest, Dispatch) {