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

Delta Between Two Patch Sets: test/compiled/Filter.cpp

Issue 29595633: Issue 5870 - Implement the new ElemHideEmulation filter type (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Addressed failing test: selector index was improperly adjusted. Created Feb. 7, 2018, 3:49 p.m.
Right Patch Set: Deal with ill formed filters. Created Feb. 14, 2018, 5:05 p.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
LEFTRIGHT
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-present eyeo GmbH 3 * Copyright (C) 2006-present 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include "gtest/gtest.h" 18 #include <gtest/gtest.h>
19 #include "compiled/String.h" 19 #include "compiled/String.h"
20 #include "compiled/filter/Filter.h" 20 #include "compiled/filter/Filter.h"
21 #include "compiled/filter/ElemHideBase.h" 21 #include "compiled/filter/ElemHideBase.h"
22
23 ABP_NS_USING
22 24
23 TEST(TestFilter, testFromText) 25 TEST(TestFilter, testFromText)
24 { 26 {
25 OwnedString t(u"www.example.com#?#:-abp-properties(foo)"_str); 27 OwnedString t(u"www.example.com#?#:-abp-properties(foo)"_str);
26 DependentString text(t); 28 DependentString text(t);
27 29
28 FilterPtr filter(Filter::FromText(text)); 30 FilterPtr filter(Filter::FromText(text), false);
29 EXPECT_EQ(filter->GetText(), u"www.example.com#?#:-abp-properties(foo)"_str); 31 EXPECT_EQ(filter->GetText(), u"www.example.com#?#:-abp-properties(foo)"_str);
30 } 32 }
31 33
32 TEST(TestFilter, testFilterConversionText) 34 TEST(TestFilter, testFilterConversionText)
33 { 35 {
34 { 36 {
35 OwnedString t(u"www.example.com##[-abp-properties='foo']"_str); 37 OwnedString t(u"www.example.com##[-abp-properties='foo']"_str);
36 DependentString text(t); 38 DependentString text(t);
37 39
38 FilterPtr filter(Filter::FromText(text)); 40 FilterPtr filter(Filter::FromText(text), false);
39 EXPECT_EQ(filter->GetText(), u"www.example.com#?#:-abp-properties(foo)"_str) ; 41 EXPECT_EQ(filter->GetText(), u"www.example.com#?#:-abp-properties(foo)"_str) ;
40 } 42 }
41 { 43 {
42 OwnedString t(u"example.com##foo[-abp-properties='something']bar"_str); 44 OwnedString t(u"example.com##foo[-abp-properties='something']bar"_str);
43 DependentString text(t); 45 DependentString text(t);
44 46
45 FilterPtr filter(Filter::FromText(text)); 47 FilterPtr filter(Filter::FromText(text), false);
46 EXPECT_EQ(filter->GetText(), u"example.com#?#foo:-abp-properties(something)b ar"_str); 48 EXPECT_EQ(filter->GetText(), u"example.com#?#foo:-abp-properties(something)b ar"_str);
47 } 49 }
48 { 50 {
49 OwnedString t(u"foo.com##[-abp-properties='/margin: [3-4]{2}/']"_str); 51 OwnedString t(u"foo.com##[-abp-properties='/margin: [3-4]{2}/']"_str);
50 DependentString text(t); 52 DependentString text(t);
51 53
52 FilterPtr filter(Filter::FromText(text)); 54 FilterPtr filter(Filter::FromText(text), false);
53 EXPECT_EQ(filter->GetText(), u"foo.com#?#:-abp-properties(/margin: [3-4]{2}/ )"_str); 55 EXPECT_EQ(filter->GetText(), u"foo.com#?#:-abp-properties(/margin: [3-4]{2}/ )"_str);
54 ASSERT_TRUE(filter->As<ElemHideBase>()); 56 ASSERT_TRUE(filter->As<ElemHideBase>());
55 EXPECT_EQ(filter->As<ElemHideBase>()->GetSelector(), u":-abp-properties(/mar gin: [3-4]\\7B 2\\7D /)"_str); 57 EXPECT_EQ(filter->As<ElemHideBase>()->GetSelector(), u":-abp-properties(/mar gin: [3-4]\\7B 2\\7D /)"_str);
56 } 58 }
57 } 59 }
58 60
59 TEST(TestFilter, testFilterExceptionConversionText) 61 TEST(TestFilter, testFilterExceptionConversionText)
60 { 62 {
61 OwnedString t(u"www.example.com#@#[-abp-properties='foo']"_str); 63 OwnedString t(u"www.example.com#@#[-abp-properties='foo']"_str);
62 DependentString text(t); 64 DependentString text(t);
63 65
64 FilterPtr filter(Filter::FromText(text)); 66 FilterPtr filter(Filter::FromText(text), false);
65 EXPECT_EQ(filter->GetText(), u"www.example.com#@#:-abp-properties(foo)"_str); 67 EXPECT_EQ(filter->GetText(), u"www.example.com#@#:-abp-properties(foo)"_str);
66 } 68 }
67 69
68 TEST(TestFilter, testFilterSyntaxErrorConversion) 70 TEST(TestFilter, testFilterSyntaxErrorConversion)
69 { 71 {
70 { 72 {
71 OwnedString t(u"www.example.com#@#[-abp-properties='foo'bar'baz']"_str); 73 OwnedString t(u"www.example.com#@#[-abp-properties='foo'bar'baz']"_str);
72 DependentString text(t); 74 DependentString text(t);
73 75
74 FilterPtr filter(Filter::FromText(text)); 76 FilterPtr filter(Filter::FromText(text), false);
75 EXPECT_FALSE(filter); 77 EXPECT_FALSE(filter);
76 } 78 }
77 { 79 {
78 OwnedString t(u"www.example.com#@#[-abp-properties='foo'bar']"_str); 80 OwnedString t(u"www.example.com#@#[-abp-properties='foo'bar']"_str);
79 DependentString text(t); 81 DependentString text(t);
80 82
81 FilterPtr filter(Filter::FromText(text)); 83 FilterPtr filter(Filter::FromText(text), false);
84 EXPECT_FALSE(filter);
85 }
86 {
87 OwnedString t(u"www.example.com#@#[-abp-properties='foo'bar]"_str);
88 DependentString text(t);
89
90 FilterPtr filter(Filter::FromText(text), false);
91 EXPECT_FALSE(filter);
92 }
93 {
94 OwnedString t(u"www.example.com#@#[-abp-properties=bar'foo']"_str);
95 DependentString text(t);
96
97 FilterPtr filter(Filter::FromText(text), false);
82 EXPECT_FALSE(filter); 98 EXPECT_FALSE(filter);
83 } 99 }
84 } 100 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld