AutoFill Profiles dialog implemented according to new mocks on Mac

chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm

 // Copyright (c) 2010 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 "base/ref_counted.h"
 #import "chrome/browser/autofill/autofill_address_model_mac.h"
-#import "chrome/browser/autofill/autofill_address_view_controller_mac.h"
+#import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h"
-#import "chrome/browser/autofill/autofill_credit_card_view_controller_mac.h"
+#import "chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.h"
 #import "chrome/browser/autofill/autofill_dialog_controller_mac.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 213 matching lines @@
   // Contents should not match a different profile.
   CreditCard different_credit_card(ASCIIToUTF16("different"), 0);
   different_credit_card.SetInfo(
     AutoFillType(CREDIT_CARD_NUMBER), ASCIIToUTF16("1234"));
   for (i = 0; i < count; i++)
     ASSERT_NE(observer_.credit_cards_[i], different_credit_card);
 }
 
 TEST_F(AutoFillDialogControllerTest, AutoFillDataMutation) {
   AutoFillProfile profile(ASCIIToUTF16("Home"), 17);
-  profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("David"));
+  profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("John"));
   profile.SetInfo(AutoFillType(NAME_MIDDLE), ASCIIToUTF16("C"));
-  profile.SetInfo(AutoFillType(NAME_LAST), ASCIIToUTF16("Holloway"));
+  profile.SetInfo(AutoFillType(NAME_LAST), ASCIIToUTF16("Smith"));
   profile.SetInfo(AutoFillType(EMAIL_ADDRESS),
-      ASCIIToUTF16("dhollowa@chromium.org"));
+      ASCIIToUTF16("john@chromium.org"));
   profile.SetInfo(AutoFillType(COMPANY_NAME), ASCIIToUTF16("Google Inc."));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE1),
                   ASCIIToUTF16("1122 Mountain View Road"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE2), ASCIIToUTF16("Suite #1"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_CITY),
       ASCIIToUTF16("Mountain View"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_STATE), ASCIIToUTF16("CA"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_ZIP), ASCIIToUTF16("94111"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), ASCIIToUTF16("USA"));
   profile.SetInfo(
       AutoFillType(PHONE_HOME_WHOLE_NUMBER), ASCIIToUTF16("014155552258"));
   profile.SetInfo(
       AutoFillType(PHONE_FAX_WHOLE_NUMBER), ASCIIToUTF16("024087172258"));
   profiles().push_back(&profile);
 
   LoadDialog();
+  [controller_ selectAddressAtIndex:0];
+  [controller_ editSelection:nil];
 
-  AutoFillAddressModel* am = [[[controller_ addressFormViewControllers]
-      objectAtIndex:0] addressModel];
+  AutoFillAddressSheetController* sheet = [controller_ addressSheetController];
+  ASSERT_TRUE(sheet != nil);
+  AutoFillAddressModel* am = [sheet addressModel];
   EXPECT_TRUE([[am label] isEqualToString:@"Home"]);
-  EXPECT_TRUE([[am firstName] isEqualToString:@"David"]);
-  EXPECT_TRUE([[am middleName] isEqualToString:@"C"]);
-  EXPECT_TRUE([[am lastName] isEqualToString:@"Holloway"]);
-  EXPECT_TRUE([[am email] isEqualToString:@"dhollowa@chromium.org"]);
+  EXPECT_TRUE([[am fullName] isEqualToString:@"John C Smith"]);
+  EXPECT_TRUE([[am email] isEqualToString:@"john@chromium.org"]);
   EXPECT_TRUE([[am companyName] isEqualToString:@"Google Inc."]);
   EXPECT_TRUE([[am addressLine1] isEqualToString:@"1122 Mountain View Road"]);
   EXPECT_TRUE([[am addressLine2] isEqualToString:@"Suite #1"]);
   EXPECT_TRUE([[am addressCity] isEqualToString:@"Mountain View"]);
   EXPECT_TRUE([[am addressState] isEqualToString:@"CA"]);
   EXPECT_TRUE([[am addressZip] isEqualToString:@"94111"]);
   EXPECT_TRUE([[am phoneWholeNumber] isEqualToString:@"014155552258"]);
   EXPECT_TRUE([[am faxWholeNumber] isEqualToString:@"024087172258"]);
 
+  [sheet save:nil];
   [controller_ save:nil];
 
   ASSERT_TRUE(observer_.hit_);
   ASSERT_TRUE(observer_.profiles_.size() == 1);
 
   profiles()[0]->set_unique_id(observer_.profiles_[0].unique_id());
   ASSERT_EQ(observer_.profiles_[0], *profiles()[0]);
 }
 
 TEST_F(AutoFillDialogControllerTest, CreditCardDataMutation) {
   CreditCard credit_card(ASCIIToUTF16("myCC"), 345);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("DCH"));
   credit_card.SetInfo(
     AutoFillType(CREDIT_CARD_NUMBER), ASCIIToUTF16("1234 5678 9101 1121"));
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_MONTH), ASCIIToUTF16("01"));
   credit_card.SetInfo(
     AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), ASCIIToUTF16("2012"));
   credit_card.SetInfo(
     AutoFillType(CREDIT_CARD_VERIFICATION_CODE), ASCIIToUTF16("222"));
   credit_cards().push_back(&credit_card);
 
   LoadDialog();
+  [controller_ selectCreditCardAtIndex:0];
+  [controller_ editSelection:nil];
 
-  AutoFillCreditCardModel* cm = [[[controller_ creditCardFormViewControllers]
-      objectAtIndex:0] creditCardModel];
+  AutoFillCreditCardSheetController* sheet =
+      [controller_ creditCardSheetController];
+  ASSERT_TRUE(sheet != nil);
+  AutoFillCreditCardModel* cm = [sheet creditCardModel];
   EXPECT_TRUE([[cm label] isEqualToString:@"myCC"]);
   EXPECT_TRUE([[cm nameOnCard] isEqualToString:@"DCH"]);
   EXPECT_TRUE([[cm creditCardNumber] isEqualToString:@"1234 5678 9101 1121"]);
   EXPECT_TRUE([[cm expirationMonth] isEqualToString:@"01"]);
   EXPECT_TRUE([[cm expirationYear] isEqualToString:@"2012"]);
   EXPECT_TRUE([[cm cvcCode] isEqualToString:@"222"]);
 
+  [sheet save:nil];
   [controller_ save:nil];
 
   ASSERT_TRUE(observer_.hit_);
   ASSERT_TRUE(observer_.credit_cards_.size() == 1);
 
   credit_cards()[0]->set_unique_id(observer_.credit_cards_[0].unique_id());
   ASSERT_EQ(observer_.credit_cards_[0], *credit_cards()[0]);
 }
 
 TEST_F(AutoFillDialogControllerTest, TwoProfiles) {
@@ skipping 43 matching lines @@
     ASSERT_EQ(observer_.credit_cards_[i], *credit_cards()[i]);
   }
 }
 
 TEST_F(AutoFillDialogControllerTest, AddNewProfile) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile);
   LoadDialog();
   [controller_ addNewAddress:nil];
+  AutoFillAddressSheetController* sheet = [controller_ addressSheetController];
+  ASSERT_TRUE(sheet != nil);
+  [sheet save:nil];
   [controller_ save:nil];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 2.
   ASSERT_NE(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 2UL);
 
   // New address should match.
   AutoFillProfile new_profile(ASCIIToUTF16("New address"), 0);
   ASSERT_EQ(observer_.profiles_[1], new_profile);
 }
 
 TEST_F(AutoFillDialogControllerTest, AddNewCreditCard) {
   CreditCard credit_card(ASCIIToUTF16("Visa"), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card);
   LoadDialog();
   [controller_ addNewCreditCard:nil];
+  AutoFillCreditCardSheetController* sheet =
+      [controller_ creditCardSheetController];
+  ASSERT_TRUE(sheet != nil);
+  [sheet save:nil];
   [controller_ save:nil];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 2.
   ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
   ASSERT_EQ(observer_.credit_cards_.size(), 2UL);
 
   // New address should match.
   CreditCard new_credit_card(ASCIIToUTF16("New credit card"), 0);
   ASSERT_EQ(observer_.credit_cards_[1], new_credit_card);
 }
 
 TEST_F(AutoFillDialogControllerTest, DeleteProfile) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile);
   LoadDialog();
-  EXPECT_EQ([[[controller_ addressFormViewControllers] lastObject]
-              retainCount], 1UL);
-  [controller_ deleteAddress:[[controller_ addressFormViewControllers]
-      lastObject]];
+  [controller_ selectAddressAtIndex:0];
+  [controller_ deleteSelection:nil];
   [controller_ save:nil];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
   ASSERT_NE(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 0UL);
 }
 
 TEST_F(AutoFillDialogControllerTest, DeleteCreditCard) {
   CreditCard credit_card(ASCIIToUTF16("Visa"), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card);
   LoadDialog();
-  EXPECT_EQ([[[controller_ creditCardFormViewControllers] lastObject]
-              retainCount], 1UL);
-  [controller_ deleteCreditCard:[[controller_ creditCardFormViewControllers]
-      lastObject]];
+  [controller_ selectCreditCardAtIndex:0];
+  [controller_ deleteSelection:nil];
   [controller_ save:nil];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
   ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
   ASSERT_EQ(observer_.credit_cards_.size(), 0UL);
 }
 
 TEST_F(AutoFillDialogControllerTest, TwoProfilesDeleteOne) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile);
   AutoFillProfile profile2(ASCIIToUTF16("Two"), 2);
   profile2.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Bob"));
   profiles().push_back(&profile2);
   LoadDialog();
-  [controller_ deleteAddress:[[controller_ addressFormViewControllers]
-      lastObject]];
+  [controller_ selectAddressAtIndex:1];
+  [controller_ deleteSelection:nil];
   [controller_ save:nil];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
   ASSERT_NE(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 1UL);
 
   // First address should match.
   profiles()[0]->set_unique_id(observer_.profiles_[0].unique_id());
   ASSERT_EQ(observer_.profiles_[0], profile);
 }
 
 TEST_F(AutoFillDialogControllerTest, TwoCreditCardsDeleteOne) {
   CreditCard credit_card(ASCIIToUTF16("Visa"), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card);
   CreditCard credit_card2(ASCIIToUTF16("Mastercard"), 2);
   credit_card2.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Bob"));
   credit_cards().push_back(&credit_card2);
   LoadDialog();
-  [controller_ deleteCreditCard:[[controller_ creditCardFormViewControllers]
-      lastObject]];
+  [controller_ selectCreditCardAtIndex:1];
+  [controller_ deleteSelection:nil];
   [controller_ save:nil];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
   ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
   ASSERT_EQ(observer_.credit_cards_.size(), 1UL);
 
   // First credit card should match.
@@ skipping 92 matching lines @@
   // Sizes should match.
   ASSERT_EQ(1UL, observer_.profiles_.size());
   ASSERT_EQ(1UL, observer_.credit_cards_.size());
 
   // Contents should match.
   ASSERT_EQ(observer_.profiles_[0], profile);
   ASSERT_EQ(observer_.credit_cards_[0], credit_card);
 }
 
 }  // namespace