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

Side by Side Diff: test/UpdateCheck.cpp

Issue 29410664: Issue 5013 - Use const JsValue and pass reference where applicable (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Created April 12, 2017, 3:24 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
« src/FilterEngine.cpp ('K') | « test/JsValue.cpp ('k') | no next file » | 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-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 class UpdateCheckTest : public ::testing::Test 47 class UpdateCheckTest : public ::testing::Test
48 { 48 {
49 protected: 49 protected:
50 AdblockPlus::AppInfo appInfo; 50 AdblockPlus::AppInfo appInfo;
51 TestWebRequest* webRequest; 51 TestWebRequest* webRequest;
52 AdblockPlus::WebRequestPtr webRequestPtr; 52 AdblockPlus::WebRequestPtr webRequestPtr;
53 AdblockPlus::JsEnginePtr jsEngine; 53 AdblockPlus::JsEnginePtr jsEngine;
54 FilterEnginePtr filterEngine; 54 FilterEnginePtr filterEngine;
55 55
56 bool eventCallbackCalled; 56 bool eventCallbackCalled;
57 AdblockPlus::JsValueList eventCallbackParams; 57 AdblockPlus::JsConstValueList eventCallbackParams;
58 bool updateCallbackCalled; 58 bool updateCallbackCalled;
59 std::string updateError; 59 std::string updateError;
60 60
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;
(...skipping 11 matching lines...) Expand all
79 79
80 filterEngine = AdblockPlus::FilterEngine::Create(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(const AdblockPlus::JsValueList& params) 89 void EventCallback(const AdblockPlus::JsConstValueList& 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 {
97 updateCallbackCalled = true; 97 updateCallbackCalled = true;
98 updateError = error; 98 updateError = error;
99 } 99 }
(...skipping 156 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
« src/FilterEngine.cpp ('K') | « test/JsValue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld