Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

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

Issue 2149023005: Error out when merchant requests only unknown payment methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@not-supported-error
Patch Set: Fix findbugs Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
index 7f2f0473a5f7c171d260348de633b2ccb7eba9b0..5fdee6ede98e2e46ddf4165b47609f90a1212eaa 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
@@ -57,6 +57,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
protected final CallbackHelper mDismissed;
protected final CallbackHelper mUnableToAbort;
protected final CallbackHelper mBillingAddressChangeProcessed;
+ protected final CallbackHelper mShowFailed;
protected PaymentRequestUI mUI;
private final AtomicReference<ContentViewCore> mViewCoreRef;
@@ -78,6 +79,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
mDismissed = new CallbackHelper();
mUnableToAbort = new CallbackHelper();
mBillingAddressChangeProcessed = new CallbackHelper();
+ mShowFailed = new CallbackHelper();
mViewCoreRef = new AtomicReference<>();
mWebContentsRef = new AtomicReference<>();
mTestFilePath = UrlUtils.getIsolatedTestFilePath(
@@ -92,6 +94,12 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
protected void triggerUIAndWait(PaymentsCallbackHelper<PaymentRequestUI> helper)
throws InterruptedException, ExecutionException, TimeoutException {
+ triggerUIAndWait((CallbackHelper) helper);
+ mUI = helper.getTarget();
+ }
+
+ protected void triggerUIAndWait(CallbackHelper helper)
+ throws InterruptedException, ExecutionException, TimeoutException {
startMainActivityWithURL(mTestFilePath);
onMainActivityStarted();
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ -106,7 +114,6 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
});
assertWaitForPageScaleFactorMatch(1);
clickNodeAndWait("buy", helper);
- mUI = helper.getTarget();
}
/** Clicks on an HTML node. */
@@ -480,6 +487,12 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeA
}
@Override
+ public void onPaymentRequestServiceShowFailed() {
+ ThreadUtils.assertOnUiThread();
+ mShowFailed.notifyCalled();
+ }
+
+ @Override
public void onCardUnmaskPromptReadyForInput(CardUnmaskPrompt prompt) {
ThreadUtils.assertOnUiThread();
mReadyForUnmaskInput.notifyCalled(prompt);

Powered by Google App Engine
This is Rietveld 408576698