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

libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/IsAllowedConnectionCallbackTest.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.AppInfo;
 import org.adblockplus.libadblockplus.FilterEngine;
 import org.adblockplus.libadblockplus.HeaderEntry;
 import org.adblockplus.libadblockplus.IsAllowedConnectionCallback;
+import org.adblockplus.libadblockplus.JsEngine;
 import org.adblockplus.libadblockplus.ServerResponse;
 import org.adblockplus.libadblockplus.Subscription;
 import org.adblockplus.libadblockplus.WebRequest;
 import org.adblockplus.libadblockplus.android.AndroidWebRequest;
 import org.junit.Test;
 
 import java.util.LinkedList;
 import java.util.List;
 
-public class IsAllowedConnectionCallbackTest extends BaseJsTest
+public class IsAllowedConnectionCallbackTest extends BaseFilterEngineTest
 {
   private static final int UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS = 5 * 1000; // 5s
 
   private static final class TestRequest extends AndroidWebRequest
   {
     private List<String> urls = new LinkedList<String>();
 
     public List<String> getUrls()
     {
       return urls;
@@ skipping 38 matching lines @@
     {
       this.invoked = true;
       this.connectionType = connectionType;
 
       return result;
     }
   }
 
   private TestRequest request;
   private TestCallback callback;
-  private FilterEngine filterEngine;
 
   @Override
   protected void setUp() throws Exception
   {
-    super.setUp();
-
+    jsEngine = new JsEngine(AppInfo.builder().build(), createLogSystem(), createWebRequest(),
+        getContext().getFilesDir().getAbsolutePath());
     callback = new TestCallback();
     filterEngine = new FilterEngine(jsEngine, callback);
   }
 
   @Override
   protected WebRequest createWebRequest()
   {
     return request = new TestRequest();
   }
 
@@ skipping 44 matching lines @@
     updateSubscriptions();
     SystemClock.sleep(UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS);
 
     assertTrue(callback.isInvoked());
     assertNotNull(callback.getConnectionType());
     assertEquals(allowedConnectionType, callback.getConnectionType());
 
     assertEquals(0, request.getUrls().size());
   }
 }