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.FilterEngine; | 20 import org.adblockplus.libadblockplus.Updater; |
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 BasePlatformTest | 24 public abstract class BaseUpdaterTest extends BasePlatformTest |
25 { | 25 { |
26 protected FilterEngine filterEngine; | 26 protected Updater updater; |
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 = platform.getFilterEngine(); | 32 updater = platform.getUpdater(); |
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 disposeUpdater(); |
39 super.tearDown(); | 39 super.tearDown(); |
40 } | 40 } |
41 | 41 |
42 protected void disposeFilterEngine() throws InterruptedException | 42 protected void disposeUpdater() throws InterruptedException |
43 { | |
44 if (filterEngine != null) | |
45 { | 43 { |
46 Thread.sleep(200); // let FS finish its operations | 44 if (updater != null) |
47 filterEngine = null; | 45 { |
| 46 Thread.sleep(200); // let Updater finish its operations |
| 47 updater = null; |
| 48 } |
48 } | 49 } |
49 } | |
50 | 50 |
51 @Override | 51 @Override |
52 protected WebRequest createWebRequest() | 52 protected WebRequest createWebRequest() |
53 { | 53 { |
54 return new LazyWebRequest(); | 54 return new LazyWebRequest(); |
55 } | 55 } |
56 } | 56 } |
OLD | NEW |