[Payment Request] Improved matching for the UIAlertView in showcase egtests

ios/showcase/payments/sc_payments_picker_egtest.mm

 // Copyright 2017 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.
 
 #import <EarlGrey/EarlGrey.h>
 
 #import "ios/chrome/browser/payments/payment_request_picker_view_controller.h"
 #import "ios/showcase/test/showcase_eg_utils.h"
 #import "ios/showcase/test/showcase_test_case.h"
 
@@ skipping 29 matching lines @@
   return matcher;
 }
 
 // Returns the GREYMatcher for the search bar's cancel button.
 id<GREYMatcher> CancelButton() {
   return grey_allOf(grey_accessibilityLabel(@"Cancel"),
                     grey_accessibilityTrait(UIAccessibilityTraitButton),
                     grey_sufficientlyVisible(), nil);
 }
 
+// Returns the GREYMatcher for the UIAlertView's message displayed for a call
+// that notifies the delegate of a selection.
+id<GREYMatcher> UIAlertViewMessageForDelegateCallWithArgument(
+    NSString* argument) {
+  return grey_allOf(
+      grey_text(
+          [NSString stringWithFormat:
+                        @"paymentRequestPickerViewController:"
+                        @"kPaymentRequestPickerViewControllerAccessibilityID "
+                        @"didSelectRow:%@",
+                        argument]),
+      grey_sufficientlyVisible(), nil);
+}
+
 }  // namespace
 
 // Tests for the payment request picker view controller.
 @interface SCPaymentsPickerTestCase : ShowcaseTestCase
 @end
 
 @implementation SCPaymentsPickerTestCase
 
 - (void)setUp {
   [super setUp];
@@ skipping 225 matching lines @@
 - (void)testVerifySelection {
   // 'China' is selected.
   [[EarlGrey selectElementWithMatcher:RowWithLabel(@"China", YES)]
       assertWithMatcher:grey_notNil()];
 
   // 'Canada' is not selected. Tap it.
   [[EarlGrey selectElementWithMatcher:RowWithLabel(@"Canada", NO)]
       performAction:grey_tap()];
 
   // Confirm the delegate is informed.
+  [[EarlGrey
+      selectElementWithMatcher:UIAlertViewMessageForDelegateCallWithArgument(
+                                   @"Label: Canada, Value: CAN")]
+      assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(
                                           @"protocol_alerter_done")]
       performAction:grey_tap()];
 
   // 'China' is not selected anymore.
   [[EarlGrey selectElementWithMatcher:RowWithLabel(@"China", NO)]
       assertWithMatcher:grey_notNil()];
 
   // Now 'Canada' is selected. Tap it again.
   [[EarlGrey selectElementWithMatcher:RowWithLabel(@"Canada", YES)]
       performAction:grey_tap()];
 
   // Confirm the delegate is informed.
+  [[EarlGrey
+      selectElementWithMatcher:UIAlertViewMessageForDelegateCallWithArgument(
+                                   @"Label: Canada, Value: CAN")]
+      assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(
                                           @"protocol_alerter_done")]
       performAction:grey_tap()];
 
   // 'China' is still not selected.
   [[EarlGrey selectElementWithMatcher:RowWithLabel(@"China", NO)]
       assertWithMatcher:grey_notNil()];
 
   // 'Canada' is still selected.
   [[EarlGrey selectElementWithMatcher:RowWithLabel(@"Canada", YES)]
       assertWithMatcher:grey_notNil()];
 }
 
 @end