adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java - Issue 29908555: Issue 7035 - Update libadblockplus dependency

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java

Issue 29908555: Issue 7035 - Update libadblockplus dependency (Closed) Base URL: git@github.com:adblockplus/libadblockplus-android.git@d150f08d5d72de8938c7ebbdccd9b0c4e06b4070

Patch Set: Issue 7035 - Update libadblockplus dependency Created Oct. 15, 2018, 9:53 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « adblock-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineUpdaterTest.java ('k') | adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdaterCallbacksTest.java » ('j') | adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdaterCallbacksTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java

diff --git a/adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java b/adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java

index 2aa5c139002e268952c385f8fbd9cac51cb0ed2a..c474d977c83160a70211f4ef7afaf9ccf2ae29f3 100644

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

+++ b/adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java

@@ -31,7 +31,7 @@ import org.junit.Test;

import java.util.List;

-public class UpdateCheckTest extends BaseFilterEngineTest

+public class UpdateCheckTest extends BaseUpdaterTest

{

protected String previousRequestUrl;

@@ -82,7 +82,7 @@ public class UpdateCheckTest extends BaseFilterEngineTest

public void reset() throws InterruptedException

{

- disposeFilterEngine();

+ disposeUpdater();

if (platform != null)

{

platform.dispose();

@@ -91,7 +91,7 @@ public class UpdateCheckTest extends BaseFilterEngineTest

getContext().getFilesDir().getAbsolutePath());

platform.setUpJsEngine(appInfo);

platform.getJsEngine().setEventCallback("updateAvailable", eventCallback);

- filterEngine = platform.getFilterEngine();

+ updater = platform.getUpdater();

}

@Override

@@ -106,7 +106,7 @@ public class UpdateCheckTest extends BaseFilterEngineTest

public void forceUpdateCheck()

{

- filterEngine.forceUpdateCheck(updateCallback);

+ updater.forceUpdateCheck(updateCallback);

}

@Test

@@ -132,7 +132,7 @@ public class UpdateCheckTest extends BaseFilterEngineTest

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";