Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: test/UpdateCheck.cpp

Issue 29377064: Issue 4944 - Make creation of FilterEngine asynchronous. (Closed)
Patch Set: rebase and address comments Created March 16, 2017, 3:47 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « test/Prefs.cpp ('k') | test/WebRequest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 void Reset() 71 void Reset()
72 { 72 {
73 jsEngine = CreateJsEngine(appInfo); 73 jsEngine = CreateJsEngine(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::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1 )); 78 std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1 ));
79 79
80 filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine)); 80 filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
81 } 81 }
82 82
83 void ForceUpdateCheck() 83 void ForceUpdateCheck()
84 { 84 {
85 filterEngine->ForceUpdateCheck( 85 filterEngine->ForceUpdateCheck(
86 std::bind(&UpdateCheckTest::UpdateCallback, this, std::placeholders::_ 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 {
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « test/Prefs.cpp ('k') | test/WebRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld