ios/web/public/test/earl_grey/js_test_util.mm - Issue 2448753002: Refactor wait_util so it isn't coupled to EarlGrey.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ios/web/public/test/earl_grey/js_test_util.mm

Issue 2448753002: Refactor wait_util so it isn't coupled to EarlGrey. (Closed)

Patch Set: cleanup Created 4 years, 1 month 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #import "ios/web/public/test/earl_grey/js_test_util.h"	5 #import "ios/web/public/test/earl_grey/js_test_util.h"

6	6

7 #import <EarlGrey/EarlGrey.h>	7 #import <EarlGrey/EarlGrey.h>

8 #import <WebKit/WebKit.h>	8 #import <WebKit/WebKit.h>

9	9

10 #include "base/timer/elapsed_timer.h"	10 #include "base/timer/elapsed_timer.h"

11 #import "ios/testing/earl_grey/wait_util.h"	11 #import "ios/testing/wait_util.h"

12 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"	12 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"

13	13

14 namespace web {	14 namespace web {

15	15

16 void WaitUntilWindowIdInjected(WebState* web_state) {	16 void WaitUntilWindowIdInjected(WebState* web_state) {

17 bool is_window_id_injected = false;	17 bool is_window_id_injected = false;

18 bool is_timeout = false;	18 bool is_timeout = false;

19 bool is_unrecoverable_error = false;	19 bool is_unrecoverable_error = false;

20	20

21 base::ElapsedTimer timer;	21 base::ElapsedTimer timer;

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 }];	62 }];

63 GREYAssert([condition waitWithTimeout:testing::kWaitForJSCompletionTimeout],	63 GREYAssert([condition waitWithTimeout:testing::kWaitForJSCompletionTimeout],

64 @"Script execution timed out");	64 @"Script execution timed out");

65	65

66 if (out_error)	66 if (out_error)

67 [*out_error autorelease];	67 [*out_error autorelease];

68 return [result autorelease];	68 return [result autorelease];

69 }	69 }

70	70

71 } // namespace web	71 } // namespace web

OLD	NEW

« ios/testing/wait_util.mm ('K') | « ios/web/BUILD.gn ('k') | ios/web/public/test/earl_grey/web_view_actions.mm » ('j') | ios/web/public/test/earl_grey/web_view_actions.mm » ('J')