contacts: Add ContactMap class.

chrome/browser/chromeos/contacts/google_contact_store_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 "chrome/browser/chromeos/contacts/google_contact_store.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/time.h"
@@ skipping 127 matching lines @@
   store_->Init();
   ContactPointers loaded_contacts;
   store_->AppendContacts(&loaded_contacts);
   EXPECT_EQ(VarContactsToString(2, contact1.get(), contact2.get()),
             ContactsToString(loaded_contacts));
   EXPECT_TRUE(test_api_->update_scheduled());
   EXPECT_EQ(1, observer_.num_updates());
 
   // The contacts should've been saved to the database, too.
   EXPECT_EQ(VarContactsToString(2, contact1.get(), contact2.get()),
-            ContactsToString(db_->contacts()));
+            ContactMapToString(db_->contacts()));
 }
 
 TEST_F(GoogleContactStoreTest, UpdateFromGData) {
   scoped_ptr<Contact> contact1(new Contact);
   InitContact("contact1", "1", false, contact1.get());
   scoped_ptr<Contact> contact2(new Contact);
   InitContact("contact2", "2", false, contact2.get());
   scoped_ptr<Contact> contact3(new Contact);
   InitContact("contact3", "3", false, contact3.get());
 
@@ skipping 21 matching lines @@
   ContactPointers loaded_contacts;
   store_->AppendContacts(&loaded_contacts);
   EXPECT_EQ(VarContactsToString(
                 3, contact1.get(), contact2.get(), contact3.get()),
             ContactsToString(loaded_contacts));
   EXPECT_EQ(2, observer_.num_updates());
 
   // All three contacts should've been saved to the database.
   EXPECT_EQ(VarContactsToString(
                 3, contact1.get(), contact2.get(), contact3.get()),
-            ContactsToString(db_->contacts()));
+            ContactMapToString(db_->contacts()));
   EXPECT_EQ(3, db_->num_saved_contacts());
   EXPECT_TRUE(test_api_->update_scheduled());
 }
 
 TEST_F(GoogleContactStoreTest, FetchUpdatedContacts) {
   scoped_ptr<Contact> contact1(new Contact);
   InitContact("contact1", "1", false, contact1.get());
   scoped_ptr<Contact> contact2(new Contact);
   InitContact("contact2", "2", false, contact2.get());
   scoped_ptr<Contact> contact3(new Contact);
   InitContact("contact3", "3", false, contact3.get());
 
   ContactPointers kAllContacts;
   kAllContacts.push_back(contact1.get());
   kAllContacts.push_back(contact2.get());
   kAllContacts.push_back(contact3.get());
 
   // Tell the GData service to return all three contacts in response to a full
   // update.
   ContactPointers gdata_contacts(kAllContacts);
   gdata_service_->SetContacts(gdata_contacts, base::Time());
 
   // All the contacts should be loaded and saved to the database.
   store_->Init();
   ContactPointers loaded_contacts;
   store_->AppendContacts(&loaded_contacts);
   EXPECT_EQ(ContactsToString(kAllContacts), ContactsToString(loaded_contacts));
-  EXPECT_EQ(ContactsToString(kAllContacts), ContactsToString(db_->contacts()));
+  EXPECT_EQ(ContactsToString(kAllContacts),
+            ContactMapToString(db_->contacts()));
   EXPECT_EQ(static_cast<int>(kAllContacts.size()), db_->num_saved_contacts());
   EXPECT_TRUE(test_api_->update_scheduled());
   EXPECT_EQ(1, observer_.num_updates());
   observer_.reset_stats();
 
   // Update the third contact.
   contact3->set_full_name("new full name");
   base::Time old_contact3_update_time =
       base::Time::FromInternalValue(contact3->update_time());
   contact3->set_update_time(
       (old_contact3_update_time +
        base::TimeDelta::FromSeconds(10)).ToInternalValue());
   gdata_contacts.clear();
   gdata_contacts.push_back(contact3.get());
   gdata_service_->SetContacts(
       gdata_contacts,
       old_contact3_update_time + base::TimeDelta::FromMilliseconds(1));
 
   // Check that the updated contact is loaded (i.e. the store passed the
   // correct minimum update time to the service) and saved back to the database.
   db_->reset_stats();
   test_api_->DoUpdate();
   loaded_contacts.clear();
   store_->AppendContacts(&loaded_contacts);
   EXPECT_EQ(ContactsToString(kAllContacts), ContactsToString(loaded_contacts));
-  EXPECT_EQ(ContactsToString(kAllContacts), ContactsToString(db_->contacts()));
+  EXPECT_EQ(ContactsToString(kAllContacts),
+            ContactMapToString(db_->contacts()));
   EXPECT_EQ(1, db_->num_saved_contacts());
   EXPECT_TRUE(test_api_->update_scheduled());
   EXPECT_EQ(1, observer_.num_updates());
   observer_.reset_stats();
 
   // The next update should be based on the third contact's new update time.
   contact3->set_full_name("yet another full name");
   gdata_service_->SetContacts(
       gdata_contacts,
       base::Time::FromInternalValue(contact3->update_time()) +
       base::TimeDelta::FromMilliseconds(1));
 
   db_->reset_stats();
   test_api_->DoUpdate();
   loaded_contacts.clear();
   store_->AppendContacts(&loaded_contacts);
   EXPECT_EQ(ContactsToString(kAllContacts), ContactsToString(loaded_contacts));
-  EXPECT_EQ(ContactsToString(kAllContacts), ContactsToString(db_->contacts()));
+  EXPECT_EQ(ContactsToString(kAllContacts),
+            ContactMapToString(db_->contacts()));
   EXPECT_EQ(1, db_->num_saved_contacts());
   EXPECT_TRUE(test_api_->update_scheduled());
   EXPECT_EQ(1, observer_.num_updates());
 }
 
 TEST_F(GoogleContactStoreTest, DontReturnDeletedContacts) {
   // Tell GData to return a single deleted contact.
   const std::string kContactId = "contact";
   scoped_ptr<Contact> contact(new Contact);
   InitContact(kContactId, "1", true, contact.get());
@@ skipping 133 matching lines @@
   EXPECT_EQ(0, gdata_service_->num_download_requests());
 
   // When we're back online, the update should happen.
   gdata_service_->reset_stats();
   test_api_->NotifyAboutNetworkStateChange(true);
   EXPECT_EQ(1, gdata_service_->num_download_requests());
 }
 
 }  // namespace test
 }  // namespace contacts