Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

libadblockplus-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
@@ skipping 10 matching lines @@
 import org.adblockplus.libadblockplus.android.AndroidWebRequest;
 import org.adblockplus.libadblockplus.FilterEngine;
 import org.adblockplus.libadblockplus.JsValue;
 import org.adblockplus.libadblockplus.ServerResponse;
 
 import org.junit.Test;
 
 import java.net.MalformedURLException;
 import java.util.List;
 
-public class AndroidWebRequestTest extends BaseJsTest
+// 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.

[sergei, 2017/09/07 12:55:54]

As discussed in IRC, it's not removed, it's changed.

[anton, 2017/09/07 12:57:48]

LGTM

+public class AndroidWebRequestTest extends BaseFilterEngineTest
 {
   @Override
   protected WebRequest createWebRequest()
   {
     return new AndroidWebRequest(true, true);
   }
 
   @Test
   public void testRealWebRequest()
   {
@@ skipping 30 matching lines @@
     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()
   {
-    // creating not used anywhere FilterEngine object is not as useless as it seems:
-    // it loads compat.js JsEngine to add XMLHttpRequest class support
-    new FilterEngine(jsEngine);
-
     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);");
@@ skipping 18 matching lines @@
     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
   {
-    FilterEngine filterEngine = new FilterEngine(jsEngine);
-
     Thread.sleep(20 * 1000); // wait for the subscription to be downloaded
 
     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);
   }
 }