| Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
|
| index 4643e179b0a499c4db190270b009859ce58cfff0..5ddb4d674465056fa194f0fb523e4186158e9151 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
|
| @@ -9,6 +9,7 @@ import android.test.suitebuilder.annotation.MediumTest;
|
|
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.metrics.RecordHistogram;
|
| +import org.chromium.base.test.util.Feature;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.autofill.AutofillTestHelper;
|
| import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
|
| @@ -41,6 +42,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Submit the shipping address to the merchant when the user clicks "Pay." */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
|
| @@ -53,6 +55,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Attempt to add an invalid address and cancel the transaction. */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testAddInvalidAddressAndCancel()
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| @@ -66,6 +69,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Add a valid address and complete the transaction. */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testAddAddressAndPay()
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| @@ -83,6 +87,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Change the country in the spinner, add a valid address, and complete the transaction. */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testChangeCountryAddAddressAndPay()
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| @@ -101,6 +106,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Quickly pressing on "add address" and then [X] should not crash. */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testQuickAddAddressAndCloseShouldNotCrash()
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| @@ -125,6 +131,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Quickly pressing on [X] and then "add address" should not crash. */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testQuickCloseAndAddAddressShouldNotCrash()
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| @@ -147,6 +154,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Quickly pressing on "add address" and then "cancel" should not crash. */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testQuickAddAddressAndCancelShouldNotCrash()
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| @@ -171,6 +179,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
|
|
| /** Quickly pressing on "cancel" and then "add address" should not crash. */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testQuickCancelAndAddAddressShouldNotCrash()
|
| throws InterruptedException, ExecutionException, TimeoutException {
|
| triggerUIAndWait(mReadyToPay);
|
| @@ -196,6 +205,7 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
|
| * appropriate metric being logged in the PaymentRequest.RequestedInformation histogram.
|
| */
|
| @MediumTest
|
| + @Feature({"Payments"})
|
| public void testRequestedInformationMetric() throws InterruptedException, ExecutionException,
|
| TimeoutException {
|
| // Start the Payment Request.
|
|
|