Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Unified Diff: ios/web/shell/test/navigation_egtest.mm

Issue 2642193012: Make EarlGrey matchers compliant with Chromium style. (Closed)
Patch Set: build.gn and rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/shell/test/meta_tags_egtest.mm ('k') | ios/web/shell/test/page_state_egtest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/shell/test/navigation_egtest.mm
diff --git a/ios/web/shell/test/navigation_egtest.mm b/ios/web/shell/test/navigation_egtest.mm
index 8f7f818d2c5291ddaf06d662978fff218ba99d7d..ba716801d3b3c9bbd094b98310cfcd1f3e179968 100644
--- a/ios/web/shell/test/navigation_egtest.mm
+++ b/ios/web/shell/test/navigation_egtest.mm
@@ -34,13 +34,13 @@
web::test::SetUpFileBasedHttpServer();
[ShellEarlGrey loadURL:URL];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
assertWithMatcher:grey_notNil()];
web::shell_test_util::TapWebViewElementWithId(
"basic-link-navigation-to-about-blank");
- [[EarlGrey selectElementWithMatcher:web::addressFieldText("about:blank")]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText("about:blank")]
assertWithMatcher:grey_notNil()];
}
@@ -59,29 +59,29 @@
web::test::SetUpSimpleHttpServer(responses);
[ShellEarlGrey loadURL:URL1];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL1.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL1.spec())]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response1)]
+ [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response1)]
assertWithMatcher:grey_notNil()];
[ShellEarlGrey loadURL:URL2];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL2.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL2.spec())]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response2)]
+ [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response2)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::backButton()]
+ [[EarlGrey selectElementWithMatcher:web::BackButton()]
performAction:grey_tap()];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL1.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL1.spec())]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response1)]
+ [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response1)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::forwardButton()]
+ [[EarlGrey selectElementWithMatcher:web::ForwardButton()]
performAction:grey_tap()];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL2.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL2.spec())]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response2)]
+ [[EarlGrey selectElementWithMatcher:web::WebViewContainingText(response2)]
assertWithMatcher:grey_notNil()];
}
@@ -98,21 +98,21 @@
web::test::SetUpSimpleHttpServer(responses);
[ShellEarlGrey loadURL:URL1];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL1.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL1.spec())]
assertWithMatcher:grey_notNil()];
web::shell_test_util::TapWebViewElementWithId("link");
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL2.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL2.spec())]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::backButton()]
+ [[EarlGrey selectElementWithMatcher:web::BackButton()]
performAction:grey_tap()];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL1.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL1.spec())]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:web::forwardButton()]
+ [[EarlGrey selectElementWithMatcher:web::ForwardButton()]
performAction:grey_tap()];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL2.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL2.spec())]
assertWithMatcher:grey_notNil()];
}
@@ -136,15 +136,15 @@
web::test::SetUpSimpleHttpServer(responses);
[ShellEarlGrey loadURL:URL];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
assertWithMatcher:grey_notNil()];
web::shell_test_util::TapWebViewElementWithId("overrides-href");
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
assertWithMatcher:grey_notNil()];
[[EarlGrey
- selectElementWithMatcher:web::webViewContainingText("Default prevented!")]
+ selectElementWithMatcher:web::WebViewContainingText("Default prevented!")]
assertWithMatcher:grey_notNil()];
}
@@ -168,15 +168,15 @@
web::test::SetUpSimpleHttpServer(responses);
[ShellEarlGrey loadURL:URL];
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
assertWithMatcher:grey_notNil()];
web::shell_test_util::TapWebViewElementWithId("link");
- [[EarlGrey selectElementWithMatcher:web::addressFieldText(URL.spec())]
+ [[EarlGrey selectElementWithMatcher:web::AddressFieldText(URL.spec())]
assertWithMatcher:grey_notNil()];
[[EarlGrey
- selectElementWithMatcher:web::webViewContainingText("No navigation!")]
+ selectElementWithMatcher:web::WebViewContainingText("No navigation!")]
assertWithMatcher:grey_notNil()];
}
« no previous file with comments | « ios/web/shell/test/meta_tags_egtest.mm ('k') | ios/web/shell/test/page_state_egtest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698