Issue 5556 - remove WebRequest setter

libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/AndroidWebRequestResourceWrapperTest.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 android.os.SystemClock;
 
 import org.adblockplus.libadblockplus.HeaderEntry;
 import org.adblockplus.libadblockplus.ServerResponse;
 import org.adblockplus.libadblockplus.Subscription;
+import org.adblockplus.libadblockplus.WebRequest;
 import org.adblockplus.libadblockplus.android.AndroidWebRequest;
 import org.adblockplus.libadblockplus.android.AndroidWebRequestResourceWrapper;
 import org.adblockplus.libadblockplus.android.Utils;
 import org.adblockplus.libadblockplus.tests.test.R;
 import org.junit.Test;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ skipping 63 matching lines @@
 
   private TestRequest request;
   private Map<String, Integer> preloadMap;
   private TestStorage storage;
   private AndroidWebRequestResourceWrapper wrapper;
   private TestWrapperListener wrapperListener;
 
   @Override
   protected void setUp() throws Exception
   {
-    super.setUp();
 
     request = new TestRequest();
     preloadMap = new HashMap<String, Integer>();
     storage = new TestStorage();
     wrapper = new AndroidWebRequestResourceWrapper(
       getInstrumentation().getContext(), request, preloadMap, storage);
     wrapperListener = new TestWrapperListener();
     wrapper.setListener(wrapperListener);
 
-    jsEngine.setWebRequest(wrapper);
+    super.setUp();
+  }
+
+  @Override
+  protected WebRequest createWebRequest()
+  {
+    return wrapper;
   }
 
   private void updateSubscriptions()
   {
     for (final Subscription s : this.filterEngine.getListedSubscriptions())
     {
       try
       {
         s.updateFilters();
       }
@@ skipping 194 matching lines @@
   }
 
   @Test
   public void testNotIntercepted_AcceptableAds()
   {
     testNotIntercepted(
       AndroidWebRequestResourceWrapper.EASYLIST, R.raw.easylist,
       AndroidWebRequestResourceWrapper.ACCEPTABLE_ADS);
   }
 }