commit e3d4b3cde7c8f4c3f27a88014b64de814dc9acb7
author mukesh agrawal <quiche@chromium.org> Wed Jul 31 18:38:55 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Aug 05 13:38:45 2013 -0700
tree 780c5ee34c3568cc8c3a966ee369f138779751b6
parent b26347a48e976a890210bb5fcc28892ac7df42e9

shill: add unit test for ExternalTask::DestroyLater

The new test verifies that DestroyLater defers actual destruction
of the ExternalTask to the event loop.

While there: refactor some code, to reduce duplication across
test cases.

BUG=chromium:246826
TEST=unit tests (old+new)

Change-Id: Idd3ad4e447f2f59132742d6daca5699328e950df
Reviewed-on: https://gerrit.chromium.org/gerrit/64018
Commit-Queue: mukesh agrawal <quiche@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>

external_task_unittest.cc

diff --git a/external_task_unittest.cc b/external_task_unittest.cc
index 7922d64..b5663d8 100644
--- a/external_task_unittest.cc
+++ b/external_task_unittest.cc
@@ -29,6 +29,7 @@
 using testing::_;
 using testing::Matcher;
 using testing::MatchesRegex;
+using testing::Mock;
 using testing::NiceMock;
 using testing::Return;
 using testing::SetArgumentPointee;
@@ -71,6 +72,26 @@
     test_rpc_task_destroyed_ = destroyed;
   }
 
+  // Defined out-of-line, due to dependency on TestRPCTask.
+  void FakeUpRunningProcess(unsigned int tag, int pid);
+
+  void ExpectStop(unsigned int tag, int pid) {
+    EXPECT_CALL(glib_, SourceRemove(tag));
+    EXPECT_CALL(process_killer_, Kill(pid, _));
+  }
+
+  void VerifyStop() {
+    if (external_task_) {
+      EXPECT_EQ(0, external_task_->child_watch_tag_);
+      EXPECT_EQ(0, external_task_->pid_);
+      EXPECT_FALSE(external_task_->rpc_task_);
+    }
+    EXPECT_TRUE(test_rpc_task_destroyed_);
+    // Make sure EXPECTations were met before the fixture's dtor.
+    Mock::VerifyAndClearExpectations(&glib_);
+    Mock::VerifyAndClearExpectations(&process_killer_);
+  }
+
  protected:
   // Implements RPCTaskDelegate interface.
   MOCK_METHOD2(GetLogin, void(string *user, string *password));
@@ -113,16 +134,29 @@
 
 }  // namespace
 
+void ExternalTaskTest::FakeUpRunningProcess(unsigned int tag, int pid) {
+  external_task_->child_watch_tag_ = tag;
+  external_task_->pid_ = pid;
+  external_task_->rpc_task_.reset(new TestRPCTask(&control_, this));
+}
+
 TEST_F(ExternalTaskTest, Destructor) {
   const unsigned int kTag = 123;
-  external_task_->child_watch_tag_ = kTag;
-  EXPECT_CALL(glib_, SourceRemove(kTag));
   const int kPID = 123456;
-  external_task_->pid_ = kPID;
-  EXPECT_CALL(process_killer_, Kill(kPID, _));
-  external_task_->rpc_task_.reset(new TestRPCTask(&control_, this));
+  FakeUpRunningProcess(kTag, kPID);
+  ExpectStop(kTag, kPID);
   external_task_.reset();
-  EXPECT_TRUE(test_rpc_task_destroyed_);
+  VerifyStop();
+}
+
+TEST_F(ExternalTaskTest, DestroyLater) {
+  const unsigned int kTag = 123;
+  const int kPID = 123456;
+  FakeUpRunningProcess(kTag, kPID);
+  ExpectStop(kTag, kPID);
+  external_task_.release()->DestroyLater(&dispatcher_);
+  dispatcher_.DispatchPendingEvents();
+  VerifyStop();
 }
 
 namespace {
@@ -195,18 +229,12 @@
 
 TEST_F(ExternalTaskTest, Stop) {
   const unsigned int kTag = 123;
-  external_task_->child_watch_tag_ = kTag;
-  EXPECT_CALL(glib_, SourceRemove(kTag));
   const int kPID = 123456;
-  external_task_->pid_ = kPID;
-  EXPECT_CALL(process_killer_, Kill(kPID, _));
-  external_task_->rpc_task_.reset(new TestRPCTask(&control_, this));
+  FakeUpRunningProcess(kTag, kPID);
+  ExpectStop(kTag, kPID);
   external_task_->Stop();
-
-  EXPECT_EQ(0, external_task_->child_watch_tag_);
-  EXPECT_EQ(0, external_task_->pid_);
-  EXPECT_FALSE(external_task_->rpc_task_);
-  EXPECT_TRUE(test_rpc_task_destroyed_);
+  ASSERT_TRUE(external_task_);
+  VerifyStop();
 }
 
 TEST_F(ExternalTaskTest, StopNotStarted) {