Create ChromeEarlGrey waitForWebViewContainingText.

ios/chrome/browser/ui/fullscreen_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/ios/ios_util.h"
 #include "base/mac/bind_objc_block.h"
@@ skipping 59 matching lines @@
     NSError* error = nil;
     [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                             expectedURL.GetContent())]
         assertWithMatcher:grey_notNil()
                     error:&error];
     return (error == nil);
   };
   GREYAssert(testing::WaitUntilConditionOrTimeout(1.0, condition), description);
 }
 
-// Asserts that the current web view containers contains |text|.
-void AssertStringIsPresentOnPage(const std::string& text) {
-  id<GREYMatcher> response_matcher =
-      chrome_test_util::WebViewContainingText(text);
-  [[EarlGrey selectElementWithMatcher:response_matcher]
-      assertWithMatcher:grey_notNil()];
-}
-
 }  // namespace
 
 #pragma mark - Tests
 
 // Fullscreens tests for Chrome.
 @interface FullscreenTestCase : ChromeTestCase
 
 @end
 
 @implementation FullscreenTestCase
@@ skipping 65 matching lines @@
   // Test that the toolbar is hidden after a user swipes up.
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 }
 
 // Tests that link clicks from a chrome:// to chrome:// link result in the
 // header being shown even if was not previously shown.
 - (void)testChromeToChromeURLKeepsHeaderOnScreen {
   const GURL kChromeAboutURL("chrome://chrome-urls");
   [ChromeEarlGrey loadURL:kChromeAboutURL];
-
-  AssertStringIsPresentOnPage("chrome://version");
+  [ChromeEarlGrey waitForWebViewContainingText:"chrome://version"];
 
   // Hide the toolbar. The page is not long enough to dismiss the toolbar using
   // the UI so we have to zoom in.
   const char script[] =
       "(function(){"
       "var metas = document.getElementsByTagName('meta');"
       "for (var i=0; i<metas.length; i++) {"
       "  if (metas[i].getAttribute('name') == 'viewport') {"
       "    metas[i].setAttribute('content', 'width=10');"
       "    return;"
@@ skipping 58 matching lines @@
   std::map<GURL, std::string> responses;
   const GURL URL = web::test::HttpServer::MakeUrl("http://origin");
   // This is a tall page -- necessary to make sure scrolling can hide away the
   // toolbar safely-- and with a link to reload itself.
   responses[URL] =
       "<p style='height:200em'>Tall page</p>"
       "<a onclick='window.location.reload();' id='link'>link</a>";
   web::test::SetUpSimpleHttpServer(responses);
 
   [ChromeEarlGrey loadURL:URL];
-  AssertStringIsPresentOnPage("Tall page");
+  [ChromeEarlGrey waitForWebViewContainingText:"Tall page"];
 
   // Hide the toolbar.
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 
   chrome_test_util::TapWebViewElementWithId("link");
 
   // Main test is here: Make sure the header is still visible!
   [ChromeEarlGreyUI waitForToolbarVisible:YES];
 }
@@ skipping 19 matching lines @@
   javaScript = "window.close()";
   responses[destinationURL] = base::StringPrintf(
       "<p style='height:200em'>whatever</p><a onclick='%s' "
       "id='link2'>link2</a>",
       javaScript.c_str());
 
   web::test::SetUpSimpleHttpServer(responses);
   chrome_test_util::SetContentSettingsBlockPopups(CONTENT_SETTING_ALLOW);
 
   [ChromeEarlGrey loadURL:URL];
-  AssertStringIsPresentOnPage("link1");
+  [ChromeEarlGrey waitForWebViewContainingText:"link1"];
   chrome_test_util::AssertMainTabCount(1);
 
   // Hide the toolbar.
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 
   // Open new window.
   chrome_test_util::TapWebViewElementWithId("link1");
 
   // Check that a new Tab was created.
-  AssertStringIsPresentOnPage("link2");
+  [ChromeEarlGrey waitForWebViewContainingText:"link2"];
   chrome_test_util::AssertMainTabCount(2);
 
   AssertURLIs(destinationURL);
 
   // Hide the toolbar.
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 
   // Close the tab.
   chrome_test_util::TapWebViewElementWithId("link2");
-  AssertStringIsPresentOnPage("link1");
+  [ChromeEarlGrey waitForWebViewContainingText:"link1"];
 
   // Make sure the toolbar is on the screen.
   chrome_test_util::AssertMainTabCount(1);
   [ChromeEarlGreyUI waitForToolbarVisible:YES];
 }
 
 // Tests that the header is shown when a regular page (non-native page) is
 // loaded from a page where the header was not see before.
 // Also tests that auto-hide works correctly on new page loads.
 - (void)testShowHeaderOnRegularPageLoad {
@@ skipping 10 matching lines @@
                          "' id='link1'>link1</a>";
   // A long page representing many lines and a link to go back.
   responses[destinationURL] = manyLines +
                               "<a href='javascript:void(0)' "
                               "onclick='window.history.back()' "
                               "id='link2'>link2</a>";
   web::test::SetUpSimpleHttpServer(responses);
 
   [ChromeEarlGrey loadURL:originURL];
 
-  AssertStringIsPresentOnPage("link1");
+  [ChromeEarlGrey waitForWebViewContainingText:"link1"];
   // Dismiss the toolbar.
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 
   // Navigate to the other page.
   chrome_test_util::TapWebViewElementWithId("link1");
-  AssertStringIsPresentOnPage("link2");
+  [ChromeEarlGrey waitForWebViewContainingText:"link2"];
 
   // Make sure toolbar is shown since a new load has started.
   [ChromeEarlGreyUI waitForToolbarVisible:YES];
 
   // Dismiss the toolbar.
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 
   // Go back.
   chrome_test_util::TapWebViewElementWithId("link2");
 
   // Make sure the toolbar has loaded now that a new page has loaded.
   [ChromeEarlGreyUI waitForToolbarVisible:YES];
 }
 
 // Tests that the header is shown when a native page is loaded from a page where
 // the header was not seen before.
 - (void)testShowHeaderOnNativePageLoad {
   std::map<GURL, std::string> responses;
   const GURL URL = web::test::HttpServer::MakeUrl("http://origin");
 
   // A long page representing many lines and a link to go back.
   std::string manyLines =
       "<p style='height:100em'>a</p>"
       "<a onclick='window.history.back()' id='link'>link</a>";
   responses[URL] = manyLines;
   web::test::SetUpSimpleHttpServer(responses);
 
   [ChromeEarlGrey loadURL:URL];
-  AssertStringIsPresentOnPage("link");
+  [ChromeEarlGrey waitForWebViewContainingText:"link"];
 
   // Dismiss the toolbar.
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 
   // Go back to NTP, which is a native view.
   chrome_test_util::TapWebViewElementWithId("link");
 
   // Make sure the toolbar is visible now that a new page has loaded.
   [ChromeEarlGreyUI waitForToolbarVisible:YES];
@@ skipping 17 matching lines @@
   [ChromeEarlGrey loadURL:URL];
   HideToolbarUsingUI();
   [ChromeEarlGreyUI waitForToolbarVisible:NO];
 
   chrome_test_util::TapWebViewElementWithId("link");
   AssertURLIs(ErrorPageResponseProvider::GetDnsFailureUrl());
   [ChromeEarlGreyUI waitForToolbarVisible:YES];
 }
 
 @end