Skip to content

Commit bc8d2e3

Browse files
committed
Wrong conflicts due the rebase. Fixed.
1 parent 92fcc49 commit bc8d2e3

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

tests/unit/blocker.rs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,13 +1509,22 @@ mod legacy_rule_parsing_tests {
15091509
// This engine also handles 3 rules that old one does not
15101510
const EASY_LIST: ListCounts = ListCounts {
15111511
filters: 35597, // 36259 - 662 exceptions
1512-
cosmetic_filters: if cfg!(feature = "css-validation") { 23072 } else { 23080 },
1512+
cosmetic_filters: if cfg!(feature = "css-validation") {
1513+
23072
1514+
} else {
1515+
23080
1516+
},
15131517
exceptions: 662,
1514-
duplicates: 0
1518+
duplicates: 0,
15151519
};
15161520
// easyPrivacy = { 11817, 0, 0, 1020 };
15171521
// differences in counts explained by hashset size underreporting as detailed in the next two cases
1518-
const EASY_PRIVACY: ListCounts = ListCounts { filters: 11889, cosmetic_filters: 0, exceptions: 1021, duplicates: 2 };
1522+
const EASY_PRIVACY: ListCounts = ListCounts {
1523+
filters: 52278, // 52998 - 720 exceptions
1524+
cosmetic_filters: 21,
1525+
exceptions: 720,
1526+
duplicates: 2,
1527+
};
15191528
// ublockUnbreak = { 4, 8, 0, 94 };
15201529
// differences in counts explained by client.hostAnchoredExceptionHashSet->GetSize() underreporting when compared to client.numHostAnchoredExceptionFilters
15211530
const UBLOCK_UNBREAK: ListCounts = ListCounts {
@@ -1617,7 +1626,7 @@ mod legacy_rule_parsing_tests {
16171626
#[test]
16181627
fn parse_easylist() {
16191628
check_list_counts(
1620-
["./data/test/easylist.txt"],
1629+
["./data/easylist.to/easylist/easylist.txt"],
16211630
FilterFormat::Standard,
16221631
EASY_LIST,
16231632
);
@@ -1626,7 +1635,7 @@ mod legacy_rule_parsing_tests {
16261635
#[test]
16271636
fn parse_easyprivacy() {
16281637
check_list_counts(
1629-
["./data/test/easyprivacy.txt"],
1638+
["./data/easylist.to/easylist/easyprivacy.txt"],
16301639
FilterFormat::Standard,
16311640
EASY_PRIVACY,
16321641
);
@@ -1700,8 +1709,8 @@ mod legacy_rule_parsing_tests {
17001709
let expectation = EASY_LIST + EASY_PRIVACY + UBLOCK_UNBREAK + BRAVE_UNBREAK;
17011710
check_list_counts(
17021711
[
1703-
"./data/test/easylist.txt",
1704-
"./data/test/easyprivacy.txt",
1712+
"./data/easylist.to/easylist/easylist.txt",
1713+
"./data/easylist.to/easylist/easyprivacy.txt",
17051714
"./data/test/ublock-unbreak.txt",
17061715
"./data/test/brave-unbreak.txt",
17071716
],

0 commit comments

Comments
 (0)