Refactored PairingRegistry::Delegate such that it can retrieve/modify for a single client.

remoting/protocol/pairing_registry_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/pairing_registry.h"
 
 #include <stdlib.h>
 
 #include <algorithm>
 
@@ skipping 64 matching lines @@
   scoped_ptr<base::ListValue> pairings_;
 };
 
 TEST_F(PairingRegistryTest, CreateAndGetPairings) {
   MockPairingRegistryDelegate* mock_delegate =
       new MockPairingRegistryDelegate();
   scoped_ptr<PairingRegistry::Delegate> delegate(mock_delegate);
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("my_client");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("my_client");

[Jamie, 2013/07/30 21:35:07]

I think a lot of these DrainCallbacks are redundant. You only really need one at
the end of each test, perhaps followed by an appropriate EXPECT_EQ for
callback_count_. The only case where you might want more than one is to get a
better sense for where the test fails by using multiple EXPECT_EQ statements (as
we do in this test).

[alexeypa (please no reviews), 2013/07/31 21:31:24]

Done.

-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   EXPECT_NE(pairing_1.shared_secret(), pairing_2.shared_secret());
 
   registry->GetPairing(pairing_1.client_id(),
                        base::Bind(&PairingRegistryTest::ExpectSecret,
                                   base::Unretained(this),
                                   pairing_1.shared_secret()));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   EXPECT_EQ(1, callback_count_);
 
   // Check that the second client is paired with a different shared secret.
   registry->GetPairing(pairing_2.client_id(),
                        base::Bind(&PairingRegistryTest::ExpectSecret,
                                   base::Unretained(this),
                                   pairing_2.shared_secret()));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   EXPECT_EQ(2, callback_count_);
 }
 
 TEST_F(PairingRegistryTest, GetAllPairings) {
   MockPairingRegistryDelegate* mock_delegate =
       new MockPairingRegistryDelegate();
   scoped_ptr<PairingRegistry::Delegate> delegate(mock_delegate);
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   ASSERT_EQ(2u, pairings_->GetSize());
   const base::DictionaryValue* actual_pairing_1;
   const base::DictionaryValue* actual_pairing_2;
   ASSERT_TRUE(pairings_->GetDictionary(0, &actual_pairing_1));
   ASSERT_TRUE(pairings_->GetDictionary(1, &actual_pairing_2));
 
   // Ordering is not guaranteed, so swap if necessary.
   std::string actual_client_id;
   ASSERT_TRUE(actual_pairing_1->GetString(PairingRegistry::kClientIdKey,
                                           &actual_client_id));
   if (actual_client_id != pairing_1.client_id()) {
     std::swap(actual_pairing_1, actual_pairing_2);
   }
 
   VerifyPairing(pairing_1, *actual_pairing_1);
   VerifyPairing(pairing_2, *actual_pairing_2);
 }
 
 TEST_F(PairingRegistryTest, DeletePairing) {
   MockPairingRegistryDelegate* mock_delegate =
       new MockPairingRegistryDelegate();
   scoped_ptr<PairingRegistry::Delegate> delegate(mock_delegate);
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   registry->DeletePairing(
       pairing_1.client_id(),
       base::Bind(&PairingRegistryTest::ExpectSaveSuccess,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   // Re-read the list, and verify it only has the pairing_2 client.
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   ASSERT_EQ(1u, pairings_->GetSize());
   const base::DictionaryValue* actual_pairing_2;
   ASSERT_TRUE(pairings_->GetDictionary(0, &actual_pairing_2));
   std::string actual_client_id;
   ASSERT_TRUE(actual_pairing_2->GetString(PairingRegistry::kClientIdKey,
                                           &actual_client_id));
   EXPECT_EQ(pairing_2.client_id(), actual_client_id);
 }
 
 TEST_F(PairingRegistryTest, ClearAllPairings) {
   MockPairingRegistryDelegate* mock_delegate =
       new MockPairingRegistryDelegate();
   scoped_ptr<PairingRegistry::Delegate> delegate(mock_delegate);
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   registry->ClearAllPairings(
       base::Bind(&PairingRegistryTest::ExpectSaveSuccess,
                  base::Unretained(this)));
 
   // Re-read the list, and verify it is empty.
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   EXPECT_TRUE(pairings_->empty());
 }
 
 TEST_F(PairingRegistryTest, SerializedRequests) {
   MockPairingRegistryDelegate* mock_delegate =
       new MockPairingRegistryDelegate();
   scoped_ptr<PairingRegistry::Delegate> delegate(mock_delegate);
-  mock_delegate->set_run_save_callback_automatically(false);
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
   registry->GetPairing(
       pairing_1.client_id(),
       base::Bind(&PairingRegistryTest::ExpectClientName,
                  base::Unretained(this), "client1"));
   registry->GetPairing(
       pairing_2.client_id(),
@@ skipping 16 matching lines @@
                  base::Unretained(this)));
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::ExpectNoPairings,
                  base::Unretained(this)));
   PairingRegistry::Pairing pairing_3 = registry->CreatePairing("client3");
   registry->GetPairing(
       pairing_3.client_id(),
       base::Bind(&PairingRegistryTest::ExpectClientName,
                  base::Unretained(this), "client3"));
 
-  while (mock_delegate->HasCallback()) {
-    mock_delegate->RunCallback();
-  }
+  mock_delegate->DrainCallbacks();
 
   EXPECT_EQ(8, callback_count_);
 }
 
 }  // namespace protocol
 }  // namespace remoting