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

Unified Diff: ios/web_view/test/web_view_interaction_test_util.mm

Issue 2941763003: Cleanup ios_web_view integration tests. (Closed)
Patch Set: Addressed review comments Created 3 years, 6 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_view/test/web_view_interaction_test_util.h ('k') | ios/web_view/test/web_view_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web_view/test/web_view_interaction_test_util.mm
diff --git a/ios/web_view/test/web_view_interaction_test_util.mm b/ios/web_view/test/web_view_interaction_test_util.mm
deleted file mode 100644
index 56572335aa2f21af665165a5519fb1481ef99774..0000000000000000000000000000000000000000
--- a/ios/web_view/test/web_view_interaction_test_util.mm
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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 "ios/web_view/test/web_view_interaction_test_util.h"
-
-#import <ChromeWebView/ChromeWebView.h>
-
-#import "ios/testing/wait_util.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-using testing::WaitUntilConditionOrTimeout;
-
-namespace ios_web_view {
-namespace test {
-
-bool TapChromeWebViewElementWithId(CWVWebView* web_view, NSString* element_id) {
- // TODO(crbug.com/725524): Share this script with Chrome.
- NSString* script = [NSString
- stringWithFormat:@"(function() {"
- " var element = document.getElementById('%@');"
- " if (element) {"
- " element.click();"
- " return true;"
- " }"
- " return false;"
- "})();",
- element_id];
- return [EvaluateJavaScript(web_view, script, nil) boolValue];
-}
-
-id EvaluateJavaScript(CWVWebView* web_view, NSString* script, NSError** error) {
- __block bool did_complete = false;
- __block id evaluation_result = nil;
- __block id evaluation_error = nil;
- [web_view evaluateJavaScript:script
- completionHandler:^(id local_result, NSError* local_error) {
- did_complete = true;
- evaluation_result = [local_result copy];
- evaluation_error = [local_error copy];
- }];
-
- WaitUntilConditionOrTimeout(testing::kWaitForJSCompletionTimeout, ^{
- return did_complete;
- });
-
- if (error)
- *error = evaluation_error;
-
- return evaluation_result;
-}
-
-bool WaitForWebViewContainingTextOrTimeout(CWVWebView* web_view,
- NSString* text) {
- return WaitUntilConditionOrTimeout(testing::kWaitForUIElementTimeout, ^{
- id body = ios_web_view::test::EvaluateJavaScript(
- web_view, @"document.body ? document.body.textContent : null", nil);
- return [body isKindOfClass:[NSString class]] && [body containsString:text];
- });
-}
-
-} // namespace test
-} // namespace ios_web_view
« no previous file with comments | « ios/web_view/test/web_view_interaction_test_util.h ('k') | ios/web_view/test/web_view_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698