[Payment Request] Refactors the edit view controller

ios/showcase/payments/sc_payments_editor_egtest.mm

Index: ios/showcase/payments/sc_payments_editor_egtest.mm
diff --git a/ios/showcase/payments/sc_payments_editor_egtest.mm b/ios/showcase/payments/sc_payments_editor_egtest.mm
index c5e711c1e985e1234ada96bad1ed068e2b32e0e3..cabca8d981073f943ae887e5342e5ddfb1b9986f 100644
--- a/ios/showcase/payments/sc_payments_editor_egtest.mm
+++ b/ios/showcase/payments/sc_payments_editor_egtest.mm
@@ -64,6 +64,19 @@ void AssertTextFieldWithAccessibilityIDIsFirstResponder(
       [textField accessibilityIdentifier]);
 }
 
+// Returns the GREYMatcher for the UIAlertView's message displayed for a call
+// that notifies the delegate of selection of a field.
+id<GREYMatcher> UIAlertViewMessageForDelegateCallWithArgument(
+    NSString* argument) {
+  return grey_allOf(
+      grey_text([NSString
+          stringWithFormat:@"paymentRequestEditViewController:"
+                           @"kPaymentRequestEditCollectionViewAccessibilityID "
+                           @"didSelectField:%@",
+                           argument]),
+      grey_sufficientlyVisible(), nil);
+}
+
 }  // namespace
 
 // Tests for the payment request editor view controller.
@@ -82,13 +95,19 @@ void AssertTextFieldWithAccessibilityIDIsFirstResponder(
   [super tearDown];
 }
 
-// Tests if expected labels and textfields exist and have the expected values.
-- (void)testVerifyLabelsAndTextFields {
+// Tests if expected labels and fields exist and have the expected values.
+- (void)testVerifyLabelsAndFields {
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Name*")]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Name_textField")]
       assertWithMatcher:grey_text(@"John Doe")];
 
+  [[EarlGrey
+      selectElementWithMatcher:grey_allOf(grey_accessibilityLabel(@"Country*"),
+                                          grey_accessibilityValue(@"Canada"),
+                                          nil)]
+      assertWithMatcher:grey_notNil()];
+
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"Address*")]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey
@@ -102,6 +121,24 @@ void AssertTextFieldWithAccessibilityIDIsFirstResponder(
       assertWithMatcher:grey_text(@"")];
 }
 
+// Tests if tapping the selector field notifies the delegate.
+- (void)testVerifyTappingSelectorFieldNotifiesDelegate {
+  // Tap the selector field.
+  [[EarlGrey
+      selectElementWithMatcher:grey_allOf(grey_accessibilityLabel(@"Country*"),
+                                          grey_accessibilityValue(@"Canada"),
+                                          nil)] performAction:grey_tap()];
+
+  // Confirm the delegate is informed.
+  [[EarlGrey
+      selectElementWithMatcher:UIAlertViewMessageForDelegateCallWithArgument(
+                                   @"Label: Country, Value: CAN")]
+      assertWithMatcher:grey_notNil()];
+  [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(
+                                          @"protocol_alerter_done")]
+      performAction:grey_tap()];
+}
+
 // Tests whether tapping the input accessory view's close button dismisses the
 // input accessory view.
 - (void)testInputAccessoryViewCloseButton {
@@ -170,8 +207,7 @@ void AssertTextFieldWithAccessibilityIDIsFirstResponder(
   // required.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
                                           kWarningMessageAccessibilityID)]
-      assertWithMatcher:grey_accessibilityLabel(l10n_util::GetNSString(
-                            IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE))];
+      assertWithMatcher:grey_accessibilityLabel(@"Field is required")];
 
   // Assert the postal code textfield is focused.
   AssertTextFieldWithAccessibilityIDIsFirstResponder(@"Postal Code_textField");