| 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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 26 matching lines...) Expand all Loading... |
| 37 protected String previousRequestUrl; | 37 protected String previousRequestUrl; |
| 38 | 38 |
| 39 public class TestWebRequest extends LazyWebRequest | 39 public class TestWebRequest extends LazyWebRequest |
| 40 { | 40 { |
| 41 public ServerResponse response = new ServerResponse(); | 41 public ServerResponse response = new ServerResponse(); |
| 42 | 42 |
| 43 @Override | 43 @Override |
| 44 public ServerResponse httpGET(String url, List<HeaderEntry> headers) | 44 public ServerResponse httpGET(String url, List<HeaderEntry> headers) |
| 45 { | 45 { |
| 46 if (url.indexOf("easylist") >= 0) | 46 if (url.indexOf("easylist") >= 0) |
| 47 return super.httpGET(url, headers); | 47 { |
| 48 return super.httpGET(url, headers); |
| 49 } |
| 48 | 50 |
| 49 previousRequestUrl = url; | 51 previousRequestUrl = url; |
| 50 return response; | 52 return response; |
| 51 } | 53 } |
| 52 } | 54 } |
| 53 | 55 |
| 54 protected AppInfo appInfo; | 56 protected AppInfo appInfo; |
| 55 protected TestWebRequest webRequest; | 57 protected TestWebRequest webRequest; |
| 56 protected JsEngine jsEngine; | 58 protected JsEngine jsEngine; |
| 57 protected FilterEngine filterEngine; | 59 protected FilterEngine filterEngine; |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 reset(); | 258 reset(); |
| 257 forceUpdateCheck(); | 259 forceUpdateCheck(); |
| 258 | 260 |
| 259 Thread.sleep(1000); | 261 Thread.sleep(1000); |
| 260 | 262 |
| 261 assertFalse(eventCallbackCalled); | 263 assertFalse(eventCallbackCalled); |
| 262 assertTrue(updateCallbackCalled); | 264 assertTrue(updateCallbackCalled); |
| 263 assertTrue(updateError.length() > 0); | 265 assertTrue(updateError.length() > 0); |
| 264 } | 266 } |
| 265 } | 267 } |
| OLD | NEW |