[Payments] Show complete profiles first and limit to 4 suggestions.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

 // Copyright 2016 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.payments;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.Spinner;
@@ skipping 42 matching lines @@
     protected final CallbackHelper mEditorTextUpdate;
     protected final CallbackHelper mEditorDismissed;
     protected final CallbackHelper mDismissed;
     protected final CallbackHelper mUnableToAbort;
     private final AtomicReference<ContentViewCore> mViewCoreRef;
     private final AtomicReference<WebContents> mWebContentsRef;
     private final String mTestFilePath;
     private PaymentRequestUI mUI;
     private CardUnmaskPrompt mCardUnmaskPrompt;
 
+    /** An array mapping the index of a option label to its id. */
+    private final int[] mOptionLabelIds = {
+            R.id.payments_first_option_label,
+            R.id.payments_second_option_label,
+            R.id.payments_third_option_label,
+            R.id.payments_fourth_option_label,
+            R.id.payments_fifth_option_label
+    };
+
     protected PaymentRequestTestBase(String testFileName) {
         super(ChromeActivity.class);
         mReadyForInput = new PaymentsCallbackHelper<>();
         mReadyToPay = new PaymentsCallbackHelper<>();
         mReadyToClose = new PaymentsCallbackHelper<>();
         mResultReady = new PaymentsCallbackHelper<>();
         mReadyForUnmaskInput = new PaymentsCallbackHelper<>();
         mReadyToUnmask = new PaymentsCallbackHelper<>();
         mReadyToEdit = new CallbackHelper();
         mEditorValidationError = new CallbackHelper();
@@ skipping 126 matching lines @@
     protected String getAddressSectionLabel() throws ExecutionException {
         return ThreadUtils.runOnUiThreadBlocking(new Callable<String>() {
             @Override
             public String call() {
                 return ((TextView) mUI.getShippingSummarySectionForTest().findViewById(
                         R.id.payments_left_summary_label)).getText().toString();
             }
         });
     }
 
+    /**
+     *  Returns the label corresponding to the contact detail suggestion at the specified
+     *  |suggestionIndex|. Returns null if there is no suggestion at |suggestionIndex|.
+     */
+    protected String getContactDetailsSuggestionLabel(final int suggestionIndex)
+            throws ExecutionException {
+        return ThreadUtils.runOnUiThreadBlocking(new Callable<String>() {
+            @Override
+            public String call() {
+                if (mUI.getContactDetailsSectionForTest().findViewById(

[please use gerrit instead, 2016/07/07 13:59:36]

Don't call findByView() twice. Save the result and reuse it.

[sebsg, 2016/07/08 07:54:52]

Done.

+                        mOptionLabelIds[suggestionIndex]) == null) {
+                    return null;
+                }
+                return ((TextView) mUI.getContactDetailsSectionForTest().findViewById(
+                        mOptionLabelIds[suggestionIndex])).getText().toString();
+            }
+        });
+    }
+
+    /**
+     *  Returns the label corresponding to the shipping address suggestion at the specified
+     *  |suggestionIndex|. Returns null if there is no suggestion at |suggestionIndex|.
+     */
+    protected String getShippingAddressSuggestionLabel(final int suggestionIndex)
+            throws ExecutionException {
+        return ThreadUtils.runOnUiThreadBlocking(new Callable<String>() {
+            @Override
+            public String call() {
+                if (mUI.getShippingAddressSectionForTest().findViewById(
+                        mOptionLabelIds[suggestionIndex]) == null) {
+                    return null;
+                }
+                return ((TextView) mUI.getShippingAddressSectionForTest().findViewById(
+                        mOptionLabelIds[suggestionIndex])).getText().toString();
+            }
+        });
+    }
+
     /** Selects the spinner value in the editor UI. */
     protected void setSpinnerSelectionInEditor(final int selection, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 ViewGroup contents = (ViewGroup) mUI.getEditorView().findViewById(R.id.contents);
                 assertNotNull(contents);
                 for (int i = 0; i < contents.getChildCount(); i++) {
@@ skipping 165 matching lines @@
          *
          * @param ui The UI that is ready for input.
          */
         public void notifyCalled(T target) {
             ThreadUtils.assertOnUiThread();
             mTarget = target;
             notifyCalled();
         }
     }
 }