Add waitUntilHasValue() to simplify usage.

BUG=161941


Review URL: https://chromiumcodereview.appspot.com/11280250

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170927 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java

@@ -61,7 +61,6 @@ public class JSUtils {
             final AwContents awContents,
             final OnEvaluateJavaScriptResultHelper onEvaluateJavaScriptResultHelper,
             final String code) throws Throwable {
-        int currentCallCount = onEvaluateJavaScriptResultHelper.getCallCount();
         testCase.getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
@@ -69,7 +68,7 @@ public class JSUtils {
                         awContents.getContentViewCore(), code);
             }
         });
-        onEvaluateJavaScriptResultHelper.waitForCallback(currentCallCount);
+        onEvaluateJavaScriptResultHelper.waitUntilHasValue();
         Assert.assertTrue("Failed to retrieve JavaScript evaluation results.",
                 onEvaluateJavaScriptResultHelper.hasValue());
         return onEvaluateJavaScriptResultHelper.getJsonResultAndClear();

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java

@@ -83,6 +83,31 @@ public class CallbackHelper {
         waitForCallback(currentCallCount, 1);
     }
 
+    /**
+     * Blocks until the criteria is satisfied or throws an exception
+     * if the specified time frame is exceeded.
+     * @param timeout timeout value.
+     * @param unit timeout unit.
+     */
+    public void waitUntilCriteria(Criteria criteria, long timeout, TimeUnit unit)
+            throws InterruptedException, TimeoutException {
+        synchronized(mLock) {
+            final long startTime = System.currentTimeMillis();
+            boolean isSatisfied = criteria.isSatisfied();
+            while (!isSatisfied &&
+                    System.currentTimeMillis() - startTime < unit.toMillis(timeout)) {
+                mLock.wait(unit.toMillis(timeout));
+                isSatisfied = criteria.isSatisfied();
+            }
+            if (!isSatisfied) throw new TimeoutException("waitUntilCriteria timed out!");
+        }
+    }
+
+    public void waitUntilCriteria(Criteria criteria)
+            throws InterruptedException, TimeoutException {
+        waitUntilCriteria(criteria, WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+    }
+
     /**
      * Should be called when the callback associated with this helper object is called.
      */

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java

@@ -121,8 +121,8 @@ public class DOMUtils {
         sb.append("  return [ node.textContent ];");
         sb.append("})();");
 
-        String jsonText = JavaScriptUtils.executeJavaScriptAndWaitForResult(view, viewClient,
-                sb.toString());
+        String jsonText = JavaScriptUtils.executeJavaScriptAndWaitForResult(
+                view, viewClient, sb.toString());
         Assert.assertFalse("Failed to retrieve contents for " + nodeId,
                 jsonText.trim().equalsIgnoreCase("null"));
 

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();
     }

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

@@ -10,6 +10,9 @@ import android.util.Log;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 /**
  * This class is used to provide callback hooks for tests and related classes.
  */
@@ -110,11 +113,37 @@ public class TestCallbackHelperContainer {
             return result;
         }
 
+
+        /**
+         * Returns a criteria that checks that the evaluation has finished.
+         */
+        public Criteria getHasValueCriteria() {
+            return new Criteria() {
+                @Override
+                public boolean isSatisfied() {
+                    return hasValue();
+                }
+            };
+        }
+
+        /**
+         * Waits till the JavaScript evaluation finishes.
+         */
+        public void waitUntilHasValue(long timeout, TimeUnit timeoutUnits)
+                throws InterruptedException, TimeoutException {
+            waitUntilCriteria(getHasValueCriteria(), timeout, timeoutUnits);
+        }
+
+        public void waitUntilHasValue() throws InterruptedException, TimeoutException {
+            waitUntilCriteria(getHasValueCriteria());
+        }
+
         private void setRequestId(Integer requestId) {
             mRequestId = requestId;
             mId = null;
             mJsonResult = null;
         }
+
         public void notifyCalled(int id, String jsonResult) {
             if (mRequestId == null) {
                 Log.w("TestCallbackHelperContainer",