New encryption/escrow endpoints for Wallet

chrome/browser/ui/autofill/autofill_dialog_controller_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 <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 151 matching lines @@
   TestWalletClient(net::URLRequestContextGetter* context,
                    wallet::WalletClientDelegate* delegate)
       : wallet::WalletClient(context, delegate) {}
   virtual ~TestWalletClient() {}
 
   MOCK_METHOD3(AcceptLegalDocuments,
       void(const std::vector<wallet::WalletItems::LegalDocument*>& documents,
            const std::string& google_transaction_id,
            const GURL& source_url));
 
-  MOCK_METHOD3(AuthenticateInstrument,
+  MOCK_METHOD2(AuthenticateInstrument,
       void(const std::string& instrument_id,
-           const std::string& card_verification_number,
-           const std::string& obfuscated_gaia_id));
+           const std::string& card_verification_number));
 
   MOCK_METHOD1(GetFullWallet,
       void(const wallet::WalletClient::FullWalletRequest& request));
 
   MOCK_METHOD1(GetWalletItems, void(const GURL& source_url));
 
-  MOCK_METHOD2(SaveAddress,
-      void(const wallet::Address& address, const GURL& source_url));
+  // Methods with scoped_ptrs can't be mocked but by using the implementation
+  // below the same effect can be achieved.
+  virtual void SaveToWallet(scoped_ptr<wallet::Instrument> instrument,
+                            scoped_ptr<wallet::Address> address,
+                            const GURL& source_url) OVERRIDE {
+    SaveToWalletTester(instrument.get(), address.get(), source_url);
+  }
 
-  MOCK_METHOD3(SaveInstrument,
-      void(const wallet::Instrument& instrument,
-           const std::string& obfuscated_gaia_id,
+  MOCK_METHOD3(SaveToWalletTester,
+      void(wallet::Instrument* instrument,
+           wallet::Address* address,

[Dane Wallinga, 2013/07/01 23:00:07]

Genuinely don't get what the rules are here. Why do these arguments have to line
up, but the start of the void() call one line up doesn't need to be in line with
SaveToWalletTester on 189?

[ahutter, 2013/07/01 23:15:16]

Done.

            const GURL& source_url));
 
-  MOCK_METHOD4(SaveInstrumentAndAddress,
-      void(const wallet::Instrument& instrument,
-           const wallet::Address& address,
-           const std::string& obfuscated_gaia_id,
-           const GURL& source_url));
-
-  MOCK_METHOD2(UpdateAddress,
-      void(const wallet::Address& address, const GURL& source_url));
-
-  virtual void UpdateInstrument(
-      const wallet::WalletClient::UpdateInstrumentRequest& update_request,
-      scoped_ptr<wallet::Address> billing_address) {
-    updated_billing_address_ = billing_address.Pass();
-  }
-
-  const wallet::Address* updated_billing_address() {
-    return updated_billing_address_.get();
-  }
-
  private:
-  scoped_ptr<wallet::Address> updated_billing_address_;
-
   DISALLOW_COPY_AND_ASSIGN(TestWalletClient);
 };
 
 // Bring over command-ids from AccountChooserModel.
 class TestAccountChooserModel : public AccountChooserModel {
  public:
   TestAccountChooserModel(AccountChooserModelDelegate* delegate,
                           PrefService* prefs,
                           const AutofillMetrics& metric_logger)
       : AccountChooserModel(delegate, prefs, metric_logger,
@@ skipping 878 matching lines @@
   EXPECT_EQ(4,
       controller()->MenuModelForSection(SECTION_CC_BILLING)->GetItemCount());
   // "add"
   EXPECT_TRUE(controller()->MenuModelForSection(SECTION_CC_BILLING)->
       IsItemCheckedAt(2));
 }
 
 TEST_F(AutofillDialogControllerTest, SaveAddress) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveAddress(_, _)).Times(1);
+              SaveToWalletTester(testing::IsNull(),
+                                 testing::NotNull(),
+                                 _)).Times(1);
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
   // If there is no shipping address in wallet, it will default to
   // "same-as-billing" instead of "add-new-item". "same-as-billing" is covered
   // by the following tests. The last item in the menu is "add-new-item".
   ui::MenuModel* shipping_model =
       controller()->MenuModelForSection(SECTION_SHIPPING);
   shipping_model->ActivatedAt(shipping_model->GetItemCount() - 1);
   AcceptAndLoadFakeFingerprint();
 }
 
 TEST_F(AutofillDialogControllerTest, SaveInstrument) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveInstrument(_, _, _)).Times(1);
+              SaveToWalletTester(testing::NotNull(),
+                                 testing::IsNull(),
+                                 _)).Times(1);
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddAddress(wallet::GetTestShippingAddress());
   SubmitWithWalletItems(wallet_items.Pass());
 }
 
 TEST_F(AutofillDialogControllerTest, SaveInstrumentWithInvalidInstruments) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveInstrument(_, _, _)).Times(1);
+              SaveToWalletTester(testing::NotNull(),
+                                 testing::IsNull(),
+                                 _)).Times(1);
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddAddress(wallet::GetTestShippingAddress());
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrumentInvalid());
   SubmitWithWalletItems(wallet_items.Pass());
 }
 
 TEST_F(AutofillDialogControllerTest, SaveInstrumentAndAddress) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveInstrumentAndAddress(_, _, _, _)).Times(1);
+              SaveToWalletTester(testing::NotNull(),
+                                 testing::NotNull(),
+                                 _)).Times(1);
 
   controller()->OnDidGetWalletItems(wallet::GetTestWalletItems());
   AcceptAndLoadFakeFingerprint();
 }
 
+MATCHER(IsUpdatingExistingData, "updating existing Wallet data") {
+  return !arg->object_id().empty();
+}
+
 // Tests that editing an address (in wallet mode0 and submitting the dialog
 // should update the existing address on the server via WalletClient.
 TEST_F(AutofillDialogControllerTest, UpdateAddress) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              UpdateAddress(_, _)).Times(1);
+              SaveToWalletTester(testing::IsNull(),
+                                 IsUpdatingExistingData(),
+                                 _)).Times(1);
 
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
 
   controller()->EditClickedForSection(SECTION_SHIPPING);
   AcceptAndLoadFakeFingerprint();
 }
 
 // Tests that editing an instrument (CC + address) in wallet mode updates an
 // existing instrument on the server via WalletClient.
 TEST_F(AutofillDialogControllerTest, UpdateInstrument) {
+  EXPECT_CALL(*controller()->GetTestingWalletClient(),
+              SaveToWalletTester(IsUpdatingExistingData(),
+                                 testing::IsNull(),
+                                 _)).Times(1);
+
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
 
   controller()->EditClickedForSection(SECTION_CC_BILLING);
   AcceptAndLoadFakeFingerprint();
-
-  EXPECT_TRUE(
-      controller()->GetTestingWalletClient()->updated_billing_address());
 }
 
 // Test that a user is able to edit their instrument and add a new address in
 // the same submission.
 TEST_F(AutofillDialogControllerTest, UpdateInstrumentSaveAddress) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveAddress(_, _)).Times(1);
+              SaveToWalletTester(IsUpdatingExistingData(),
+                                 testing::NotNull(),
+                                 _)).Times(1);
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   controller()->EditClickedForSection(SECTION_CC_BILLING);
   AcceptAndLoadFakeFingerprint();
-
-  EXPECT_TRUE(
-      controller()->GetTestingWalletClient()->updated_billing_address());
-}
-
-// Test that saving a new instrument and editing an address works.
-TEST_F(AutofillDialogControllerTest, SaveInstrumentUpdateAddress) {

[Dane Wallinga, 2013/07/01 23:00:07]

This isn't a case we need to test anymore?

[ahutter, 2013/07/01 23:15:16]

Done.

-  EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveInstrument(_, _, _)).Times(1);
-  EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              UpdateAddress(_, _)).Times(1);
-
-  scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
-  wallet_items->AddAddress(wallet::GetTestShippingAddress());
-
-  controller()->OnDidGetWalletItems(wallet_items.Pass());
-
-  controller()->EditClickedForSection(SECTION_SHIPPING);
-  AcceptAndLoadFakeFingerprint();
 }
 
 MATCHER(UsesLocalBillingAddress, "uses the local billing address") {
-  return arg.address_line_1() == ASCIIToUTF16(kEditedBillingAddress);
+  return arg->address_line_1() == ASCIIToUTF16(kEditedBillingAddress);
 }
 
 // Tests that when using billing address for shipping, and there is no exact
 // matched shipping address, then a shipping address should be added.
 TEST_F(AutofillDialogControllerTest, BillingForShipping) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveAddress(_, _)).Times(1);
+              SaveToWalletTester(testing::IsNull(),
+                                 testing::NotNull(),
+                                 _)).Times(1);
 
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
   // Select "Same as billing" in the address menu.
   UseBillingForShipping();
 
   AcceptAndLoadFakeFingerprint();
 }
 
 // Tests that when using billing address for shipping, and there is an exact
 // matched shipping address, then a shipping address should not be added.
 TEST_F(AutofillDialogControllerTest, BillingForShippingHasMatch) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveAddress(_, _)).Times(0);
+              SaveToWalletTester(_, _, _)).Times(0);
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   scoped_ptr<wallet::WalletItems::MaskedInstrument> instrument =
       wallet::GetTestMaskedInstrument();
   // Copy billing address as shipping address, and assign an id to it.
   scoped_ptr<wallet::Address> shipping_address(
       new wallet::Address(instrument->address()));
   shipping_address->set_object_id("shipping_address_id");
   wallet_items->AddAddress(shipping_address.Pass());
   wallet_items->AddInstrument(instrument.Pass());
   wallet_items->AddAddress(wallet::GetTestShippingAddress());
 
   controller()->OnDidGetWalletItems(wallet_items.Pass());
   // Select "Same as billing" in the address menu.
   UseBillingForShipping();
 
   AcceptAndLoadFakeFingerprint();
 }
 
+// HUH??
 // Tests that adding new instrument and also using billing address for shipping,
 // then a shipping address should not be added.
 TEST_F(AutofillDialogControllerTest, BillingForShippingNewInstrument) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveInstrumentAndAddress(_, _, _, _)).Times(1);
+              SaveToWalletTester(_, _, _)).Times(1);
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddAddress(wallet::GetTestShippingAddress());
 
   controller()->OnDidGetWalletItems(wallet_items.Pass());
   // Select "Same as billing" in the address menu.
   UseBillingForShipping();
 
   AcceptAndLoadFakeFingerprint();
 }
@@ skipping 12 matching lines @@
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     outputs[&input] = input.type == ADDRESS_BILLING_LINE1 ?
         ASCIIToUTF16(kEditedBillingAddress) : input.initial_value;
   }
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
 
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveAddress(UsesLocalBillingAddress(), _)).Times(1);
+              SaveToWalletTester(testing::NotNull(),
+                                 UsesLocalBillingAddress(),
+                                 _)).Times(1);
   AcceptAndLoadFakeFingerprint();
-
-  EXPECT_TRUE(
-      controller()->GetTestingWalletClient()->updated_billing_address());
 }
 
 TEST_F(AutofillDialogControllerTest, CancelNoSave) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              SaveInstrumentAndAddress(_, _, _, _)).Times(0);
+              SaveToWalletTester(_, _, _)).Times(0);
 
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
 
   controller()->OnDidGetWalletItems(wallet::GetTestWalletItems());
   controller()->OnCancel();
 }
 
 // Checks that clicking the Manage menu item opens a new tab with a different
 // URL for Wallet and Autofill.
 TEST_F(AutofillDialogControllerTest, ManageItem) {
@@ skipping 182 matching lines @@
   std::vector<base::string16> email_values;
   full_profile.GetMultiInfo(EMAIL_ADDRESS, "en-US", &email_values);
   ASSERT_EQ(2U, email_values.size());
   EXPECT_EQ(new_email, email_values[1]);
 }
 
 TEST_F(AutofillDialogControllerTest, VerifyCvv) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               GetFullWallet(_)).Times(1);
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
-              AuthenticateInstrument(_, _, _)).Times(1);
+              AuthenticateInstrument(_, _)).Times(1);
 
   SubmitWithWalletItems(CompleteAndValidWalletItems());
 
   EXPECT_TRUE(NotificationsOfType(DialogNotification::REQUIRED_ACTION).empty());
   EXPECT_TRUE(controller()->SectionIsActive(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->SectionIsActive(SECTION_CC_BILLING));
   EXPECT_FALSE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
   EXPECT_FALSE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL));
 
   SuggestionState suggestion_state =
@@ skipping 95 matching lines @@
 
   std::vector<wallet::RequiredAction> required_actions;
   required_actions.push_back(wallet::INVALID_FORM_FIELD);
 
   std::vector<wallet::FormFieldError> form_errors;
   form_errors.push_back(
       wallet::FormFieldError(wallet::FormFieldError::INVALID_POSTAL_CODE,
                              wallet::FormFieldError::SHIPPING_ADDRESS));
 
   EXPECT_CALL(*controller()->GetView(), UpdateForErrors()).Times(1);
-  controller()->OnDidSaveAddress(std::string(), required_actions, form_errors);
+  controller()->OnDidSaveToWallet(std::string(),
+                                  std::string(),
+                                  required_actions,
+                                  form_errors);
 }
 
 // Simulates receiving unrecoverable Wallet server validation errors.
 TEST_F(AutofillDialogControllerTest, WalletServerSideValidationUnrecoverable) {
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
   controller()->OnAccept();
 
   std::vector<wallet::RequiredAction> required_actions;
   required_actions.push_back(wallet::INVALID_FORM_FIELD);
 
   std::vector<wallet::FormFieldError> form_errors;
   form_errors.push_back(
       wallet::FormFieldError(wallet::FormFieldError::UNKNOWN_ERROR,
                              wallet::FormFieldError::UNKNOWN_LOCATION));
 
   EXPECT_CALL(*controller()->GetView(), UpdateForErrors()).Times(1);
-  controller()->OnDidSaveAddress(std::string(), required_actions, form_errors);
+  controller()->OnDidSaveToWallet(std::string(),
+                                  std::string(),
+                                  required_actions,
+                                  form_errors);
 
   EXPECT_EQ(1U, NotificationsOfType(
       DialogNotification::REQUIRED_ACTION).size());
 }
 
 // Test Wallet banners are show in the right situations. These banners explain
 // where Chrome got the user's data (i.e. "Got details from Wallet") or promote
 // saving details into Wallet (i.e. "[x] Save details to Wallet").
 TEST_F(AutofillDialogControllerTest, WalletBanners) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ skipping 528 matching lines @@
             controller()->CurrentAutocheckoutSteps()[1].type());
   EXPECT_EQ(AUTOCHECKOUT_STEP_STARTED,
             controller()->CurrentAutocheckoutSteps()[1].status());
   EXPECT_EQ(AUTOCHECKOUT_STEP_BILLING,
             controller()->CurrentAutocheckoutSteps()[2].type());
   EXPECT_EQ(AUTOCHECKOUT_STEP_UNSTARTED,
             controller()->CurrentAutocheckoutSteps()[2].status());
 }
 
 }  // namespace autofill