Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsTest.java

Issue 29524565: Issue 5556 - remove LogSystem setters (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set: address comments Created Aug. 24, 2017, 1:38 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/ConsoleJsObjectTest.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 package org.adblockplus.libadblockplus.tests; 18 package org.adblockplus.libadblockplus.tests;
19 19
20 import org.adblockplus.libadblockplus.AppInfo; 20 import org.adblockplus.libadblockplus.AppInfo;
21 import org.adblockplus.libadblockplus.JsEngine; 21 import org.adblockplus.libadblockplus.JsEngine;
22 import org.adblockplus.libadblockplus.LazyLogSystem; 22 import org.adblockplus.libadblockplus.LazyLogSystem;
23 import org.adblockplus.libadblockplus.LogSystem;
23 import org.adblockplus.libadblockplus.ThrowingWebRequest; 24 import org.adblockplus.libadblockplus.ThrowingWebRequest;
24 25
25 import android.content.Context; 26 import android.content.Context;
26 import android.test.InstrumentationTestCase; 27 import android.test.InstrumentationTestCase;
27 28
28 public abstract class BaseJsTest extends InstrumentationTestCase 29 public abstract class BaseJsTest extends InstrumentationTestCase
29 { 30 {
30 protected JsEngine jsEngine; 31 protected JsEngine jsEngine;
31 32
32 @Override 33 @Override
33 protected void setUp() throws Exception 34 protected void setUp() throws Exception
34 { 35 {
35 super.setUp(); 36 super.setUp();
36 37
37 jsEngine = new JsEngine(AppInfo.builder().build()); 38 jsEngine = new JsEngine(AppInfo.builder().build(), createLogSystem());
38 jsEngine.setDefaultLogSystem();
39 jsEngine.setDefaultFileSystem(getContext().getFilesDir().getAbsolutePath()); 39 jsEngine.setDefaultFileSystem(getContext().getFilesDir().getAbsolutePath());
40 jsEngine.setWebRequest(new ThrowingWebRequest()); 40 jsEngine.setWebRequest(new ThrowingWebRequest());
41 } 41 }
42 42
43 // If the method returns null then a default implementation of the Log System
44 // provided by libadblockplus is used.
45 protected LogSystem createLogSystem()
46 {
47 return null;
48 }
49
43 protected Context getContext() 50 protected Context getContext()
44 { 51 {
45 return getInstrumentation().getTargetContext(); 52 return getInstrumentation().getTargetContext();
46 } 53 }
47 } 54 }
OLDNEW
« no previous file with comments | « no previous file | libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/ConsoleJsObjectTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld