PaymentRequest integration test for dynamic shipping

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.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/PaymentRequestDynamicShippingSingleAddressTest.java
similarity index 55%
copy from chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
copy to chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java
index 489bb18945d44291480682fefbec3b025b25455e..260de51b210ca0e1f77dcd3525d6dadaab8321a9 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java
@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.payments;
 
-import android.content.DialogInterface;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.chrome.R;
@@ -16,11 +15,12 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
- * A payment integration test for a merchant that provides free shipping regardless of address.
+ * A payment integration test for a merchant that requires shipping address to calculate shipping
+ * and user that has a single address stored in autofill settings.
  */
-public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
-    public PaymentRequestFreeShippingTest() {
-        super("payment_request_free_shipping_test.html");
+public class PaymentRequestDynamicShippingSingleAddressTest extends PaymentRequestTestBase {
+    public PaymentRequestDynamicShippingSingleAddressTest() {
+        super("payment_request_dynamic_shipping_test.html");
     }
 
     @Override
@@ -34,15 +34,9 @@ public class PaymentRequestFreeShippingTest extends PaymentRequestTestBase {
     }
 
     @MediumTest
-    public void testPay() throws InterruptedException, ExecutionException, TimeoutException {
-        triggerUIAndWait(mReadyToPay);
-        clickAndWait(R.id.button_primary, mReadyForUnmaskInput);
-        typeInCardUnmaskDialogAndWait(R.id.card_unmask_input, "123",
-                mReadyForUnmaskInput.getTarget(), mReadyToUnmask);
-        clickCardUnmaskButtonAndWait(DialogInterface.BUTTON_POSITIVE,
-                mReadyToUnmask.getTarget(), mDismissed);
-        expectResultContains(new String[] {"Jon Doe", "4111111111111111", "12", "2050", "visa",
-                "123", "Google", "340 Main St", "CA", "Los Angeles", "90291", "US", "en",
-                "freeShippingOption"});
+    public void testAddressNotSelected()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        triggerUIAndWait(mReadyForInput);
+        assertEquals("Select shipping address", getAddressSectionLabel());
     }
 }