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

Unified Diff: ios/web/shell/test/plugin_placeholder_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/pdf_egtest.mm ('k') | ios/web/shell/test/redirect_egtest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/shell/test/plugin_placeholder_egtest.mm
diff --git a/ios/web/shell/test/plugin_placeholder_egtest.mm b/ios/web/shell/test/plugin_placeholder_egtest.mm
index a3a29cb8ff0248215ab9bb2d5b19e6b1f5c1a4d7..1f4dbb91db4228c4740becdefd744fdb9e27f198 100644
--- a/ios/web/shell/test/plugin_placeholder_egtest.mm
+++ b/ios/web/shell/test/plugin_placeholder_egtest.mm
@@ -20,8 +20,8 @@
#error "This file requires ARC support."
#endif
-using web::webViewContainingText;
-using web::webViewCssSelector;
+using web::WebViewContainingText;
+using web::WebViewCssSelector;
namespace {
@@ -57,11 +57,11 @@ void LoadPage(const std::string& page_content) {
LoadPage(page);
// Verify that placeholder image is not displayed.
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageDescription)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageDescription)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kFallbackText)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kFallbackText)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewCssSelector("img")]
+ [[EarlGrey selectElementWithMatcher:WebViewCssSelector("img")]
assertWithMatcher:grey_nil()];
}
@@ -78,9 +78,9 @@ void LoadPage(const std::string& page_content) {
LoadPage(page);
// Verify that plugin object is replaced with placeholder image.
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageDescription)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageDescription)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewCssSelector("img[src*='data']")]
+ [[EarlGrey selectElementWithMatcher:WebViewCssSelector("img[src*='data']")]
assertWithMatcher:grey_notNil()];
}
@@ -101,9 +101,9 @@ void LoadPage(const std::string& page_content) {
LoadPage(page);
// Verify that plugin object is replaced with placeholder image.
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageDescription)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageDescription)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewCssSelector("img[src*='data']")]
+ [[EarlGrey selectElementWithMatcher:WebViewCssSelector("img[src*='data']")]
assertWithMatcher:grey_notNil()];
}
@@ -124,11 +124,11 @@ void LoadPage(const std::string& page_content) {
LoadPage(page);
// Verify that placeholder image is not displayed.
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageDescription)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageDescription)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kFallbackText)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kFallbackText)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewCssSelector("img")]
+ [[EarlGrey selectElementWithMatcher:WebViewCssSelector("img")]
assertWithMatcher:grey_nil()];
}
@@ -146,9 +146,9 @@ void LoadPage(const std::string& page_content) {
LoadPage(page);
// Verify that plugin object is replaced with placeholder image.
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageDescription)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageDescription)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewCssSelector("img[src*='data']")]
+ [[EarlGrey selectElementWithMatcher:WebViewCssSelector("img[src*='data']")]
assertWithMatcher:grey_notNil()];
}
@@ -165,9 +165,9 @@ void LoadPage(const std::string& page_content) {
LoadPage(page);
// Verify that placeholder image is not displayed.
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageDescription)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageDescription)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewCssSelector("img")]
+ [[EarlGrey selectElementWithMatcher:WebViewCssSelector("img")]
assertWithMatcher:grey_nil()];
}
@@ -203,9 +203,9 @@ void LoadPage(const std::string& page_content) {
LoadPage(page);
// Verify that placeholder image is not displayed.
- [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageDescription)]
+ [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageDescription)]
assertWithMatcher:grey_notNil()];
- [[EarlGrey selectElementWithMatcher:webViewCssSelector("img")]
+ [[EarlGrey selectElementWithMatcher:WebViewCssSelector("img")]
assertWithMatcher:grey_nil()];
}
« no previous file with comments | « ios/web/shell/test/pdf_egtest.mm ('k') | ios/web/shell/test/redirect_egtest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698