PaymentRequest.abort() should return a promise.

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.widget.EditText;
 import android.widget.TextView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.autofill.CardUnmaskPrompt;
 import org.chromium.chrome.browser.autofill.CardUnmaskPrompt.CardUnmaskObserverForTest;
+import org.chromium.chrome.browser.payments.PaymentRequestImpl.PaymentRequestServiceObserverForTest;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestUI;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestUI.PaymentRequestObserverForTest;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content_public.browser.WebContents;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * A base integration test for payments.
  */
 @CommandLineFlags.Add({ChromeSwitches.EXPERIMENTAL_WEB_PLAFTORM_FEATURES})
 abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeActivity>
-        implements PaymentRequestObserverForTest, CardUnmaskObserverForTest {
+        implements PaymentRequestObserverForTest, PaymentRequestServiceObserverForTest,
+        CardUnmaskObserverForTest {
     protected final PaymentsCallbackHelper<PaymentRequestUI> mReadyForInput;
     protected final PaymentsCallbackHelper<PaymentRequestUI> mReadyToPay;
     protected final PaymentsCallbackHelper<PaymentRequestUI> mReadyToClose;
     protected final PaymentsCallbackHelper<PaymentRequestUI> mResultReady;
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mReadyForUnmaskInput;
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mReadyToUnmask;
     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;
 
     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<>();
         mDismissed = new CallbackHelper();
+        mUnableToAbort = new CallbackHelper();
         mViewCoreRef = new AtomicReference<>();
         mWebContentsRef = new AtomicReference<>();
         mTestFilePath = UrlUtils.getIsolatedTestFilePath(
                 String.format("chrome/test/data/android/payments/%s", testFileName));
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {}
 
     protected abstract void onMainActivityStarted()
             throws InterruptedException, ExecutionException, TimeoutException;
 
     protected void triggerUIAndWait(PaymentsCallbackHelper<PaymentRequestUI> helper)
             throws InterruptedException, ExecutionException, TimeoutException {
         startMainActivityWithURL(mTestFilePath);
         onMainActivityStarted();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mViewCoreRef.set(getActivity().getCurrentContentViewCore());
                 mWebContentsRef.set(mViewCoreRef.get().getWebContents());
                 PaymentRequestUI.setObserverForTest(PaymentRequestTestBase.this);
+                PaymentRequestImpl.setObserverForTest(PaymentRequestTestBase.this);
                 CardUnmaskPrompt.setObserverForTest(PaymentRequestTestBase.this);
             }
         });
         assertWaitForPageScaleFactorMatch(1);
-
-        int callCount = helper.getCallCount();
-        DOMUtils.clickNode(this, mViewCoreRef.get(), "buy");
-        helper.waitForCallback(callCount);
+        clickNodeAndWait("buy", helper);
         mUI = helper.getTarget();
     }
 
+    protected void clickNodeAndWait(String nodeId, CallbackHelper helper)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        int callCount = helper.getCallCount();
+        DOMUtils.clickNode(this, mViewCoreRef.get(), nodeId);
+        helper.waitForCallback(callCount);
+    }
+
     protected void clickAndWait(final int resourceId, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mUI.getDialogForTest().findViewById(resourceId).performClick();
             }
         });
         helper.waitForCallback(callCount);
@@ skipping 81 matching lines @@
         ThreadUtils.assertOnUiThread();
         mReadyToClose.notifyCalled(ui);
     }
 
     @Override
     public void onPaymentRequestResultReady(PaymentRequestUI ui) {
         ThreadUtils.assertOnUiThread();
         mResultReady.notifyCalled(ui);
     }
 
-
     @Override
     public void onPaymentRequestDismiss() {
         ThreadUtils.assertOnUiThread();
         mDismissed.notifyCalled();
     }
 
     @Override
+    public void onPaymentRequestServiceUnableToAbort() {
+        ThreadUtils.assertOnUiThread();
+        mUnableToAbort.notifyCalled();
+    }
+
+    @Override
     public void onCardUnmaskPromptReadyForInput(CardUnmaskPrompt prompt) {
         ThreadUtils.assertOnUiThread();
         mReadyForUnmaskInput.notifyCalled(prompt);
     }
 
     @Override
     public void onCardUnmaskPromptReadyToUnmask(CardUnmaskPrompt prompt) {
         ThreadUtils.assertOnUiThread();
         mReadyToUnmask.notifyCalled(prompt);
     }
@@ skipping 18 matching lines @@
          *
          * @param ui The UI that is ready for input.
          */
         public void notifyCalled(T target) {
             ThreadUtils.assertOnUiThread();
             mTarget = target;
             notifyCalled();
         }
     }
 }