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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 void SetUp() | 61 void SetUp() |
62 { | 62 { |
63 webRequest = new TestWebRequest(); | 63 webRequest = new TestWebRequest(); |
64 webRequestPtr.reset(webRequest); | 64 webRequestPtr.reset(webRequest); |
65 | 65 |
66 eventCallbackCalled = false; | 66 eventCallbackCalled = false; |
67 updateCallbackCalled = false; | 67 updateCallbackCalled = false; |
68 Reset(); | 68 Reset(); |
69 } | 69 } |
70 | 70 |
| 71 void TearDown() |
| 72 { |
| 73 webRequest->Cancel(); |
| 74 } |
| 75 |
71 void Reset() | 76 void Reset() |
72 { | 77 { |
73 jsEngine = CreateJsEngine(appInfo); | 78 jsEngine = CreateJsEngine(appInfo); |
74 jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem)); | 79 jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem)); |
75 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem)); | 80 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem)); |
76 jsEngine->SetWebRequest(webRequestPtr); | 81 jsEngine->SetWebRequest(webRequestPtr); |
77 jsEngine->SetEventCallback("updateAvailable", | 82 jsEngine->SetEventCallback("updateAvailable", |
78 std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1
)); | 83 std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1
)); |
79 | 84 |
80 filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine)); | 85 filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine)); |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 | 261 |
257 Reset(); | 262 Reset(); |
258 ForceUpdateCheck(); | 263 ForceUpdateCheck(); |
259 | 264 |
260 std::this_thread::sleep_for(std::chrono::milliseconds(100)); | 265 std::this_thread::sleep_for(std::chrono::milliseconds(100)); |
261 | 266 |
262 ASSERT_FALSE(eventCallbackCalled); | 267 ASSERT_FALSE(eventCallbackCalled); |
263 ASSERT_TRUE(updateCallbackCalled); | 268 ASSERT_TRUE(updateCallbackCalled); |
264 ASSERT_FALSE(updateError.empty()); | 269 ASSERT_FALSE(updateError.empty()); |
265 } | 270 } |
OLD | NEW |