[Android] More @RetryOnFailure in chrome_public_test_apk.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.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.content.DialogInterface;
 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.base.test.util.FlakyTest;
-import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.AutofillTestHelper;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
  * A payment integration test for a merchant that does not require shipping address.
@@ skipping 15 matching lines @@
                 true, "Jon Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "",
                 "US", "310-310-6000", "jon.doe@gmail.com", "en-US"));
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jon Doe",
                 "4111111111111111", "1111", "12", "2050", "visa", R.drawable.pr_visa,
                 billingAddressId, "" /* serverId */));
     }
 
     /** Click [X] to cancel payment. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testCloseDialog() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyForInput);
         clickAndWait(R.id.close_button, mDismissed);
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /** Click [EDIT] to expand the dialog, then click [X] to cancel payment. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testEditAndCloseDialog() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyForInput);
         clickAndWait(R.id.button_secondary, mReadyForInput);
         clickAndWait(R.id.close_button, mDismissed);
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /** Click [EDIT] to expand the dialog, then click [CANCEL] to cancel payment. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testEditAndCancelDialog() throws InterruptedException, ExecutionException,
             TimeoutException {
         triggerUIAndWait(mReadyForInput);
         clickAndWait(R.id.button_secondary, mReadyForInput);
         clickAndWait(R.id.button_secondary, mDismissed);
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /** Click [PAY] and dismiss the card unmask dialog. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
         expectResultContains(new String[] {"Jon Doe", "4111111111111111", "12", "2050", "visa",
                 "123"});
     }
 
     /** Click [PAY], type in "123" into the CVC dialog, then submit the payment. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testCancelUnmaskAndRetry()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_NEGATIVE, mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
         expectResultContains(new String[] {"Jon Doe", "4111111111111111", "12", "2050", "visa",
                 "123"});
@@ skipping 35 matching lines @@
         fillNewCardForm("5454-5454-5454-5454", "", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);
         clickInCardEditorAndWait(R.id.payments_edit_done_button, mEditorValidationError);
         clickInCardEditorAndWait(R.id.payments_edit_cancel_button, mReadyForInput);
         clickAndWait(R.id.close_button, mDismissed);
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /** Save a new card on disk and pay. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testSaveNewCardAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);
         clickInCardEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
         expectResultContains(new String[] {"5454545454545454", "12", "Bob"});
     }
 
     /** Use a temporary credit card to complete payment. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testAddTemporaryCardAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);
 
         // Uncheck the "Save this card on this device" checkbox, so the card is temporary.
         selectCheckboxAndWait(R.id.payments_edit_checkbox, false, mReadyToEdit);
 
         clickInCardEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
         expectResultContains(new String[] {"5454545454545454", "12", "Bob"});
     }
 
     /** Add a new card together with a new billing address and pay. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testSaveNewCardAndNewBillingAddressAndPay()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickInPaymentMethodAndWait(R.id.payments_section, mReadyForInput);
         clickInPaymentMethodAndWait(R.id.payments_add_option_button, mReadyToEdit);
         setTextInCardEditorAndWait(new String[] {"5454 5454 5454 5454", "Bob"}, mEditorTextUpdate);
 
         // Select December of next year for expiration and [Add address] in the billing address
         // dropdown.
         int december = 11;
@@ skipping 10 matching lines @@
         clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
         setTextInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123", mReadyToUnmask);
         clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE, mDismissed);
         expectResultContains(new String[] {"5454545454545454", "12", "Bob", "Google",
                 "1600 Amphitheatre Pkwy", "Mountain View", "CA", "94043", "999-999-9999"});
     }
 
     /** Quickly pressing on "add card" and then [X] should not crash. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickAddCardAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
         clickInPaymentMethodAndWait(R.id.payments_section, mReadyForInput);
 
         // Quickly press on "add card" and then [X].
         int callCount = mReadyToEdit.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ skipping 79 matching lines @@
 
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /**
      * Quickly dismissing the dialog (via Android's back button, for example) and then pressing on
      * "pay" should not crash.
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickDismissAndPayShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
 
         // Quickly dismiss and then press on "pay."
         int callCount = mDismissed.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mUI.getDialogForTest().onBackPressed();
                 mUI.getDialogForTest().findViewById(R.id.button_primary).performClick();
             }
         });
         mDismissed.waitForCallback(callCount);
 
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /**
      * Quickly dismissing the dialog (via Android's back button, for example) and then pressing on
      * [X] should not crash.
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickDismissAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
 
         // Quickly dismiss and then press on [X].
         int callCount = mDismissed.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mUI.getDialogForTest().onBackPressed();
                 mUI.getDialogForTest().findViewById(R.id.close_button).performClick();
             }
         });
         mDismissed.waitForCallback(callCount);
 
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /**
      * Quickly pressing on [X] and then dismissing the dialog (via Android's back button, for
      * example) should not crash.
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testQuickCloseAndDismissShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
 
         // Quickly press on [X] and then dismiss.
         int callCount = mDismissed.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mUI.getDialogForTest().findViewById(R.id.close_button).performClick();
                 mUI.getDialogForTest().onBackPressed();
             }
         });
         mDismissed.waitForCallback(callCount);
 
         expectResultContains(new String[] {"Request cancelled"});
     }
 
     /**
      * Test that starting a payment request that requires user information except for the payment
      * results in the appropriate metric being logged in the PaymentRequest.RequestedInformation
      * histogram.
      */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testRequestedInformationMetric() throws InterruptedException, ExecutionException,
             TimeoutException {
         // Start the Payment Request.
         triggerUIAndWait(mReadyToPay);
 
         // Make sure that only the appropriate enum value was logged.
         for (int i = 0; i < PaymentRequestMetrics.REQUESTED_INFORMATION_MAX; ++i) {
             assertEquals((i == PaymentRequestMetrics.REQUESTED_INFORMATION_NONE ? 1 : 0),
                     RecordHistogram.getHistogramValueCountForTesting(
                             "PaymentRequest.RequestedInformation", i));
         }
     }
 
     /** Verifies the format of the billing address suggestions when adding a new credit card. */
     @MediumTest
     @Feature({"Payments"})
-    @RetryOnFailure
     public void testNewCardBillingAddressFormat()
             throws InterruptedException, ExecutionException, TimeoutException {
         fillNewCardForm("5454-5454-5454-5454", "Bob", DECEMBER, NEXT_YEAR, FIRST_BILLING_ADDRESS);
         assertTrue(getSpinnerSelectionTextInCardEditor(2).equals(
                 "Jon Doe, Google, 340 Main St, Los Angeles, CA 90291, United States"));
     }
 }