[Payments] Show name and address when selecting a CC billing address.

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java

 // 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.
 
 package org.chromium.chrome.browser.autofill;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
@@ skipping 15 matching lines @@
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         ApplicationData.clearAppData(getInstrumentation().getTargetContext());
         loadNativeLibraryAndInitBrowserProcess();
 
         mHelper = new AutofillTestHelper();
     }
 
+    private AutofillProfile createTestProfile() {
+        return new AutofillProfile("" /* guid */, "https://www.example.com" /* origin */,
+                "John Major", "Acme Inc.", "123 Main", "California", "Los Angeles", "", "90210", "",
+                "US", "555 123-4567", "jm@example.com", "");
+    }
+
     @SmallTest
     @Feature({"Autofill"})
     public void testAddAndEditProfiles() throws InterruptedException, ExecutionException,
             TimeoutException {
         AutofillProfile profile = new AutofillProfile(
                 "" /* guid */, "https://www.example.com" /* origin */,
                 "John Smith", "Acme Inc.",
                 "1 Main\nApt A", "CA", "San Francisco", "",
                 "94102", "",
                 "US", "4158889999", "john@acme.inc", "");
@@ skipping 51 matching lines @@
         assertEquals("en", storedProfile2.getLanguageCode());
         assertEquals("US", storedProfile2.getCountryCode());
         assertEquals("San Francisco", storedProfile2.getLocality());
         assertEquals("https://www.example.com", storedProfile2.getOrigin());
     }
 
     @SmallTest
     @Feature({"Autofill"})
     public void testAddAndDeleteProfile() throws InterruptedException, ExecutionException,
             TimeoutException {
-        AutofillProfile profile = new AutofillProfile(
-                "" /* guid */, "Chrome settings" /* origin */,
-                "John Smith", "Acme Inc.",
-                "1 Main\nApt A", "CA", "San Francisco", "",
-                "94102", "",
-                "US", "4158889999", "john@acme.inc", "");
-        String profileOneGUID = mHelper.setProfile(profile);
+        String profileOneGUID = mHelper.setProfile(createTestProfile());
         assertEquals(1, mHelper.getNumberOfProfilesForSettings());
 
         mHelper.deleteProfile(profileOneGUID);
         assertEquals(0, mHelper.getNumberOfProfilesForSettings());
     }
 
     @SmallTest
     @Feature({"Autofill"})
     public void testAddAndEditCreditCards() throws InterruptedException, ExecutionException,
             TimeoutException {
@@ skipping 187 matching lines @@
         // The first profile has a lower use count than the two other profiles. It also has an older
         // use date that the second profile and the same use date as the third. It should be last.
         mHelper.setProfileUseStatsForTesting(guid1, 3, 5000);
         // The second profile has the same use count as the third but a more recent use date. It
         // also has a bigger use count that the first profile. It should be first.
         mHelper.setProfileUseStatsForTesting(guid2, 6, 5001);
         // The third profile has the same use count as the second but an older use date. It also has
         // a bigger use count that the first profile. It should be second.
         mHelper.setProfileUseStatsForTesting(guid3, 6, 5000);
 
-        List<AutofillProfile> profiles = mHelper.getProfilesToSuggest();
+        List<AutofillProfile> profiles = mHelper.getProfilesToSuggest(false /* includeName */);
         assertEquals(3, profiles.size());
         assertTrue("Profile2 should be ranked first", guid2.equals(profiles.get(0).getGUID()));
         assertTrue("Profile3 should be ranked second", guid3.equals(profiles.get(1).getGUID()));
         assertTrue("Profile1 should be ranked third", guid1.equals(profiles.get(2).getGUID()));
     }
 
     @SmallTest
     @Feature({"Autofill"})
     public void testCreditCardsFrecency() throws InterruptedException, ExecutionException,
             TimeoutException {
@@ skipping 50 matching lines @@
         assertEquals(1, mHelper.getNumberOfCreditCardsToSuggest());
 
         // Both cards should be seen in the settings even if they are identical.
         assertEquals(2, mHelper.getNumberOfCreditCardsForSettings());
     }
 
     @SmallTest
     @Feature({"Autofill"})
     public void testProfileUseStatsSettingAndGetting() throws InterruptedException,
             ExecutionException, TimeoutException {
-        String guid = mHelper.setProfile(
-                new AutofillProfile("" /* guid */, "https://www.example.com" /* origin */,
-                        "Jasper Lundgren", "", "1500 Second Ave", "California", "Hollywood", "",
-                        "90068", "", "US", "555 123-9876", "jasperl@example.com", ""));
+        String guid = mHelper.setProfile(createTestProfile());
 
         // Make sure the profile does not have the specific use stats form the start.
         assertTrue(1234 != mHelper.getProfileUseCountForTesting(guid));
         assertTrue(1234 != mHelper.getProfileUseDateForTesting(guid));
 
         // Set specific use stats for the profile.
         mHelper.setProfileUseStatsForTesting(guid, 1234, 1234);
 
         // Make sure the specific use stats were set for the profile.
         assertEquals(1234, mHelper.getProfileUseCountForTesting(guid));
@@ skipping 20 matching lines @@
 
         // Make sure the specific use stats were set for the credit card.
         assertEquals(1234, mHelper.getCreditCardUseCountForTesting(guid));
         assertEquals(1234, mHelper.getCreditCardUseDateForTesting(guid));
     }
 
     @SmallTest
     @Feature({"Autofill"})
     public void testRecordAndLogProfileUse() throws InterruptedException, ExecutionException,
             TimeoutException {
-        String guid = mHelper.setProfile(
-                new AutofillProfile("" /* guid */, "https://www.example.com" /* origin */,
-                        "Jasper Lundgren", "", "1500 Second Ave", "California", "Hollywood", "",
-                        "90068", "", "US", "555 123-9876", "jasperl@example.com", ""));
+        String guid = mHelper.setProfile(createTestProfile());
 
         // Set specific use stats for the profile.
         mHelper.setProfileUseStatsForTesting(guid, 1234, 1234);
 
         // Get the current date value just before the call to record and log.
         long timeBeforeRecord = mHelper.getCurrentDateForTesting();
 
         // Record and log use of the profile.
         mHelper.recordAndLogProfileUse(guid);
 
@@ skipping 28 matching lines @@
         mHelper.recordAndLogCreditCardUse(guid);
 
         // Get the current date value just after the call to record and log.
         long timeAfterRecord = mHelper.getCurrentDateForTesting();
 
         // Make sure the use stats of the credit card were updated.
         assertEquals(1235, mHelper.getCreditCardUseCountForTesting(guid));
         assertTrue(timeBeforeRecord <= mHelper.getCreditCardUseDateForTesting(guid));
         assertTrue(timeAfterRecord >= mHelper.getCreditCardUseDateForTesting(guid));
     }
+
+    @SmallTest
+    @Feature({"Autofill"})
+    public void testGetProfilesToSuggest_NoName() throws InterruptedException, ExecutionException,
+            TimeoutException {
+        mHelper.setProfile(createTestProfile());
+
+        List<AutofillProfile> profiles = mHelper.getProfilesToSuggest(false /* includeName */);
+        assertEquals("Acme Inc., 123 Main, Los Angeles, California 90210, United States",
+                profiles.get(0).getLabel());
+    }
+
+    @SmallTest
+    @Feature({"Autofill"})
+    public void testGetProfilesToSuggest_WithName() throws InterruptedException, ExecutionException,
+            TimeoutException {
+        mHelper.setProfile(createTestProfile());
+
+        List<AutofillProfile> profiles = mHelper.getProfilesToSuggest(true /* includeName */);
+        assertEquals("John Major, Acme Inc., 123 Main, Los Angeles, California 90210, "
+                + "United States", profiles.get(0).getLabel());
+    }
 }