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-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 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 #include <AdblockPlus/tr1_functional.h> | 18 #include <functional> |
19 | 19 |
20 #include "BaseJsTest.h" | 20 #include "BaseJsTest.h" |
21 | 21 |
22 namespace | 22 namespace |
23 { | 23 { |
24 typedef std::tr1::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr; | 24 typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr; |
25 | 25 |
26 void FindAndReplace(std::string& source, const std::string& find, const std::s
tring& replace) | 26 void FindAndReplace(std::string& source, const std::string& find, const std::s
tring& replace) |
27 { | 27 { |
28 for (size_t pos = 0; (pos = source.find(find), pos) != std::string::npos; po
s += replace.size()) | 28 for (size_t pos = 0; (pos = source.find(find), pos) != std::string::npos; po
s += replace.size()) |
29 source.replace(pos, find.size(), replace); | 29 source.replace(pos, find.size(), replace); |
30 } | 30 } |
31 | 31 |
32 std::string previousRequestUrl; | 32 std::string previousRequestUrl; |
33 class TestWebRequest : public LazyWebRequest | 33 class TestWebRequest : public LazyWebRequest |
34 { | 34 { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 Reset(); | 68 Reset(); |
69 } | 69 } |
70 | 70 |
71 void Reset() | 71 void Reset() |
72 { | 72 { |
73 jsEngine = AdblockPlus::JsEngine::New(appInfo); | 73 jsEngine = AdblockPlus::JsEngine::New(appInfo); |
74 jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem)); | 74 jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem)); |
75 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem)); | 75 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem)); |
76 jsEngine->SetWebRequest(webRequestPtr); | 76 jsEngine->SetWebRequest(webRequestPtr); |
77 jsEngine->SetEventCallback("updateAvailable", | 77 jsEngine->SetEventCallback("updateAvailable", |
78 std::tr1::bind(&UpdateCheckTest::EventCallback, this, std::tr1::placeh
olders::_1)); | 78 std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1
)); |
79 | 79 |
80 filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine)); | 80 filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine)); |
81 } | 81 } |
82 | 82 |
83 void ForceUpdateCheck() | 83 void ForceUpdateCheck() |
84 { | 84 { |
85 filterEngine->ForceUpdateCheck( | 85 filterEngine->ForceUpdateCheck( |
86 std::tr1::bind(&UpdateCheckTest::UpdateCallback, this, std::tr1::place
holders::_1)); | 86 std::bind(&UpdateCheckTest::UpdateCallback, this, std::placeholders::_
1)); |
87 } | 87 } |
88 | 88 |
89 void EventCallback(AdblockPlus::JsValueList& params) | 89 void EventCallback(AdblockPlus::JsValueList& params) |
90 { | 90 { |
91 eventCallbackCalled = true; | 91 eventCallbackCalled = true; |
92 eventCallbackParams = params; | 92 eventCallbackParams = params; |
93 } | 93 } |
94 | 94 |
95 void UpdateCallback(const std::string& error) | 95 void UpdateCallback(const std::string& error) |
96 { | 96 { |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 | 256 |
257 Reset(); | 257 Reset(); |
258 ForceUpdateCheck(); | 258 ForceUpdateCheck(); |
259 | 259 |
260 AdblockPlus::Sleep(100); | 260 AdblockPlus::Sleep(100); |
261 | 261 |
262 ASSERT_FALSE(eventCallbackCalled); | 262 ASSERT_FALSE(eventCallbackCalled); |
263 ASSERT_TRUE(updateCallbackCalled); | 263 ASSERT_TRUE(updateCallbackCalled); |
264 ASSERT_FALSE(updateError.empty()); | 264 ASSERT_FALSE(updateError.empty()); |
265 } | 265 } |
OLD | NEW |