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

libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java

Index: libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java
diff --git a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java b/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java
index 8e363331985315bfdcb89bcc828b0688588c144a..53148428a490a3161463af5d74d0ab53144c5fa2 100644
--- a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java
+++ b/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 
 import java.util.List;
 
-public class UpdateCheckTest extends BaseJsTest
+public class UpdateCheckTest extends BaseFilterEngineTest
 {
   protected String previousRequestUrl;
 
@@ -55,8 +55,6 @@ public class UpdateCheckTest extends BaseJsTest
 
   protected AppInfo appInfo;
   protected TestWebRequest webRequest;
-  protected JsEngine jsEngine;
-  protected FilterEngine filterEngine;
 
   protected boolean eventCallbackCalled;
   protected List<JsValue> eventCallbackParams;
@@ -83,20 +81,22 @@ public class UpdateCheckTest extends BaseJsTest
     }
   };
 
-  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;