[Payment Request] Update the logic when obtaining results from editors

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java
index da45cda25179905343977b213db7561088c4b138..28dce8f8b94a54e17eee682adda63651fc14cde4 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java
@@ -7,11 +7,10 @@ package org.chromium.chrome.browser.payments;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.FlakyTest;
 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 org.chromium.chrome.browser.payments.ui.PaymentRequestSection;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -19,12 +18,11 @@ import java.util.concurrent.TimeoutException;
 /**
  * A payment integration test for a merchant that requests phone number from a user that has
  * incomplete phone number stored on disk.
- *
- * TODO(rouslan): Add a test to fill in the valid phone number and submit it to the merchant.
  */
 public class PaymentRequestIncompletePhoneTest extends PaymentRequestTestBase {
     public PaymentRequestIncompletePhoneTest() {
-        // This merchant requests a phone number.
+        // This merchant requests a phone number. We set the user's phone as invalid, so all tests
+        // start in "ready for input" state.
         super("payment_request_phone_test.html");
     }
 
@@ -33,27 +31,71 @@ public class PaymentRequestIncompletePhoneTest extends PaymentRequestTestBase {
             throws InterruptedException, ExecutionException, TimeoutException {
         AutofillTestHelper helper = new AutofillTestHelper();
         // The user has an invalid phone number on disk.
-        String billingAddressId = helper.setProfile(new AutofillProfile("", "https://example.com",
-                true, "Jon Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "",
-                "US", "+++" /* invalid phone number */, "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 */));
+        helper.setProfile(new AutofillProfile("", "https://example.com", true, "Jon Doe", "Google",
+                "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
+                "+++" /* invalid phone */, "jon.doe@gmail.com", "en-US"));
+
+        installPaymentApp(HAVE_INSTRUMENTS, IMMEDIATE_RESPONSE);
     }
 
     /** Attempt to update the phone number with invalid data and cancel the transaction. */
     @MediumTest
-    @FlakyTest(message = "crbug.com/673371")
     @Feature({"Payments"})
     public void testEditIncompletePhoneAndCancel()
             throws InterruptedException, ExecutionException, TimeoutException {
+        // Not ready to pay since Contact phone is invalid.
         triggerUIAndWait(mReadyForInput);
+        // Check that there is a selected payment method (makes sure we are not ready to pay because
+        // of the Contact Details).
+        expectPaymentMethodRowIsSelected(0);
+        // Updating contact with an invalid value and cancelling means we're still not
+        // ready to pay (the value is still the original value).
         clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
         clickInContactInfoAndWait(R.id.payments_first_radio_button, mReadyToEdit);
         setTextInEditorAndWait(new String[] {"---"}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mEditorValidationError);
-        clickInEditorAndWait(R.id.payments_edit_cancel_button, mReadyToPay);
+        clickInEditorAndWait(R.id.payments_edit_cancel_button, mReadyForInput);
+        assertEquals(PaymentRequestSection.EDIT_BUTTON_SELECT, getContactDetailsButtonState());
+
+        clickAndWait(R.id.close_button, mDismissed);
+        expectResultContains(new String[] {"Request cancelled"});
+    }
+
+    /** Attempt to add an invalid phone alongside the already invalid data and cancel. */
+    @MediumTest
+    @Feature({"Payments"})
+    public void testAddIncompletePhoneAndCancel()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        // Not ready to pay since Contact phone is invalid.
+        triggerUIAndWait(mReadyForInput);
+        // Check that there is a selected payment method (makes sure we are not ready to pay because
+        // of the Contact Details).
+        expectPaymentMethodRowIsSelected(0);
+        // Updating contact with an invalid value and cancelling means we're still not
+        // ready to pay (the value is still the original value).
+        clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
+        clickInContactInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);
+        setTextInEditorAndWait(new String[] {"---"}, mEditorTextUpdate);
+        clickInEditorAndWait(R.id.payments_edit_done_button, mEditorValidationError);
+        // The section collapses and the [SELECT] button is active.
+        clickInEditorAndWait(R.id.payments_edit_cancel_button, mReadyForInput);
+        assertEquals(PaymentRequestSection.EDIT_BUTTON_SELECT, getContactDetailsButtonState());
+
         clickAndWait(R.id.close_button, mDismissed);
         expectResultContains(new String[] {"Request cancelled"});
     }
+
+    /** Update the phone with valid data and provide that to the merchant. */
+    @MediumTest
+    @Feature({"Payments"})
+    public void testEditIncompletePhoneAndPay()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        triggerUIAndWait(mReadyForInput);
+        clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);
+        clickInContactInfoAndWait(R.id.payments_first_radio_button, mReadyToEdit);
+        setTextInEditorAndWait(new String[] {"514-555-5555"}, mEditorTextUpdate);
+        clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
+        clickAndWait(R.id.button_primary, mDismissed);
+        expectResultContains(new String[] {"514-555-5555"});
+    }
 }