| OLD | NEW | 
|---|
| 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.LogSystem; | 
| 24 import org.adblockplus.libadblockplus.ThrowingWebRequest; | 24 import org.adblockplus.libadblockplus.ThrowingWebRequest; | 
| 25 import org.adblockplus.libadblockplus.WebRequest; | 25 import org.adblockplus.libadblockplus.WebRequest; | 
| 26 | 26 | 
| 27 import android.content.Context; | 27 import android.content.Context; | 
| 28 import android.test.InstrumentationTestCase; | 28 import android.test.InstrumentationTestCase; | 
| 29 | 29 | 
| 30 public abstract class BaseJsTest extends InstrumentationTestCase | 30 public abstract class BaseJsEngineTest extends InstrumentationTestCase | 
| 31 { | 31 { | 
| 32   protected JsEngine jsEngine; | 32   protected JsEngine jsEngine; | 
| 33 | 33 | 
| 34   @Override | 34   @Override | 
| 35   protected void setUp() throws Exception | 35   protected void setUp() throws Exception | 
| 36   { | 36   { | 
| 37     super.setUp(); | 37     super.setUp(); | 
| 38 | 38 | 
| 39     jsEngine = new JsEngine(AppInfo.builder().build(), createLogSystem(), create
    WebRequest(), | 39     jsEngine = new JsEngine(AppInfo.builder().build(), createLogSystem(), create
    WebRequest(), | 
| 40         getContext().getFilesDir().getAbsolutePath()); | 40         getContext().getFilesDir().getAbsolutePath()); | 
| 41   } | 41   } | 
| 42 | 42 | 
|  | 43   @Override | 
|  | 44   protected void tearDown() throws Exception | 
|  | 45   { | 
|  | 46     if (jsEngine != null) | 
|  | 47     { | 
|  | 48       jsEngine.dispose(); | 
|  | 49       jsEngine = null; | 
|  | 50     } | 
|  | 51   } | 
|  | 52 | 
| 43   // If the method returns null then a default implementation of the Log System | 53   // If the method returns null then a default implementation of the Log System | 
| 44   // provided by libadblockplus is used. | 54   // provided by libadblockplus is used. | 
| 45   protected LogSystem createLogSystem() | 55   protected LogSystem createLogSystem() | 
| 46   { | 56   { | 
| 47     return null; | 57     return null; | 
| 48   } | 58   } | 
| 49 | 59 | 
| 50   protected WebRequest createWebRequest() | 60   protected WebRequest createWebRequest() | 
| 51   { | 61   { | 
| 52     return new ThrowingWebRequest(); | 62     return new ThrowingWebRequest(); | 
| 53   } | 63   } | 
| 54 | 64 | 
| 55   protected Context getContext() | 65   protected Context getContext() | 
| 56   { | 66   { | 
| 57     return getInstrumentation().getTargetContext(); | 67     return getInstrumentation().getTargetContext(); | 
| 58   } | 68   } | 
| 59 } | 69 } | 
| OLD | NEW | 
|---|