1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182
|
Index: adblock/Cargo.toml
===================================================================
--- adblock.orig/Cargo.toml
+++ adblock/Cargo.toml
@@ -33,30 +33,11 @@ description = "Native Rust module for Ad
readme = "README.md"
license = "MPL-2.0"
repository = "https://github.com/brave/adblock-rust/"
+autobenches = false
[lib]
bench = false
-[[bench]]
-name = "bench_regex"
-harness = false
-
-[[bench]]
-name = "bench_matching"
-harness = false
-
-[[bench]]
-name = "bench_url"
-harness = false
-
-[[bench]]
-name = "bench_rules"
-harness = false
-
-[[bench]]
-name = "bench_redirect_performance"
-harness = false
-
[dependencies.addr]
version = "0.15"
features = ["psl"]
Index: adblock/src/lib.rs
===================================================================
--- adblock.orig/src/lib.rs
+++ adblock/src/lib.rs
@@ -37,9 +37,9 @@ pub use engine::Engine;
#[doc(inline)]
pub use lists::FilterSet;
-#[cfg(test)]
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
+//#[cfg(test)]
+//#[path = "../tests/test_utils.rs"]
+//mod test_utils;
#[cfg(test)]
mod sync_tests {
Index: adblock/src/blocker.rs
===================================================================
--- adblock.orig/src/blocker.rs
+++ adblock/src/blocker.rs
@@ -2154,7 +2154,7 @@ mod placeholder_string_tests {
#[cfg(test)]
mod legacy_rule_parsing_tests {
- use crate::test_utils::rules_from_lists;
+ //use crate::test_utils::rules_from_lists;
use crate::lists::{parse_filters, FilterFormat, ParseOptions};
use crate::blocker::{Blocker, BlockerOptions};
use crate::blocker::vec_hashmap_len;
@@ -2204,7 +2204,7 @@ mod legacy_rule_parsing_tests {
const MALWARE_DOMAIN_LIST: ListCounts = ListCounts { filters: 1104, cosmetic_filters: 0, exceptions: 0, duplicates: 3 };
const MALWARE_DOMAINS: ListCounts = ListCounts { filters: 26853, cosmetic_filters: 0, exceptions: 0, duplicates: 48 };
- fn check_list_counts(rule_lists: impl IntoIterator<Item=impl AsRef<str>>, format: FilterFormat, expectation: ListCounts) {
+ /*fn check_list_counts(rule_lists: impl IntoIterator<Item=impl AsRef<str>>, format: FilterFormat, expectation: ListCounts) {
let rules = rules_from_lists(rule_lists);
let (network_filters, cosmetic_filters) = parse_filters(rules, true, ParseOptions { format, ..Default::default() });
@@ -2321,5 +2321,5 @@ mod legacy_rule_parsing_tests {
FilterFormat::Hosts,
expectation,
)
- }
+ }*/
}
Index: adblock/src/filters/network.rs
===================================================================
--- adblock.orig/src/filters/network.rs
+++ adblock/src/filters/network.rs
@@ -3406,11 +3406,11 @@ mod match_tests {
mod hash_collision_tests {
use super::*;
- use crate::test_utils;
+ //use crate::test_utils;
use crate::lists::parse_filters;
use std::collections::HashMap;
- #[test]
+ /*#[test]
fn check_rule_ids_no_collisions() {
let rules = test_utils::rules_from_lists([
"data/easylist.to/easylist/easylist.txt",
@@ -3427,5 +3427,5 @@ mod hash_collision_tests {
assert!(existing_rule.is_none() || existing_rule.unwrap() == &rule, "ID {} for {} already present from {}", id, rule, existing_rule.unwrap());
filter_ids.insert(id, rule);
}
- }
+ }*/
}
Index: adblock/src/regex_manager.rs
===================================================================
--- adblock.orig/src/regex_manager.rs
+++ adblock/src/regex_manager.rs
@@ -7,10 +7,10 @@ use crate::filters::network::{compile_re
use std::collections::HashMap;
use std::time::Duration;
-#[cfg(test)]
+/*#[cfg(test)]
#[cfg(not(target_arch = "wasm32"))]
use mock_instant::global::Instant;
-#[cfg(not(test))]
+#[cfg(not(test))]*/
#[cfg(not(target_arch = "wasm32"))]
use std::time::Instant;
@@ -232,7 +232,7 @@ mod tests {
use crate::filters::network::NetworkMatchable;
use crate::request;
- use mock_instant::global::MockClock;
+ //use mock_instant::global::MockClock;
fn make_filter(line: &str) -> NetworkFilter {
NetworkFilter::parse(line, true, Default::default()).unwrap()
@@ -271,7 +271,7 @@ mod tests {
assert_eq!(regex_manager.get_compiled_regex_count(), 1);
assert_eq!(get_active_regex_count(®ex_manager), 1);
- MockClock::advance(DEFAULT_DISCARD_UNUSED_TIME - Duration::from_secs(1));
+ /*MockClock::advance(DEFAULT_DISCARD_UNUSED_TIME - Duration::from_secs(1));
regex_manager.update_time();
// The entry shouldn't be discarded because was used during
// last REGEX_MANAGER_DISCARD_TIME.
@@ -292,6 +292,6 @@ mod tests {
// The entry is recreated, get_compiled_regex_count() increased +1.
assert!(filter.matches(&make_request("https://geo2.hltv.org/"), &mut regex_manager));
assert_eq!(regex_manager.get_compiled_regex_count(), 2);
- assert_eq!(get_active_regex_count(®ex_manager), 1);
+ assert_eq!(get_active_regex_count(®ex_manager), 1);*/
}
}
Index: adblock/src/resources/resource_assembler.rs
===================================================================
--- adblock.orig/src/resources/resource_assembler.rs
+++ adblock/src/resources/resource_assembler.rs
@@ -300,7 +300,7 @@ pub fn assemble_scriptlet_resources(scri
mod tests {
use super::*;
- #[test]
+ /*#[test]
fn test_war_resource_assembly() {
let web_accessible_resource_dir =
Path::new("data/test/fake-uBO-files/web_accessible_resources");
@@ -402,9 +402,9 @@ mod tests {
.expect("convert to utf8 string"),
noopjs_contents,
);
- }
+ }*/
- #[test]
+ /*#[test]
fn test_scriptlet_resource_assembly2() {
let scriptlets_path = Path::new("data/test/fake-uBO-files/scriptlets2.js");
#[allow(deprecated)]
@@ -585,5 +585,5 @@ mod tests {
).expect("convert to utf8 string"),
"(function() {\nif ( window !== window.top ) {\nreturn;\n}\nvar tstart;\nvar ttl = 30000;\nvar delay = 0;\nvar delayStep = 50;\nvar buster = function() {\nvar docEl = document.documentElement,\nbodyEl = document.body,\nvw = Math.min(docEl.clientWidth, window.innerWidth),\nvh = Math.min(docEl.clientHeight, window.innerHeight),\ntol = Math.min(vw, vh) * 0.05,\nel = document.elementFromPoint(vw/2, vh/2),\nstyle, rect;\nfor (;;) {\nif ( el === null || el.parentNode === null || el === bodyEl ) {\nbreak;\n}\nstyle = window.getComputedStyle(el);\nif ( parseInt(style.zIndex, 10) >= 1000 || style.position === 'fixed' ) {\nrect = el.getBoundingClientRect();\nif ( rect.left <= tol && rect.top <= tol && (vw - rect.right) <= tol && (vh - rect.bottom) < tol ) {\nel.parentNode.removeChild(el);\ntstart = Date.now();\nel = document.elementFromPoint(vw/2, vh/2);\nbodyEl.style.setProperty('overflow', 'auto', 'important');\ndocEl.style.setProperty('overflow', 'auto', 'important');\ncontinue;\n}\n}\nel = el.parentNode;\n}\nif ( (Date.now() - tstart) < ttl ) {\ndelay = Math.min(delay + delayStep, 1000);\nsetTimeout(buster, delay);\n}\n};\nvar domReady = function(ev) {\nif ( ev ) {\ndocument.removeEventListener(ev.type, domReady);\n}\ntstart = Date.now();\nsetTimeout(buster, delay);\n};\nif ( document.readyState === 'loading' ) {\ndocument.addEventListener('DOMContentLoaded', domReady);\n} else {\ndomReady();\n}\n})();\n",
);
- }
+ }*/
}
|