Updates to wallet for i18n

components/autofill/content/browser/wallet/wallet_client_unittest.cc

 // Copyright 2013 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/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 275 matching lines @@
     "  \"debug_data\":"
     "  {"
     "    \"debug_message\":\"debug_message\","
     "    \"stack_trace\":\"stack_trace\""
     "  },"
     "  \"application_error_data\":\"application_error_data\""
     "}";
 
 // The JSON below is used to test against the request payload being sent to
 // Online Wallet. It's indented differently since JSONWriter creates compact
-// JSON from DictionaryValues.
+// JSON from DictionaryValues. NB: The values must be alphabetical to pass
+// the tests.

[Dan Beam, 2014/02/12 21:34:33]

^ that must've sucked to figure out, haha...

[Evan Stade, 2014/02/12 23:32:13]

overall updating the tests was rather droll but this part wasn't that hard to
figure out as the error output is pretty good (unlike the tests that say "128
byte object <asdf;jalkdfm;asdlmf> doesn't match 128 byte object
<asdfj;alsdfmkasdfasdf>)

 
 const char kAcceptLegalDocumentsValidRequest[] =
     "{"
         "\"accepted_legal_document\":"
         "["
             "\"doc_id_1\","
             "\"doc_id_2\""
         "],"
         "\"google_transaction_id\":\"google-transaction-id\","
         "\"merchant_domain\":\"https://example.com/\""
@@ skipping 80 matching lines @@
             "\"phone_number\":\"save_phone_number\","
             "\"postal_address\":"
             "{"
                 "\"address_line\":"
                 "["
                     "\"save_address_line_1\","
                     "\"save_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
                 "\"country_name_code\":\"US\","
+                "\"dependent_locality_name\":\"save_dependent_locality_name\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
-                "\"recipient_name\":\"save_recipient_name\""
+                "\"recipient_name\":\"save_recipient_name\","
+                "\"sorting_code\":\"save_sorting_code\""
             "}"
         "},"
         "\"use_minimal_addresses\":false"
     "}";
 
 const char kSaveInstrumentValidRequest[] =
     "{"
         "\"instrument\":"
         "{"
             "\"credit_card\":"
             "{"
                 "\"address\":"
                 "{"
                     "\"address_line\":"
                     "["
                         "\"address_line_1\","
                         "\"address_line_2\""
                     "],"
                     "\"administrative_area_name\":\"admin_area_name\","
                     "\"country_name_code\":\"US\","
+                    "\"dependent_locality_name\":\"dependent_locality_name\","
                     "\"locality_name\":\"locality_name\","
                     "\"postal_code_number\":\"postal_code_number\","
-                    "\"recipient_name\":\"recipient_name\""
+                    "\"recipient_name\":\"recipient_name\","
+                    "\"sorting_code\":\"sorting_code\""
                 "},"
                 "\"exp_month\":12,"
                 "\"exp_year\":3000,"
                 "\"fop_type\":\"VISA\","
                 "\"last_4_digits\":\"4448\""
             "},"
             "\"type\":\"CREDIT_CARD\""
         "},"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
@@ skipping 10 matching lines @@
             "{"
                 "\"address\":"
                 "{"
                     "\"address_line\":"
                     "["
                         "\"address_line_1\","
                         "\"address_line_2\""
                     "],"
                     "\"administrative_area_name\":\"admin_area_name\","
                     "\"country_name_code\":\"US\","
+                    "\"dependent_locality_name\":\"dependent_locality_name\","
                     "\"locality_name\":\"locality_name\","
                     "\"postal_code_number\":\"postal_code_number\","
-                    "\"recipient_name\":\"recipient_name\""
+                    "\"recipient_name\":\"recipient_name\","
+                    "\"sorting_code\":\"sorting_code\""
                 "},"
                 "\"exp_month\":12,"
                 "\"exp_year\":3000,"
                 "\"fop_type\":\"VISA\","
                 "\"last_4_digits\":\"4448\""
             "},"
             "\"type\":\"CREDIT_CARD\""
         "},"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
         "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"shipping_address\":"
         "{"
             "\"phone_number\":\"save_phone_number\","
             "\"postal_address\":"
             "{"
                 "\"address_line\":"
                 "["
                     "\"save_address_line_1\","
                     "\"save_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
                 "\"country_name_code\":\"US\","
+                "\"dependent_locality_name\":\"save_dependent_locality_name\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
-                "\"recipient_name\":\"save_recipient_name\""
+                "\"recipient_name\":\"save_recipient_name\","
+                "\"sorting_code\":\"save_sorting_code\""
             "}"
         "},"
         "\"use_minimal_addresses\":false"
     "}";
 
 const char kUpdateAddressValidRequest[] =
     "{"
         "\"merchant_domain\":\"https://example.com/\","
         "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"shipping_address\":"
         "{"
             "\"id\":\"address_id\","
             "\"phone_number\":\"ship_phone_number\","
             "\"postal_address\":"
             "{"
                 "\"address_line\":"
                 "["
                     "\"ship_address_line_1\","
                     "\"ship_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"ship_admin_area_name\","
                 "\"country_name_code\":\"US\","
+                "\"dependent_locality_name\":\"ship_dependent_locality_name\","
                 "\"locality_name\":\"ship_locality_name\","
                 "\"postal_code_number\":\"ship_postal_code_number\","
-                "\"recipient_name\":\"ship_recipient_name\""
+                "\"recipient_name\":\"ship_recipient_name\","
+                "\"sorting_code\":\"ship_sorting_code\""
             "}"
         "},"
         "\"use_minimal_addresses\":false"
     "}";
 
 const char kUpdateInstrumentAddressValidRequest[] =
     "{"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
         "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"upgraded_billing_address\":"
         "{"
             "\"address_line\":"
             "["
                 "\"address_line_1\","
                 "\"address_line_2\""
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
             "\"country_name_code\":\"US\","
+            "\"dependent_locality_name\":\"dependent_locality_name\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
-            "\"recipient_name\":\"recipient_name\""
+            "\"recipient_name\":\"recipient_name\","
+            "\"sorting_code\":\"sorting_code\""
         "},"
         "\"upgraded_instrument_id\":\"default_instrument_id\","
         "\"use_minimal_addresses\":false"
     "}";
 
 const char kUpdateInstrumentAddressWithNameChangeValidRequest[] =
     "{"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
         "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"upgraded_billing_address\":"
         "{"
             "\"address_line\":"
             "["
                 "\"address_line_1\","
                 "\"address_line_2\""
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
             "\"country_name_code\":\"US\","
+            "\"dependent_locality_name\":\"dependent_locality_name\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
-            "\"recipient_name\":\"recipient_name\""
+            "\"recipient_name\":\"recipient_name\","
+            "\"sorting_code\":\"sorting_code\""
         "},"
         "\"upgraded_instrument_id\":\"default_instrument_id\","
         "\"use_minimal_addresses\":false"
     "}";
 
 const char kUpdateInstrumentExpirationDateValidRequest[] =
     "{"
         "\"instrument\":"
         "{"
             "\"credit_card\":"
@@ skipping 1163 matching lines @@
   delegate_.ExpectBaselineMetrics();
 
   wallet_client_->GetWalletItems();
   EXPECT_TRUE(wallet_client_->HasRequestInProgress());
   wallet_client_->CancelRequest();
   EXPECT_FALSE(wallet_client_->HasRequestInProgress());
 }
 
 }  // namespace wallet
 }  // namespace autofill