[android_webivew] Refactor polling checks in test code.

android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java

 // Copyright 2012 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.
 
 package org.chromium.android_webview.test;
 
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwCookieManager;
 import org.chromium.android_webview.test.util.JSUtils;
 import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.test.util.Criteria;
-import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.test.util.TestWebServer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Callable;
 
 /**
  * Tests for the CookieManager.
  */
 public class CookieManagerTest extends AwTestBase {
 
     private AwCookieManager mCookieManager;
     private TestAwContentsClient mContentsClient;
     private AwContents mAwContents;
 
@@ skipping 79 matching lines @@
             throws Throwable {
         JSUtils.executeJavaScriptAndWaitForResult(
                 this, mAwContents,
                 mContentsClient.getOnEvaluateJavaScriptResultHelper(),
                 "var expirationDate = new Date();" +
                 "expirationDate.setDate(expirationDate.getDate() + 5);" +
                 "document.cookie='" + name + "=" + value +
                         "; expires=' + expirationDate.toUTCString();");
     }
 
-    private void waitForCookie(final String url) throws InterruptedException {
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+    private void waitForCookie(final String url) throws Exception {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
+            public Boolean call() throws Exception {
                 return mCookieManager.getCookie(url) != null;
             }
-        }));
+        });
     }
 
     private void validateCookies(String responseCookie, String... expectedCookieNames) {
         String[] cookies = responseCookie.split(";");
         Set<String> foundCookieNames = new HashSet<String>();
         for (String cookie : cookies) {
             foundCookieNames.add(cookie.substring(0, cookie.indexOf("=")).trim());
         }
         MoreAsserts.assertEquals(
                 foundCookieNames, new HashSet<String>(Arrays.asList(expectedCookieNames)));
     }
 
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})
-    public void testRemoveAllCookie() throws InterruptedException {
+    public void testRemoveAllCookie() throws Exception {
         // enable cookie
         mCookieManager.setAcceptCookie(true);
         assertTrue(mCookieManager.acceptCookie());
 
         // first there should be no cookie stored
         mCookieManager.removeAllCookie();
         mCookieManager.flushCookieStore();
         assertFalse(mCookieManager.hasCookies());
 
         String url = "http://www.example.com";
         String cookie = "name=test";
         mCookieManager.setCookie(url, cookie);
         assertEquals(cookie, mCookieManager.getCookie(url));
 
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
+            public Boolean call() throws Exception {
                 return mCookieManager.hasCookies();
             }
-        }));
+        });
 
         // clean up all cookies
         mCookieManager.removeAllCookie();
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
+            public Boolean call() throws Exception {
                 return !mCookieManager.hasCookies();
             }
-        }));
+        });
     }
 
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})
     @SuppressWarnings("deprecation")
-    public void testCookieExpiration() throws InterruptedException {
+    public void testCookieExpiration() throws Exception {
         // enable cookie
         mCookieManager.setAcceptCookie(true);
         assertTrue(mCookieManager.acceptCookie());
         mCookieManager.removeAllCookie();
         assertFalse(mCookieManager.hasCookies());
 
         final String url = "http://www.example.com";
         final String cookie1 = "cookie1=peter";
         final String cookie2 = "cookie2=sue";
         final String cookie3 = "cookie3=marc";
@@ skipping 10 matching lines @@
         date.setTime(date.getTime() + expiration);
         String value3 = cookie3 + "; expires=" + date.toGMTString();
         mCookieManager.setCookie(url, value3); // expires in 3s
 
         String allCookies = mCookieManager.getCookie(url);
         assertTrue(allCookies.contains(cookie1));
         assertTrue(allCookies.contains(cookie2));
         assertTrue(allCookies.contains(cookie3));
 
         mCookieManager.removeSessionCookie();
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
+            public Boolean call() throws Exception {
                 String c = mCookieManager.getCookie(url);
                 return !c.contains(cookie1) && c.contains(cookie2) && c.contains(cookie3);
             }
-        }));
+        });
 
         Thread.sleep(expiration + 1000); // wait for cookie to expire
         mCookieManager.removeExpiredCookie();
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
+            public Boolean call() throws Exception {
                 String c = mCookieManager.getCookie(url);
                 return !c.contains(cookie1) && c.contains(cookie2) && !c.contains(cookie3);
             }
-        }));
+        });
 
         mCookieManager.removeAllCookie();
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
+            public Boolean call() throws Exception {
                 return mCookieManager.getCookie(url) == null;
             }
-        }));
+        });
     }
 }