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 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 @Override | 78 @Override |
79 public void updateCheckDoneCallback(String error) | 79 public void updateCheckDoneCallback(String error) |
80 { | 80 { |
81 updateCallbackCalled = true; | 81 updateCallbackCalled = true; |
82 updateError = error; | 82 updateError = error; |
83 } | 83 } |
84 }; | 84 }; |
85 | 85 |
86 public void reset() | 86 public void reset() |
87 { | 87 { |
88 jsEngine = new JsEngine(appInfo); | 88 jsEngine = new JsEngine(appInfo, new LazyLogSystem()); |
89 jsEngine.setLogSystem(new LazyLogSystem()); | |
90 jsEngine.setDefaultFileSystem(getContext().getFilesDir().getAbsolutePath()); | 89 jsEngine.setDefaultFileSystem(getContext().getFilesDir().getAbsolutePath()); |
91 jsEngine.setWebRequest(webRequest); | 90 jsEngine.setWebRequest(webRequest); |
92 jsEngine.setEventCallback("updateAvailable", eventCallback); | 91 jsEngine.setEventCallback("updateAvailable", eventCallback); |
93 | 92 |
94 filterEngine = new FilterEngine(jsEngine); | 93 filterEngine = new FilterEngine(jsEngine); |
95 } | 94 } |
96 | 95 |
97 @Override | 96 @Override |
98 protected void setUp() throws Exception | 97 protected void setUp() throws Exception |
99 { | 98 { |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 reset(); | 257 reset(); |
259 forceUpdateCheck(); | 258 forceUpdateCheck(); |
260 | 259 |
261 Thread.sleep(1000); | 260 Thread.sleep(1000); |
262 | 261 |
263 assertFalse(eventCallbackCalled); | 262 assertFalse(eventCallbackCalled); |
264 assertTrue(updateCallbackCalled); | 263 assertTrue(updateCallbackCalled); |
265 assertTrue(updateError.length() > 0); | 264 assertTrue(updateError.length() > 0); |
266 } | 265 } |
267 } | 266 } |
OLD | NEW |