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

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

Issue 29536629: Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8 (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set: address comment Created Sept. 8, 2017, 12:20 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
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.FilterEngine; 20 import org.adblockplus.libadblockplus.FilterEngine;
21 import org.adblockplus.libadblockplus.LazyWebRequest; 21 import org.adblockplus.libadblockplus.LazyWebRequest;
22 import org.adblockplus.libadblockplus.WebRequest; 22 import org.adblockplus.libadblockplus.WebRequest;
23 23
24 public abstract class BaseFilterEngineTest extends BaseJsEngineTest 24 public abstract class BaseFilterEngineTest extends BasePlatformTest
25 { 25 {
26 protected FilterEngine filterEngine; 26 protected FilterEngine filterEngine;
27 27
28 @Override 28 @Override
29 protected void setUp() throws Exception 29 protected void setUp() throws Exception
30 { 30 {
31 super.setUp(); 31 super.setUp();
32 filterEngine = new FilterEngine(jsEngine); 32 filterEngine = platform.getFilterEngine();
33 } 33 }
34 34
35 @Override 35 @Override
36 protected void tearDown() throws Exception 36 protected void tearDown() throws Exception
37 { 37 {
38 disposeFilterEngine(); 38 disposeFilterEngine();
39 super.tearDown(); 39 super.tearDown();
40 } 40 }
41 41
42 protected void disposeFilterEngine() throws InterruptedException 42 protected void disposeFilterEngine() throws InterruptedException
43 { 43 {
44 if (filterEngine != null) 44 if (filterEngine != null)
45 { 45 {
46 Thread.sleep(200); // let FS finish its operations 46 Thread.sleep(200); // let FS finish its operations
47 filterEngine.dispose();
48 filterEngine = null; 47 filterEngine = null;
49 } 48 }
50 } 49 }
51 50
52 @Override 51 @Override
53 protected WebRequest createWebRequest() 52 protected WebRequest createWebRequest()
54 { 53 {
55 return new LazyWebRequest(); 54 return new LazyWebRequest();
56 } 55 }
57 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld