chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsTest.java - Issue 2413833002: PaymentRequest: Rename ContactInfo to PayerInfo.

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

Issue 2413833002: PaymentRequest: Rename ContactInfo to PayerInfo.

Patch Set: test Created 4 years, 2 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

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsAndFreeShippingTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPhoneTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsTest.java

similarity index 76%

rename from chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java

rename to chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsTest.java

index 4cbd12985dba0fb77182c7ace11daeb08cb14dab..db4d1dd36741a59af94ef5ca464a859430dc4e44 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsTest.java

@@ -19,12 +19,12 @@ import java.util.concurrent.ExecutionException;

import java.util.concurrent.TimeoutException;

/**

- * A payment integration test for a merchant that requests contact details.

+ * A payment integration test for a merchant that requests payer information details.

-public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {

- public PaymentRequestContactDetailsTest() {

- // The merchant requests both a phone number and an email address.

- super("payment_request_contact_details_test.html");

+public class PaymentRequestPayerInfoDetailsTest extends PaymentRequestTestBase {

+ public PaymentRequestPayerInfoDetailsTest() {

+ // The merchant requests payer information.

+ super("payment_request_payer_info_details_test.html");

}

@Override

@@ -51,14 +51,14 @@ public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {

expectResultContains(new String[] {"555-555-5555", "jon.doe@google.com"});

}

- /** Attempt to add invalid phone number and email address and cancel the transaction. */

+ /** Attempt to add invalid payer information and cancel the transaction. */

@MediumTest

@Feature({"Payments"})

- public void testAddInvalidContactAndCancel()

+ public void testAddInvalidPayerInfoAndCancel()

throws InterruptedException, ExecutionException, TimeoutException {

triggerUIAndWait(mReadyToPay);

- clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);

- clickInContactInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);

+ clickInPayerInfoAndWait(R.id.payments_section, mReadyForInput);

+ clickInPayerInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);

setTextInEditorAndWait(new String[] {"+++", "jane.jones"}, mEditorTextUpdate);

clickInEditorAndWait(R.id.payments_edit_done_button, mEditorValidationError);

clickInEditorAndWait(R.id.payments_edit_cancel_button, mReadyForInput);

@@ -69,11 +69,11 @@ public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {

/** Add new phone number and email address and provide that to the merchant. */

@MediumTest

@Feature({"Payments"})

- public void testAddContactAndPay()

+ public void testAddPayerInfoAndPay()

throws InterruptedException, ExecutionException, TimeoutException {

triggerUIAndWait(mReadyToPay);

- clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);

- clickInContactInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);

+ clickInPayerInfoAndWait(R.id.payments_section, mReadyForInput);

+ clickInPayerInfoAndWait(R.id.payments_add_option_button, mReadyToEdit);

setTextInEditorAndWait(new String[] {"999-999-9999", "jane.jones@google.com"},

mEditorTextUpdate);

clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);

@@ -83,20 +83,20 @@ public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {

expectResultContains(new String[] {"999-999-9999", "jane.jones@google.com"});

}

- /** Quickly pressing on "add contact info" and then [X] should not crash. */

+ /** Quickly pressing on "add payer info" and then [X] should not crash. */

@MediumTest

@Feature({"Payments"})

- public void testQuickAddContactAndCloseShouldNotCrash()

+ public void testQuickAddPayerInfoAndCloseShouldNotCrash()

throws InterruptedException, ExecutionException, TimeoutException {

triggerUIAndWait(mReadyToPay);

- clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);

+ clickInPayerInfoAndWait(R.id.payments_section, mReadyForInput);

- // Quickly press on "add contact info" and then [X].

+ // Quickly press on "add payer info" and then [X].

int callCount = mReadyToEdit.getCallCount();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- mUI.getContactDetailsSectionForTest().findViewById(

+ mUI.getPayerInfoDetailsSectionForTest().findViewById(

R.id.payments_add_option_button).performClick();

mUI.getDialogForTest().findViewById(R.id.close_button).performClick();

}

@@ -108,21 +108,21 @@ public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {

expectResultContains(new String[] {"Request cancelled"});

}

- /** Quickly pressing on [X] and then "add contact info" should not crash. */

+ /** Quickly pressing on [X] and then "add payer info" should not crash. */

@MediumTest

@Feature({"Payments"})

- public void testQuickCloseAndAddContactShouldNotCrash()

+ public void testQuickCloseAndAddPayerInfoShouldNotCrash()

throws InterruptedException, ExecutionException, TimeoutException {

triggerUIAndWait(mReadyToPay);

- clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);

+ clickInPayerInfoAndWait(R.id.payments_section, mReadyForInput);

- // Quickly press on [X] and then "add contact info."

+ // Quickly press on [X] and then "add payer info."

int callCount = mDismissed.getCallCount();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

mUI.getDialogForTest().findViewById(R.id.close_button).performClick();

- mUI.getContactDetailsSectionForTest().findViewById(

+ mUI.getPayerInfoDetailsSectionForTest().findViewById(

R.id.payments_add_option_button).performClick();

}

});

@@ -131,20 +131,20 @@ public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {

expectResultContains(new String[] {"Request cancelled"});

}

- /** Quickly pressing on "add contact info" and then "cancel" should not crash. */

+ /** Quickly pressing on "add payer info" and then "cancel" should not crash. */

@MediumTest

@Feature({"Payments"})

- public void testQuickAddContactAndCancelShouldNotCrash()

+ public void testQuickAddPayerInfoAndCancelShouldNotCrash()

throws InterruptedException, ExecutionException, TimeoutException {

triggerUIAndWait(mReadyToPay);

- clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);

+ clickInPayerInfoAndWait(R.id.payments_section, mReadyForInput);

- // Quickly press on "add contact info" and then "cancel."

+ // Quickly press on "add payer info" and then "cancel."

int callCount = mReadyToEdit.getCallCount();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- mUI.getContactDetailsSectionForTest().findViewById(

+ mUI.getPayerInfoDetailsSectionForTest().findViewById(

R.id.payments_add_option_button).performClick();

mUI.getDialogForTest().findViewById(R.id.button_secondary).performClick();

}

@@ -156,21 +156,21 @@ public class PaymentRequestContactDetailsTest extends PaymentRequestTestBase {

expectResultContains(new String[] {"Request cancelled"});

}

- /** Quickly pressing on "cancel" and then "add contact info" should not crash. */

+ /** Quickly pressing on "cancel" and then "add payer info" should not crash. */

@MediumTest

@Feature({"Payments"})

- public void testQuickCancelAndAddContactShouldNotCrash()

+ public void testQuickCancelAndAddPayerInfoShouldNotCrash()

throws InterruptedException, ExecutionException, TimeoutException {

triggerUIAndWait(mReadyToPay);

- clickInContactInfoAndWait(R.id.payments_section, mReadyForInput);

+ clickInPayerInfoAndWait(R.id.payments_section, mReadyForInput);

- // Quickly press on "cancel" and then "add contact info."

+ // Quickly press on "cancel" and then "add payer info."

int callCount = mDismissed.getCallCount();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

mUI.getDialogForTest().findViewById(R.id.button_secondary).performClick();

- mUI.getContactDetailsSectionForTest().findViewById(

+ mUI.getPayerInfoDetailsSectionForTest().findViewById(

R.id.payments_add_option_button).performClick();

}

});