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

Unified Diff: test/FilterEngineStubs.cpp

Issue 10100009: FilterEngine API improvements (Closed)
Patch Set: Changed filter type enum Created April 9, 2013, 5:55 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/FilterEngine.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/FilterEngineStubs.cpp
===================================================================
--- a/test/FilterEngineStubs.cpp
+++ b/test/FilterEngineStubs.cpp
@@ -2,23 +2,23 @@
#include <gtest/gtest.h>
TEST(FilterEngineStubsTest, FilterCreation)
{
AdblockPlus::JsEngine jsEngine(0, 0);
AdblockPlus::FilterEngine filterEngine(jsEngine);
AdblockPlus::Filter& filter1 = filterEngine.GetFilter("foo");
- ASSERT_EQ(filter1.GetProperty("type", -1), AdblockPlus::BLOCKING_RULE);
+ ASSERT_EQ(filter1.GetProperty("type", -1), AdblockPlus::Filter::TYPE_BLOCKING);
AdblockPlus::Filter& filter2 = filterEngine.GetFilter("@@foo");
- ASSERT_EQ(filter2.GetProperty("type", -1), AdblockPlus::EXCEPTION_RULE);
+ ASSERT_EQ(filter2.GetProperty("type", -1), AdblockPlus::Filter::TYPE_EXCEPTION);
AdblockPlus::Filter& filter3 = filterEngine.GetFilter("example.com##foo");
- ASSERT_EQ(filter3.GetProperty("type", -1), AdblockPlus::ELEMHIDE_RULE);
+ ASSERT_EQ(filter3.GetProperty("type", -1), AdblockPlus::Filter::TYPE_ELEMHIDE);
AdblockPlus::Filter& filter4 = filterEngine.GetFilter("example.com#@#foo");
- ASSERT_EQ(filter4.GetProperty("type", -1), AdblockPlus::ELEMHIDE_EXCEPTION_RULE);
+ ASSERT_EQ(filter4.GetProperty("type", -1), AdblockPlus::Filter::TYPE_ELEMHIDE_EXCEPTION);
AdblockPlus::Filter& filter5 = filterEngine.GetFilter(" foo ");
ASSERT_EQ(&filter5, &filter1);
}
TEST(FilterEngineStubsTest, FilterProperties)
{
AdblockPlus::JsEngine jsEngine(0, 0);
AdblockPlus::FilterEngine filterEngine(jsEngine);
@@ -99,18 +99,18 @@ TEST(FilterEngineStubsTest, Matches)
AdblockPlus::Subscription& subscription = filterEngine.GetSubscription("foo");
subscription.AddToList();
AdblockPlus::FilterPtr match1 = filterEngine.Matches("http://example.org", "", "");
ASSERT_FALSE(match1);
AdblockPlus::FilterPtr match2 = filterEngine.Matches("http://example.org/adbanner.gif", "", "");
ASSERT_TRUE(match2);
- ASSERT_EQ(match2->GetProperty("type", -1), AdblockPlus::BLOCKING_RULE);
+ ASSERT_EQ(match2->GetProperty("type", -1), AdblockPlus::Filter::TYPE_BLOCKING);
AdblockPlus::FilterPtr match3 = filterEngine.Matches("http://example.org/notbanner.gif", "", "");
ASSERT_TRUE(match3);
- ASSERT_EQ(match3->GetProperty("type", -1), AdblockPlus::EXCEPTION_RULE);
+ ASSERT_EQ(match3->GetProperty("type", -1), AdblockPlus::Filter::TYPE_EXCEPTION);
AdblockPlus::FilterPtr match4 = filterEngine.Matches("http://example.org/notbanner.gif", "", "");
ASSERT_TRUE(match4);
- ASSERT_EQ(match4->GetProperty("type", -1), AdblockPlus::EXCEPTION_RULE);
+ ASSERT_EQ(match4->GetProperty("type", -1), AdblockPlus::Filter::TYPE_EXCEPTION);
}
« no previous file with comments | « src/FilterEngine.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld