libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java - Issue 29536629: Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

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: libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdateCheckTest.java

Issue 29536629: Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8 (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git

Patch Set: Created Sept. 5, 2017, 12:59 p.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 | « libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/NotificationTest.java ('k') | libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/UpdaterTest.java » ('j') | libadblockplus-android/jni/JniFilterEngine.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 53148428a490a3161463af5d74d0ab53144c5fa2..42bc190988b46ecb497a58c523eca4cd675cf36e 100644

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

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

@@ -25,6 +25,7 @@ import org.adblockplus.libadblockplus.JsEngine;

import org.adblockplus.libadblockplus.JsValue;

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;

@@ -84,14 +85,15 @@ public class UpdateCheckTest extends BaseFilterEngineTest

public void reset() throws InterruptedException

{

disposeFilterEngine();

- if (jsEngine != null)

+ if (platform != null)

{

- jsEngine.dispose();

+ platform.dispose();

}

- jsEngine = new JsEngine(appInfo, new LazyLogSystem(), webRequest,

+ platform = new Platform(new LazyLogSystem(), webRequest,

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

- jsEngine.setEventCallback("updateAvailable", eventCallback);

- filterEngine = new FilterEngine(jsEngine);

+ platform.setUpJsEngine(appInfo);

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

+ filterEngine = platform.getFilterEngine();

}

@Override