content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java - Issue 11280250: Add waitUntilHasValue() to simplify usage.

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

Unified Diff: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

Issue 11280250: Add waitUntilHasValue() to simplify usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase.. Created 8 years 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 | « content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java ('k') | content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

index c9fbf428800a121650c2531859f90265955717bc..679401a38e4d480607be2faae71321d495ea9c21 100644

--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

@@ -56,14 +56,13 @@ public class JavaScriptUtils {

final String code,

final long timeout, final TimeUnit timeoutUnits)

throws InterruptedException, TimeoutException {

- int currentCallCount = helper.getCallCount();

ThreadUtils.runOnUiThread(new Runnable() {

@Override

public void run() {

helper.evaluateJavaScript(viewCore, code);

}

});

- helper.waitForCallback(currentCallCount, 1, timeout, timeoutUnits);

+ helper.waitUntilHasValue(timeout, timeoutUnits);

Assert.assertTrue("Failed to retrieve JavaScript evaluation results.", helper.hasValue());

return helper.getJsonResultAndClear();

}