rAc: try really hard not to ellipsize addresses

chrome/browser/ui/autofill/data_model_wrapper_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/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
@@ skipping 15 matching lines @@
     EXPECT_EQ(model.GetItemAt(month), wrapper.GetInfo(CREDIT_CARD_EXP_MONTH));
   }
 }
 
 TEST(AutofillCreditCardWrapperTest, GetDisplayTextEmptyWhenExpired) {
   CreditCard card;
   card.SetRawInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("1"));
   card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("2010"));
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("4111111111111111"));
   AutofillCreditCardWrapper wrapper(&card);
-  EXPECT_TRUE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_FALSE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(AutofillCreditCardWrapperTest, GetDisplayTextEmptyWhenInvalid) {
   CreditCard card;
   card.SetRawInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("12"));
   card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("9999"));
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("41111"));
   AutofillCreditCardWrapper wrapper(&card);
-  EXPECT_TRUE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_FALSE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(AutofillCreditCardWrapperTest, GetDisplayTextNotEmptyWhenValid) {
   CreditCard card;
   card.SetRawInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("12"));
   card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("9999"));
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("4111111111111111"));
   AutofillCreditCardWrapper wrapper(&card);
-  EXPECT_FALSE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_TRUE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(WalletInstrumentWrapperTest, GetInfoCreditCardExpMonth) {
   scoped_ptr<wallet::WalletItems::MaskedInstrument> instrument(
       wallet::GetTestMaskedInstrument());
   MonthComboboxModel model;
   for (int month = 1; month <= 12; ++month) {
     instrument->expiration_month_ = month;
     WalletInstrumentWrapper wrapper(instrument.get());
     EXPECT_EQ(model.GetItemAt(month), wrapper.GetInfo(CREDIT_CARD_EXP_MONTH));
   }
 }
 
 TEST(WalletInstrumentWrapperTest, GetDisplayTextEmptyWhenExpired) {
   scoped_ptr<wallet::WalletItems::MaskedInstrument> instrument(
       wallet::GetTestMaskedInstrument());
   instrument->status_ = wallet::WalletItems::MaskedInstrument::EXPIRED;
   WalletInstrumentWrapper wrapper(instrument.get());
-  EXPECT_TRUE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_FALSE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(DataModelWrapperTest, GetDisplayTextEmptyWithoutPhone) {
   scoped_ptr<wallet::WalletItems::MaskedInstrument> instrument(
       wallet::GetTestMaskedInstrument());
 
   WalletInstrumentWrapper instrument_wrapper(instrument.get());
-  ASSERT_FALSE(instrument_wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  ASSERT_TRUE(instrument_wrapper.GetDisplayText(&unused, &unused2));
 
   WalletAddressWrapper address_wrapper(&instrument->address());
-  ASSERT_FALSE(address_wrapper.GetDisplayText().empty());
+  ASSERT_TRUE(address_wrapper.GetDisplayText(&unused, &unused2));
 
   const_cast<wallet::Address*>(&instrument->address())->set_phone_number(
       string16());
 
   ASSERT_TRUE(instrument_wrapper.GetInfo(PHONE_HOME_WHOLE_NUMBER).empty());
-  EXPECT_TRUE(instrument_wrapper.GetDisplayText().empty());
+  EXPECT_FALSE(instrument_wrapper.GetDisplayText(&unused, &unused2));
 
   ASSERT_TRUE(address_wrapper.GetInfo(PHONE_HOME_WHOLE_NUMBER).empty());
-  EXPECT_TRUE(address_wrapper.GetDisplayText().empty());
+  EXPECT_FALSE(address_wrapper.GetDisplayText(&unused, &unused2));
 }
 
 }  // namespace autofill