Fix libadblockplus-android tests, Part 2

adblock-android-tests/src/org/adblockplus/libadblockplus/tests/AndroidWebRequestTest.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.libadblockplus.tests;
 
-import org.adblockplus.libadblockplus.JsEngine;
+import android.os.SystemClock;
+
+import org.adblockplus.libadblockplus.BaseFilterEngineTest;
+import org.adblockplus.libadblockplus.HeaderEntry;
 import org.adblockplus.libadblockplus.WebRequest;
 import org.adblockplus.libadblockplus.android.AndroidWebRequest;
 import org.adblockplus.libadblockplus.JsValue;
 import org.adblockplus.libadblockplus.ServerResponse;
 
 import org.junit.Test;
 
 import java.net.MalformedURLException;
 import java.util.List;
 
 // It inherits the fixture instantiating FilterEngine which is not explicitly
 // used in the test bodies in order to provide with JS XMLHttpRequest class
 // which is defined in compat.js, but the latter is properly loaded by
 // FilterEngine.
 public class AndroidWebRequestTest extends BaseFilterEngineTest
 {
+  private static class AndroidWebRequestWrapper implements WebRequest
+  {
+    private AndroidWebRequest androidWebRequest = new AndroidWebRequest(true, true);
+    private volatile int requestCount;
+
+    public int getRequestCount()
+    {
+      return requestCount;
+    }
+
+    @Override
+    public ServerResponse httpGET(String url, List<HeaderEntry> headers)
+    {
+      ServerResponse response = androidWebRequest.httpGET(url, headers);
+      requestCount++;
+      return response;
+    }
+  }
+
+  private AndroidWebRequestWrapper webRequestWrapper = new AndroidWebRequestWrapper();
+
   @Override
-  protected WebRequest createWebRequest()
+  protected void setUp() throws Exception
   {
-    return new AndroidWebRequest(true, true);
+    setWebRequest(webRequestWrapper);
+    super.setUp();
   }
 
   @Test
   public void testRealWebRequest()
   {
-    JsEngine jsEngine = platform.getJsEngine();
     // This URL should redirect to easylist-downloads.adblockplus.org and we
     // should get the actual filter list back.
     jsEngine.evaluate(
       "let foo; _webRequest.GET('https://easylist-downloads.adblockplus.org/easylist.txt', {}, " +
       "function(result) {foo = result;} )");
     do
     {
-      try
-      {
-        Thread.sleep(200);
-      }
-      catch (InterruptedException e)
-      {
-        throw new RuntimeException(e);
-      }
+      SystemClock.sleep(50);
     } while (jsEngine.evaluate("foo").isUndefined());
 
     String response = jsEngine.evaluate("foo.responseText").asString();
     assertNotNull(response);
     assertEquals(
       ServerResponse.NsStatus.OK.getStatusCode(),
       jsEngine.evaluate("foo.status").asLong());
     assertEquals(200l, jsEngine.evaluate("foo.responseStatus").asLong());
     assertEquals(
       "[Adblock Plus ",
       jsEngine.evaluate("foo.responseText.substr(0, 14)").asString());
     JsValue jsHeaders = jsEngine.evaluate("foo.responseHeaders");
     assertNotNull(jsHeaders);
     assertFalse(jsHeaders.isUndefined());
     assertFalse(jsHeaders.isNull());
     assertTrue(jsHeaders.isObject());
     assertEquals(
       "text/plain",
       jsEngine.evaluate("foo.responseHeaders['content-type'].substr(0, 10)").asString());
     assertTrue(jsEngine.evaluate("foo.responseHeaders['location']").isUndefined());
   }
 
   @Test
   public void testXMLHttpRequest()
   {
-    JsEngine jsEngine = platform.getJsEngine();
     jsEngine.evaluate(
       "var result;\n" +
       "var request = new XMLHttpRequest();\n" +
       "request.open('GET', 'https://easylist-downloads.adblockplus.org/easylist.txt');\n" +
       "request.setRequestHeader('X', 'Y');\n" +
       "request.setRequestHeader('X2', 'Y2');\n" +
       "request.overrideMimeType('text/plain');\n" +
       "request.addEventListener('load',function() {result=request.responseText;}, false);\n" +
       "request.addEventListener('error',function() {result='error';}, false);\n" +
       "request.send(null);");
 
     do
     {
-      try
-      {
-        Thread.sleep(200);
-      }
-      catch (InterruptedException e)
-      {
-        throw new RuntimeException(e);
-      }
+      SystemClock.sleep(50);
     } while (jsEngine.evaluate("result").isUndefined());
 
     assertEquals(
       ServerResponse.NsStatus.OK.getStatusCode(),
       jsEngine.evaluate("request.channel.status").asLong());
 
     assertEquals(200l, jsEngine.evaluate("request.status").asLong());
     assertEquals("[Adblock Plus ", jsEngine.evaluate("result.substr(0, 14)").asString());
     assertEquals(
       "text/plain",
       jsEngine.evaluate("request.getResponseHeader('Content-Type').substr(0, 10)").asString());
     assertTrue(jsEngine.evaluate("request.getResponseHeader('Location')").isNull());
   }
 
   @Test
-  public void testGetElemhideElements() throws MalformedURLException, InterruptedException
+  public void testGetElemhideElements() throws MalformedURLException
   {
-    Thread.sleep(20 * 1000); // wait for the subscription to be downloaded
+    // Wait for Easylist & AA
+    while (webRequestWrapper.getRequestCount() < 2)
+    {
+      SystemClock.sleep(UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS / UPDATE_SUBSCRIPTIONS_WAIT_CHUNKS);
+    }
+    // A grace period, just in case
+    SystemClock.sleep(UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS / UPDATE_SUBSCRIPTIONS_WAIT_CHUNKS);
 
     final String url = "www.mobile01.com/somepage.html";
 
     boolean isDocumentWhitelisted = filterEngine.isDocumentWhitelisted(url, null);
     assertFalse(isDocumentWhitelisted);
 
     boolean isElemhideWhitelisted = filterEngine.isElemhideWhitelisted(url, null);
     assertFalse(isElemhideWhitelisted);
 
     List<String> selectors = filterEngine.getElementHidingSelectors(url);
     assertNotNull(selectors);
     assertTrue(selectors.size() > 0);
   }
 }