Unified Diff: libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BasePlatformTest.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.
« no previous file with comments
|
« libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsEngineTest.java ('k')
|
libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/IsAllowedConnectionCallbackTest.java » ('j')
|
libadblockplus-android/jni/JniFilterEngine.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BasePlatformTest.java |
| diff --git a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsEngineTest.java b/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BasePlatformTest.java |
| similarity index 79% |
| copy from libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsEngineTest.java |
| copy to libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BasePlatformTest.java |
| index 2f512c2ea5a77ddec4fac9aa8fa7d180acbad844..74d2dc1b6715d95ab7e294d506bb7ba00018890e 100644 |
| --- a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsEngineTest.java |
| +++ b/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BasePlatformTest.java |
| @@ -17,9 +17,7 @@ |
| package org.adblockplus.libadblockplus.tests; |
| -import org.adblockplus.libadblockplus.AppInfo; |
| -import org.adblockplus.libadblockplus.JsEngine; |
| -import org.adblockplus.libadblockplus.LazyLogSystem; |
| +import org.adblockplus.libadblockplus.Platform; |
| import org.adblockplus.libadblockplus.LogSystem; |
| import org.adblockplus.libadblockplus.ThrowingWebRequest; |
| import org.adblockplus.libadblockplus.WebRequest; |
| @@ -27,27 +25,27 @@ import org.adblockplus.libadblockplus.WebRequest; |
| import android.content.Context; |
| import android.test.InstrumentationTestCase; |
| -public abstract class BaseJsEngineTest extends InstrumentationTestCase |
| +public abstract class BasePlatformTest extends InstrumentationTestCase |
| { |
| - protected JsEngine jsEngine; |
| + protected Platform platform; |
| @Override |
| protected void setUp() throws Exception |
| { |
| super.setUp(); |
| - |
| - jsEngine = new JsEngine(AppInfo.builder().build(), createLogSystem(), createWebRequest(), |
| + platform = new Platform(createLogSystem(), createWebRequest(), |
| getContext().getFilesDir().getAbsolutePath()); |
| } |
| @Override |
| protected void tearDown() throws Exception |
| { |
| - if (jsEngine != null) |
| + if (platform != null) |
| { |
| - jsEngine.dispose(); |
| - jsEngine = null; |
| + platform.dispose(); |
| + platform = null; |
| } |
| + super.tearDown(); |
| } |
| // If the method returns null then a default implementation of the Log System |
« no previous file with comments
|
« libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsEngineTest.java ('k')
|
libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/IsAllowedConnectionCallbackTest.java » ('j')
|
libadblockplus-android/jni/JniFilterEngine.cpp » ('J')
