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

Side by Side Diff: test/FilterEngine.cpp

Issue 10524054: Rename ErrorCallback into LogSystem, provide a proper console API (Closed)
Patch Set: Created May 10, 2013, 2:01 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
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH 3 * Copyright (C) 2006-2013 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 13 matching lines...) Expand all
24 class FilterEngineTest : public BaseJsTest 24 class FilterEngineTest : public BaseJsTest
25 { 25 {
26 protected: 26 protected:
27 FilterEnginePtr filterEngine; 27 FilterEnginePtr filterEngine;
28 28
29 void SetUp() 29 void SetUp()
30 { 30 {
31 BaseJsTest::SetUp(); 31 BaseJsTest::SetUp();
32 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem)); 32 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
33 jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest)); 33 jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest));
34 jsEngine->SetErrorCallback(AdblockPlus::ErrorCallbackPtr(new AdblockPlus:: DefaultErrorCallback)); 34 jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new AdblockPlus::DefaultL ogSystem));
35 filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine)); 35 filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine));
36 } 36 }
37 }; 37 };
38 } 38 }
39 39
40 TEST_F(FilterEngineTest, FilterCreation) 40 TEST_F(FilterEngineTest, FilterCreation)
41 { 41 {
42 AdblockPlus::FilterPtr filter1 = filterEngine->GetFilter("foo"); 42 AdblockPlus::FilterPtr filter1 = filterEngine->GetFilter("foo");
43 ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, filter1->GetType()); 43 ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, filter1->GetType());
44 AdblockPlus::FilterPtr filter2 = filterEngine->GetFilter("@@foo"); 44 AdblockPlus::FilterPtr filter2 = filterEngine->GetFilter("@@foo");
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 ASSERT_TRUE(match6); 153 ASSERT_TRUE(match6);
154 ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match6->GetType()); 154 ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match6->GetType());
155 155
156 AdblockPlus::FilterPtr match7 = filterEngine->Matches("http://example.org/tpba nner.gif", "IMAGE", "http://example.com/"); 156 AdblockPlus::FilterPtr match7 = filterEngine->Matches("http://example.org/tpba nner.gif", "IMAGE", "http://example.com/");
157 ASSERT_TRUE(match7); 157 ASSERT_TRUE(match7);
158 ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match6->GetType()); 158 ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match6->GetType());
159 159
160 AdblockPlus::FilterPtr match8 = filterEngine->Matches("http://example.org/fpba nner.gif", "IMAGE", "http://example.com/"); 160 AdblockPlus::FilterPtr match8 = filterEngine->Matches("http://example.org/fpba nner.gif", "IMAGE", "http://example.com/");
161 ASSERT_FALSE(match8); 161 ASSERT_FALSE(match8);
162 } 162 }
OLDNEW

Powered by Google App Engine
This is Rietveld