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

libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.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 14 matching lines @@
 import org.adblockplus.libadblockplus.JsValue;
 import org.adblockplus.libadblockplus.LazyLogSystem;
 import org.adblockplus.libadblockplus.LazyWebRequest;
 import org.adblockplus.libadblockplus.ServerResponse;
 import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
 
 import org.junit.Test;
 
 import java.util.List;
 
-public class UpdateCheckTest extends BaseJsTest
+public class UpdateCheckTest extends BaseFilterEngineTest
 {
   protected String previousRequestUrl;
 
   public class TestWebRequest extends LazyWebRequest
   {
     public ServerResponse response = new ServerResponse();
 
     @Override
     public ServerResponse httpGET(String url, List<HeaderEntry> headers)
     {
       if (url.indexOf("easylist") >= 0)
       {
         return super.httpGET(url, headers);
       }
 
       previousRequestUrl = url;
       return response;
     }
   }
 
   protected AppInfo appInfo;
   protected TestWebRequest webRequest;
-  protected JsEngine jsEngine;
-  protected FilterEngine filterEngine;
 
   protected boolean eventCallbackCalled;
   protected List<JsValue> eventCallbackParams;
   protected boolean updateCallbackCalled;
   protected String updateError;
 
   private EventCallback eventCallback = new EventCallback()
   {
     @Override
     public void eventCallback(List<JsValue> params)
     {
       eventCallbackCalled = true;
       eventCallbackParams = params;
     }
   };
 
   private UpdateCheckDoneCallback updateCallback = new UpdateCheckDoneCallback()
   {
     @Override
     public void updateCheckDoneCallback(String error)
     {
       updateCallbackCalled = true;
       updateError = error;
     }
   };
 
-  public void reset()
+  public void reset() throws InterruptedException
   {
+    disposeFilterEngine();
+    if (jsEngine != null)
+    {
+      jsEngine.dispose();
+    }
     jsEngine = new JsEngine(appInfo, new LazyLogSystem(), webRequest,
         getContext().getFilesDir().getAbsolutePath());
     jsEngine.setEventCallback("updateAvailable", eventCallback);
-
     filterEngine = new FilterEngine(jsEngine);
   }
 
   @Override
   protected void setUp() throws Exception
   {
-    super.setUp();
-
     appInfo = AppInfo.builder().build();
     webRequest = new TestWebRequest();
     eventCallbackCalled = false;
     updateCallbackCalled = false;
     reset();
   }
 
   public void forceUpdateCheck()
   {
     filterEngine.forceUpdateCheck(updateCallback);
@@ skipping 146 matching lines @@
     reset();
     forceUpdateCheck();
 
     Thread.sleep(1000);
 
     assertFalse(eventCallbackCalled);
     assertTrue(updateCallbackCalled);
     assertTrue(updateError.length() > 0);
   }
 }