Removed spurious uses of RunUntilIdle from the MDnsClient unit tests

Removed unnecessary uses of RunUntilIdle from the MDnsClient unit tests,
since they were not helping the tests' correctness.

TEST=MDnsTest.*

Review URL: https://chromiumcodereview.appspot.com/17107002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206600 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 47 deletions

diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc
index 8f0b45a..aa1ea90 100644
--- a/net/dns/mdns_client_unittest.cc
+++ b/net/dns/mdns_client_unittest.cc
@@ -402,9 +402,9 @@ class MDnsTest : public ::testing::Test {
  public:
   MDnsTest();
   virtual ~MDnsTest();
+  virtual void TearDown() OVERRIDE;
   void DeleteTransaction();
   void DeleteBothListeners();
-  void RunUntilIdle();
   void RunFor(base::TimeDelta time_period);
   void Stop();
 
@@ -415,8 +415,6 @@ class MDnsTest : public ::testing::Test {
   void ExpectPacket(const char* packet, unsigned size);
   void SimulatePacketReceive(const char* packet, unsigned size);
 
-  base::MessageLoop* message_loop_;
-
   scoped_ptr<MDnsClientImpl> test_client_;
   IPEndPoint mdns_ipv4_endpoint_;
   StrictMock<MockSocketFactory>* socket_factory_;
@@ -437,8 +435,7 @@ class MockListenerDelegate : public MDnsListener::Delegate {
   MOCK_METHOD0(OnCachePurged, void());
 };
 
-MDnsTest::MDnsTest()
-    : message_loop_(base::MessageLoop::current()) {
+MDnsTest::MDnsTest() {
   socket_factory_ = new StrictMock<MockSocketFactory>();
   test_client_.reset(new MDnsClientImpl(
       scoped_ptr<MDnsConnection::SocketFactory>(socket_factory_)));
@@ -447,6 +444,14 @@ MDnsTest::MDnsTest()
 MDnsTest::~MDnsTest() {
 }
 
+void MDnsTest::TearDown() {
+  base::MessageLoop::current()->RunUntilIdle();
+
+  ASSERT_FALSE(test_client_->IsListeningForTests());
+
+  base::MessageLoop::current()->AssertIdle();
+}
+
 void MDnsTest::SimulatePacketReceive(const char* packet, unsigned size) {
   socket_factory_->SimulateReceive(packet, size);
 }
@@ -467,10 +472,6 @@ void MDnsTest::DeleteBothListeners() {
   listener2_.reset();
 }
 
-void MDnsTest::RunUntilIdle() {
-  base::MessageLoop::current()->RunUntilIdle();
-}
-
 void MDnsTest::RunFor(base::TimeDelta time_period) {
   base::CancelableCallback<void()> callback(base::Bind(&MDnsTest::Stop,
                                                        base::Unretained(this)));
@@ -541,13 +542,6 @@ TEST_F(MDnsTest, PassiveListeners) {
       .Times(Exactly(2));
 
   SimulatePacketReceive(kSamplePacket2, sizeof(kSamplePacket2));
-
-  // Test to make sure mdns listener is not active with no listeners present.
-  listener_ptr.reset();
-
-  RunUntilIdle();
-
-  ASSERT_FALSE(test_client_->IsListeningForTests());
 }
 
 TEST_F(MDnsTest, PassiveListenersCacheCleanup) {
@@ -571,8 +565,6 @@ TEST_F(MDnsTest, PassiveListenersCacheCleanup) {
 
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 
-  RunUntilIdle();
-
   EXPECT_TRUE(record_privet.IsRecordWith("_privet._tcp.local",
                                          "hello._privet._tcp.local"));
 
@@ -585,8 +577,6 @@ TEST_F(MDnsTest, PassiveListenersCacheCleanup) {
 
   RunFor(base::TimeDelta::FromSeconds(record_privet.ttl() + 1));
 
-  RunUntilIdle();
-
   EXPECT_TRUE(record_privet2.IsRecordWith("_privet._tcp.local",
                                           "hello._privet._tcp.local"));
 }
@@ -621,8 +611,6 @@ TEST_F(MDnsTest, MalformedPacket) {
   SimulatePacketReceive(kCorruptedPacketSalvagable,
                         sizeof(kCorruptedPacketSalvagable));
 
-  RunUntilIdle();
-
   EXPECT_TRUE(record_printer.IsRecordWith("_printer._tcp.local",
                                           "hello._printer._tcp.local"));
 }
@@ -652,12 +640,8 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) {
 
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 
-  RunUntilIdle();
-
   EXPECT_TRUE(record_privet.IsRecordWith("_privet._tcp.local",
                                          "hello._privet._tcp.local"));
-
-  EXPECT_FALSE(test_client_->IsListeningForTests());
 }
 
 TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
@@ -676,8 +660,6 @@ TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
   ASSERT_TRUE(transaction_privet->Start());
 
   EXPECT_FALSE(test_client_->IsListeningForTests());
-
-  RunUntilIdle();
 }
 
 TEST_F(MDnsTest, TransactionWithCache) {
@@ -693,7 +675,6 @@ TEST_F(MDnsTest, TransactionWithCache) {
 
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 
-  RunUntilIdle();
 
   PtrRecordCopyContainer record_privet;
 
@@ -712,8 +693,6 @@ TEST_F(MDnsTest, TransactionWithCache) {
 
   ASSERT_TRUE(transaction_privet->Start());
 
-  RunUntilIdle();
-
   EXPECT_TRUE(record_privet.IsRecordWith("_privet._tcp.local",
                                          "hello._privet._tcp.local"));
 }
@@ -739,8 +718,6 @@ TEST_F(MDnsTest, AdditionalRecords) {
 
   SimulatePacketReceive(kSamplePacketAdditionalOnly, sizeof(kSamplePacket1));
 
-  RunUntilIdle();
-
   EXPECT_TRUE(record_privet.IsRecordWith("_privet._tcp.local",
                                          "hello._privet._tcp.local"));
 }
@@ -767,8 +744,6 @@ TEST_F(MDnsTest, TransactionTimeout) {
       .WillOnce(InvokeWithoutArgs(this, &MDnsTest::Stop));
 
   RunFor(base::TimeDelta::FromSeconds(4));
-
-  EXPECT_FALSE(test_client_->IsListeningForTests());
 }
 
 TEST_F(MDnsTest, TransactionMultipleRecords) {
@@ -799,8 +774,6 @@ TEST_F(MDnsTest, TransactionMultipleRecords) {
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
   SimulatePacketReceive(kSamplePacket2, sizeof(kSamplePacket2));
 
-  RunUntilIdle();
-
   EXPECT_TRUE(record_privet.IsRecordWith("_privet._tcp.local",
                                          "hello._privet._tcp.local"));
 
@@ -811,8 +784,6 @@ TEST_F(MDnsTest, TransactionMultipleRecords) {
       .WillOnce(InvokeWithoutArgs(this, &MDnsTest::Stop));
 
   RunFor(base::TimeDelta::FromSeconds(4));
-
-  EXPECT_FALSE(test_client_->IsListeningForTests());
 }
 
 TEST_F(MDnsTest, TransactionReentrantDelete) {
@@ -839,8 +810,6 @@ TEST_F(MDnsTest, TransactionReentrantDelete) {
   RunFor(base::TimeDelta::FromSeconds(4));
 
   EXPECT_EQ(NULL, transaction_.get());
-
-  EXPECT_FALSE(test_client_->IsListeningForTests());
 }
 
 TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) {
@@ -867,8 +836,6 @@ TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) {
 
   ASSERT_TRUE(transaction_->Start());
 
-  RunUntilIdle();
-
   EXPECT_EQ(NULL, transaction_.get());
 }
 
@@ -899,12 +866,8 @@ TEST_F(MDnsTest, ListenerReentrantDelete) {
 
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 
-  RunUntilIdle();
-
   EXPECT_EQ(NULL, listener1_.get());
   EXPECT_EQ(NULL, listener2_.get());
-
-  EXPECT_FALSE(test_client_->IsListeningForTests());
 }
 
 // Note: These tests assume that the ipv4 socket will always be created first.