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

Delta Between Two Patch Sets: test/FilterEngineStubs.cpp

Issue 10100009: FilterEngine API improvements (Closed)
Left Patch Set: Added filter access and addressed review comments Created April 5, 2013, 12:10 p.m.
Right Patch Set: Changed filter type enum Created April 9, 2013, 5:55 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/FilterEngine.cpp ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #include <AdblockPlus.h> 1 #include <AdblockPlus.h>
2 #include <gtest/gtest.h> 2 #include <gtest/gtest.h>
3 3
4 TEST(FilterEngineStubsTest, FilterCreation) 4 TEST(FilterEngineStubsTest, FilterCreation)
5 { 5 {
6 AdblockPlus::JsEngine jsEngine(0, 0); 6 AdblockPlus::JsEngine jsEngine(0, 0);
7 AdblockPlus::FilterEngine filterEngine(jsEngine); 7 AdblockPlus::FilterEngine filterEngine(jsEngine);
8 8
9 AdblockPlus::Filter& filter1 = filterEngine.GetFilter("foo"); 9 AdblockPlus::Filter& filter1 = filterEngine.GetFilter("foo");
10 ASSERT_EQ(filter1.GetProperty("type", ""), "blocking"); 10 ASSERT_EQ(filter1.GetProperty("type", -1), AdblockPlus::Filter::TYPE_BLOCKING) ;
11 AdblockPlus::Filter& filter2 = filterEngine.GetFilter("@@foo"); 11 AdblockPlus::Filter& filter2 = filterEngine.GetFilter("@@foo");
12 ASSERT_EQ(filter2.GetProperty("type", ""), "exception"); 12 ASSERT_EQ(filter2.GetProperty("type", -1), AdblockPlus::Filter::TYPE_EXCEPTION );
13 AdblockPlus::Filter& filter3 = filterEngine.GetFilter("example.com##foo"); 13 AdblockPlus::Filter& filter3 = filterEngine.GetFilter("example.com##foo");
14 ASSERT_EQ(filter3.GetProperty("type", ""), "elemhide"); 14 ASSERT_EQ(filter3.GetProperty("type", -1), AdblockPlus::Filter::TYPE_ELEMHIDE) ;
15 AdblockPlus::Filter& filter4 = filterEngine.GetFilter("example.com#@#foo"); 15 AdblockPlus::Filter& filter4 = filterEngine.GetFilter("example.com#@#foo");
16 ASSERT_EQ(filter4.GetProperty("type", ""), "elemhideexception"); 16 ASSERT_EQ(filter4.GetProperty("type", -1), AdblockPlus::Filter::TYPE_ELEMHIDE_ EXCEPTION);
17 AdblockPlus::Filter& filter5 = filterEngine.GetFilter(" foo "); 17 AdblockPlus::Filter& filter5 = filterEngine.GetFilter(" foo ");
18 ASSERT_EQ(&filter5, &filter1); 18 ASSERT_EQ(&filter5, &filter1);
19 } 19 }
20 20
21 TEST(FilterEngineStubsTest, FilterProperties) 21 TEST(FilterEngineStubsTest, FilterProperties)
22 { 22 {
23 AdblockPlus::JsEngine jsEngine(0, 0); 23 AdblockPlus::JsEngine jsEngine(0, 0);
24 AdblockPlus::FilterEngine filterEngine(jsEngine); 24 AdblockPlus::FilterEngine filterEngine(jsEngine);
25 AdblockPlus::Filter& filter = filterEngine.GetFilter("foo"); 25 AdblockPlus::Filter& filter = filterEngine.GetFilter("foo");
26 26
(...skipping 11 matching lines...) Expand all
38 38
39 TEST(FilterEngineStubsTest, AddRemoveFilters) 39 TEST(FilterEngineStubsTest, AddRemoveFilters)
40 { 40 {
41 AdblockPlus::JsEngine jsEngine(0, 0); 41 AdblockPlus::JsEngine jsEngine(0, 0);
42 AdblockPlus::FilterEngine filterEngine(jsEngine); 42 AdblockPlus::FilterEngine filterEngine(jsEngine);
43 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u); 43 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u);
44 AdblockPlus::Filter& filter = filterEngine.GetFilter("foo"); 44 AdblockPlus::Filter& filter = filterEngine.GetFilter("foo");
45 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u); 45 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u);
46 filter.AddToList(); 46 filter.AddToList();
47 ASSERT_EQ(filterEngine.GetListedFilters().size(), 1u); 47 ASSERT_EQ(filterEngine.GetListedFilters().size(), 1u);
48 ASSERT_EQ(filterEngine.GetListedFilters()[0], &filter); 48 ASSERT_EQ(filterEngine.GetListedFilters()[0].get(), &filter);
49 filter.AddToList(); 49 filter.AddToList();
50 ASSERT_EQ(filterEngine.GetListedFilters().size(), 1u); 50 ASSERT_EQ(filterEngine.GetListedFilters().size(), 1u);
51 ASSERT_EQ(filterEngine.GetListedFilters()[0], &filter); 51 ASSERT_EQ(filterEngine.GetListedFilters()[0].get(), &filter);
52 filter.RemoveFromList(); 52 filter.RemoveFromList();
53 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u); 53 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u);
54 filter.RemoveFromList(); 54 filter.RemoveFromList();
55 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u); 55 ASSERT_EQ(filterEngine.GetListedFilters().size(), 0u);
56 } 56 }
57 57
58 TEST(FilterEngineStubsTest, SubscriptionProperties) 58 TEST(FilterEngineStubsTest, SubscriptionProperties)
59 { 59 {
60 AdblockPlus::JsEngine jsEngine(0, 0); 60 AdblockPlus::JsEngine jsEngine(0, 0);
61 AdblockPlus::FilterEngine filterEngine(jsEngine); 61 AdblockPlus::FilterEngine filterEngine(jsEngine);
(...skipping 13 matching lines...) Expand all
75 75
76 TEST(FilterEngineStubsTest, AddRemoveSubscriptions) 76 TEST(FilterEngineStubsTest, AddRemoveSubscriptions)
77 { 77 {
78 AdblockPlus::JsEngine jsEngine(0, 0); 78 AdblockPlus::JsEngine jsEngine(0, 0);
79 AdblockPlus::FilterEngine filterEngine(jsEngine); 79 AdblockPlus::FilterEngine filterEngine(jsEngine);
80 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u); 80 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u);
81 AdblockPlus::Subscription& subscription = filterEngine.GetSubscription("foo"); 81 AdblockPlus::Subscription& subscription = filterEngine.GetSubscription("foo");
82 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u); 82 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u);
83 subscription.AddToList(); 83 subscription.AddToList();
84 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 1u); 84 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 1u);
85 ASSERT_EQ(filterEngine.GetListedSubscriptions()[0], &subscription); 85 ASSERT_EQ(filterEngine.GetListedSubscriptions()[0].get(), &subscription);
86 subscription.AddToList(); 86 subscription.AddToList();
87 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 1u); 87 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 1u);
88 ASSERT_EQ(filterEngine.GetListedSubscriptions()[0], &subscription); 88 ASSERT_EQ(filterEngine.GetListedSubscriptions()[0].get(), &subscription);
89 subscription.RemoveFromList(); 89 subscription.RemoveFromList();
90 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u); 90 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u);
91 subscription.RemoveFromList(); 91 subscription.RemoveFromList();
92 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u); 92 ASSERT_EQ(filterEngine.GetListedSubscriptions().size(), 0u);
93 } 93 }
94 94
95 TEST(FilterEngineStubsTest, Matches) 95 TEST(FilterEngineStubsTest, Matches)
96 { 96 {
97 AdblockPlus::JsEngine jsEngine(0, 0); 97 AdblockPlus::JsEngine jsEngine(0, 0);
98 AdblockPlus::FilterEngine filterEngine(jsEngine); 98 AdblockPlus::FilterEngine filterEngine(jsEngine);
99 AdblockPlus::Subscription& subscription = filterEngine.GetSubscription("foo"); 99 AdblockPlus::Subscription& subscription = filterEngine.GetSubscription("foo");
100 subscription.AddToList(); 100 subscription.AddToList();
101 101
102 AdblockPlus::Filter* match1 = filterEngine.Matches("http://example.org", "", " "); 102 AdblockPlus::FilterPtr match1 = filterEngine.Matches("http://example.org", "", "");
103 ASSERT_FALSE(match1); 103 ASSERT_FALSE(match1);
104 104
105 AdblockPlus::Filter* match2 = filterEngine.Matches("http://example.org/adbanne r.gif", "", ""); 105 AdblockPlus::FilterPtr match2 = filterEngine.Matches("http://example.org/adban ner.gif", "", "");
106 ASSERT_TRUE(match2); 106 ASSERT_TRUE(match2);
107 ASSERT_EQ(match2->GetProperty("type", ""), "blocking"); 107 ASSERT_EQ(match2->GetProperty("type", -1), AdblockPlus::Filter::TYPE_BLOCKING) ;
108 108
109 AdblockPlus::Filter* match3 = filterEngine.Matches("http://example.org/notbann er.gif", "", ""); 109 AdblockPlus::FilterPtr match3 = filterEngine.Matches("http://example.org/notba nner.gif", "", "");
110 ASSERT_TRUE(match3); 110 ASSERT_TRUE(match3);
111 ASSERT_EQ(match3->GetProperty("type", ""), "exception"); 111 ASSERT_EQ(match3->GetProperty("type", -1), AdblockPlus::Filter::TYPE_EXCEPTION );
112
113 AdblockPlus::FilterPtr match4 = filterEngine.Matches("http://example.org/notba nner.gif", "", "");
114 ASSERT_TRUE(match4);
115 ASSERT_EQ(match4->GetProperty("type", -1), AdblockPlus::Filter::TYPE_EXCEPTION );
112 } 116 }
LEFTRIGHT
« src/FilterEngine.cpp ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld