| 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 android.os.SystemClock; | 20 import android.os.SystemClock; |
| 21 | 21 |
| 22 import org.adblockplus.libadblockplus.FilterEngine; | 22 import org.adblockplus.libadblockplus.FilterEngine; |
| 23 import org.adblockplus.libadblockplus.HeaderEntry; | 23 import org.adblockplus.libadblockplus.HeaderEntry; |
| 24 import org.adblockplus.libadblockplus.IsAllowedConnectionCallback; | 24 import org.adblockplus.libadblockplus.IsAllowedConnectionCallback; |
| 25 import org.adblockplus.libadblockplus.ServerResponse; | 25 import org.adblockplus.libadblockplus.ServerResponse; |
| 26 import org.adblockplus.libadblockplus.Subscription; | 26 import org.adblockplus.libadblockplus.Subscription; |
| 27 import org.adblockplus.libadblockplus.WebRequest; |
| 27 import org.adblockplus.libadblockplus.android.AndroidWebRequest; | 28 import org.adblockplus.libadblockplus.android.AndroidWebRequest; |
| 28 import org.junit.Test; | 29 import org.junit.Test; |
| 29 | 30 |
| 30 import java.util.LinkedList; | 31 import java.util.LinkedList; |
| 31 import java.util.List; | 32 import java.util.List; |
| 32 | 33 |
| 33 public class IsAllowedConnectionCallbackTest extends BaseJsTest | 34 public class IsAllowedConnectionCallbackTest extends BaseJsTest |
| 34 { | 35 { |
| 35 private static final int UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS = 5 * 1000; // 5s | 36 private static final int UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS = 5 * 1000; // 5s |
| 36 | 37 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 90 |
| 90 private TestRequest request; | 91 private TestRequest request; |
| 91 private TestCallback callback; | 92 private TestCallback callback; |
| 92 private FilterEngine filterEngine; | 93 private FilterEngine filterEngine; |
| 93 | 94 |
| 94 @Override | 95 @Override |
| 95 protected void setUp() throws Exception | 96 protected void setUp() throws Exception |
| 96 { | 97 { |
| 97 super.setUp(); | 98 super.setUp(); |
| 98 | 99 |
| 99 request = new TestRequest(); | |
| 100 jsEngine.setWebRequest(request); | |
| 101 callback = new TestCallback(); | 100 callback = new TestCallback(); |
| 101 filterEngine = new FilterEngine(jsEngine, callback); |
| 102 } |
| 102 | 103 |
| 103 filterEngine = new FilterEngine(jsEngine, callback); | 104 @Override |
| 105 protected WebRequest createWebRequest() |
| 106 { |
| 107 return request = new TestRequest(); |
| 104 } | 108 } |
| 105 | 109 |
| 106 private void updateSubscriptions() | 110 private void updateSubscriptions() |
| 107 { | 111 { |
| 108 for (final Subscription s : this.filterEngine.getListedSubscriptions()) | 112 for (final Subscription s : this.filterEngine.getListedSubscriptions()) |
| 109 { | 113 { |
| 110 try | 114 try |
| 111 { | 115 { |
| 112 s.updateFilters(); | 116 s.updateFilters(); |
| 113 } | 117 } |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 updateSubscriptions(); | 154 updateSubscriptions(); |
| 151 SystemClock.sleep(UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS); | 155 SystemClock.sleep(UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS); |
| 152 | 156 |
| 153 assertTrue(callback.isInvoked()); | 157 assertTrue(callback.isInvoked()); |
| 154 assertNotNull(callback.getConnectionType()); | 158 assertNotNull(callback.getConnectionType()); |
| 155 assertEquals(allowedConnectionType, callback.getConnectionType()); | 159 assertEquals(allowedConnectionType, callback.getConnectionType()); |
| 156 | 160 |
| 157 assertEquals(0, request.getUrls().size()); | 161 assertEquals(0, request.getUrls().size()); |
| 158 } | 162 } |
| 159 } | 163 } |
| OLD | NEW |