Create ChromeEarlGrey waitForWebViewContainingText.

ios/chrome/browser/ui/history/history_ui_egtest.mm

 // Copyright 2016 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 <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 23 matching lines @@
 #import "ios/testing/wait_util.h"
 #import "ios/web/public/test/http_server/http_server.h"
 #import "ios/web/public/test/http_server/http_server_util.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
+using base::SysUTF8ToNSString;
 using chrome_test_util::ButtonWithAccessibilityLabelId;
 using chrome_test_util::NavigationBarDoneButton;
 using chrome_test_util::OpenLinkInNewTabButton;
-using chrome_test_util::WebViewContainingText;
 
 namespace {
 char kURL1[] = "http://firstURL";
 char kURL2[] = "http://secondURL";
 char kURL3[] = "http://thirdURL";
 char kTitle1[] = "Page 1";
 char kTitle2[] = "Page 2";
 char kResponse1[] = "Test Page 1 content";
 char kResponse2[] = "Test Page 2 content";
 char kResponse3[] = "Test Page 3 content";
 
 // Matcher for entry in history for URL and title.
 id<GREYMatcher> HistoryEntry(const GURL& url, const std::string& title) {
-  NSString* url_spec_text = base::SysUTF8ToNSString(url.spec());
-  NSString* title_text = base::SysUTF8ToNSString(title);
+  NSString* url_spec_text = SysUTF8ToNSString(url.spec());

[Eugene But (OOO till 7-30), 2017/06/12 03:47:11]

nit: Is this really necessary?

[baxley, 2017/06/12 16:41:17]

Nope. This was there from when I had the API take NSString, and we had to do
more conversions. Nice catch!

+  NSString* title_text = SysUTF8ToNSString(title);
 
   MatchesBlock matches = ^BOOL(HistoryEntryCell* cell) {
     return [cell.textLabel.text isEqual:title_text] &&
            [cell.detailTextLabel.text isEqual:url_spec_text];
   };
 
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"view containing URL text: "];
     [description appendText:url_spec_text];
     [description appendText:@" title text: "];
@@ skipping 173 matching lines @@
   [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL1, kTitle1)]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL2, kTitle2)]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL3, _URL3.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Tap a history entry and assert that navigation to that entry's URL occurs.
   [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL1, kTitle1)]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:kResponse1];
 }
 
 // Tests that history is not changed after performing back navigation.
 - (void)testHistoryUpdateAfterBackNavigation {
   [ChromeEarlGrey loadURL:_URL1];
   [ChromeEarlGrey loadURL:_URL2];
 
   [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:kResponse1];
 
   [self openHistoryPanel];
 
   [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL1, kTitle1)]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL2, kTitle2)]
       assertWithMatcher:grey_notNil()];
 }
 
 // Test that history displays a message about entries only if the user is logged
@@ skipping 196 matching lines @@
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   // Close history.
   [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
 }
 
 #pragma mark Helper Methods
 
 - (void)loadTestURLs {
   [ChromeEarlGrey loadURL:_URL1];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:kResponse1];
 
   [ChromeEarlGrey loadURL:_URL2];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse2)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:kResponse2];
 
   [ChromeEarlGrey loadURL:_URL3];
-  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse3)]
-      assertWithMatcher:grey_notNil()];
+  [ChromeEarlGrey waitForWebViewContainingText:kResponse3];
 }
 
 - (void)openHistoryPanel {
   [ChromeEarlGreyUI openToolsMenu];
   [[EarlGrey selectElementWithMatcher:HistoryButton()]
       performAction:grey_tap()];
 }
 
 - (void)assertNoHistoryShown {
   id<GREYMatcher> noHistoryMessageMatcher =
@@ skipping 12 matching lines @@
 - (void)resetBrowsingDataPrefs {
   PrefService* prefs = chrome_test_util::GetOriginalBrowserState()->GetPrefs();
   prefs->ClearPref(browsing_data::prefs::kDeleteBrowsingHistory);
   prefs->ClearPref(browsing_data::prefs::kDeleteCookies);
   prefs->ClearPref(browsing_data::prefs::kDeleteCache);
   prefs->ClearPref(browsing_data::prefs::kDeletePasswords);
   prefs->ClearPref(browsing_data::prefs::kDeleteFormData);
 }
 
 @end