Issue 7035 - Update libadblockplus dependency

adblock-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 13 matching lines @@
 import org.adblockplus.libadblockplus.LazyLogSystem;
 import org.adblockplus.libadblockplus.LazyWebRequest;
 import org.adblockplus.libadblockplus.Platform;
 import org.adblockplus.libadblockplus.ServerResponse;
 import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
 
 import org.junit.Test;
 
 import java.util.List;
 
-public class UpdateCheckTest extends BaseFilterEngineTest
+public class UpdateCheckTest extends BaseUpdaterTest
 {
   protected String previousRequestUrl;
 
   public class TestWebRequest extends LazyWebRequest
   {
     public ServerResponse response = new ServerResponse();
 
     @Override
     public ServerResponse httpGET(String url, List<HeaderEntry> headers)
     {
@@ skipping 30 matching lines @@
     @Override
     public void updateCheckDoneCallback(String error)
     {
       updateCallbackCalled = true;
       updateError = error;
     }
   };
 
   public void reset() throws InterruptedException
   {
-    disposeFilterEngine();
+    disposeUpdater();
     if (platform != null)
     {
       platform.dispose();
     }
     platform = new Platform(new LazyLogSystem(), webRequest,
         getContext().getFilesDir().getAbsolutePath());
     platform.setUpJsEngine(appInfo);
     platform.getJsEngine().setEventCallback("updateAvailable", eventCallback);
-    filterEngine = platform.getFilterEngine();
+    updater = platform.getUpdater();
   }
 
   @Override
   protected void setUp() throws Exception
   {
     appInfo = AppInfo.builder().build();
     webRequest = new TestWebRequest();
     eventCallbackCalled = false;
     updateCallbackCalled = false;
     reset();
   }
 
   public void forceUpdateCheck()
   {
-    filterEngine.forceUpdateCheck(updateCallback);
+    updater.forceUpdateCheck(updateCallback);
   }
 
   @Test
   public void testRequestFailure() throws InterruptedException
   {
     webRequest.response.setStatus(ServerResponse.NsStatus.ERROR_FAILURE);
 
     appInfo = AppInfo
       .builder()
       .setName("1")
       .setVersion("3")
       .setApplication("4")
       .setApplicationVersion("2")
       .setDevelopmentBuild(false)
       .build();
 
     reset();
     forceUpdateCheck();
 
     Thread.sleep(100);
 
     assertFalse(eventCallbackCalled);
     assertTrue(updateCallbackCalled);
     assertNotNull(updateError);
 
-    String expectedUrl = filterEngine.getPref("update_url_release").asString();
+    String expectedUrl = updater.getPref("update_url_release").asString();
     String platform = "libadblockplus";
     String platformVersion = "1.0";
 
     expectedUrl = expectedUrl
       .replaceAll("%NAME%", appInfo.name)
       .replaceAll("%TYPE%", "1"); // manual update
 
     expectedUrl +=
       "&addonName=" + appInfo.name +
       "&addonVersion=" + appInfo.version +
@@ skipping 110 matching lines @@
     reset();
     forceUpdateCheck();
 
     Thread.sleep(1000);
 
     assertFalse(eventCallbackCalled);
     assertTrue(updateCallbackCalled);
     assertTrue(updateError.length() > 0);
   }
 }