Change test structure 1

benches/bench_cosmetic_matching.rs

@@ -1,13 +1,10 @@
 use adblock::Engine;
 use criterion::*;
 
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
-
 pub fn make_engine() -> Engine {
     use adblock::resources::Resource;
 
-    let rules = test_utils::rules_from_lists(&["data/brave/brave-main-list.txt"]);
+    let rules = adblock::test_utils::rules_from_lists(&["data/brave/brave-main-list.txt"]);
     let resource_json = std::fs::read_to_string("data/brave/brave-resources.json").unwrap();
     let resource_list: Vec<Resource> = serde_json::from_str(&resource_json).unwrap();
     let mut engine = Engine::from_rules_parametrised(rules, Default::default(), true, true);

benches/bench_matching.rs

@@ -6,9 +6,7 @@ use adblock::request::Request;
 use adblock::url_parser::parse_url;
 use adblock::{Engine, FilterSet};
 
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
-use test_utils::rules_from_lists;
+use adblock::test_utils::rules_from_lists;
 
 #[allow(non_snake_case)]
 #[derive(Serialize, Deserialize, Clone)]

benches/bench_memory.rs

@@ -12,9 +12,7 @@ use adblock::request::Request;
 use adblock::resources::Resource;
 use adblock::Engine;
 
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
-use test_utils::rules_from_lists;
+use adblock::test_utils::rules_from_lists;
 
 // Custom allocator to track memory usage
 #[global_allocator]

benches/bench_rules.rs

@@ -3,9 +3,7 @@ use once_cell::sync::Lazy;
 
 use adblock::{Engine, FilterSet};
 
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
-use test_utils::rules_from_lists;
+use adblock::test_utils::rules_from_lists;
 
 static DEFAULT_LISTS: Lazy<Vec<String>> =
     Lazy::new(|| rules_from_lists(&["data/easylist.to/easylist/easylist.txt"]).collect());

benches/bench_serialization.rs

@@ -2,9 +2,7 @@ use criterion::*;
 
 use adblock::Engine;
 
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
-use test_utils::rules_from_lists;
+use adblock::test_utils::rules_from_lists;
 
 fn serialization(c: &mut Criterion) {
     let mut group = c.benchmark_group("blocker-serialization");

benches/bench_url.rs

@@ -5,9 +5,7 @@ use serde::{Deserialize, Serialize};
 use adblock::request::Request;
 use adblock::url_parser::parse_url;
 
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
-use test_utils::rules_from_lists;
+use adblock::test_utils::rules_from_lists;
 
 #[allow(non_snake_case)]
 #[derive(Serialize, Deserialize, Clone)]

src/filters/fb_builder.rs

@@ -9,7 +9,7 @@ use crate::flatbuffers::containers::flat_serialize::{FlatBuilder, FlatSerialize,
 use crate::flatbuffers::unsafe_tools::VerifiedFlatbufferMemory;
 use crate::utils::Hash;
 
-use super::flat::fb;
+use super::flatbuffer_generated::fb;
 
 #[derive(Clone, Default)]
 pub(crate) struct ShareableString {

src/filters/fb_network_builder.rs

@@ -14,7 +14,7 @@ use crate::network_filter_list::token_histogram;
 use crate::optimizer;
 use crate::utils::{to_short_hash, Hash, ShortHash};
 
-use super::flat::fb;
+use super::flatbuffer_generated::fb;
 
 pub(crate) enum NetworkFilterListId {
     Csp = 0,

src/filters/mod.rs

@@ -10,17 +10,6 @@ pub(crate) mod fb_network_builder;
 pub(crate) mod filter_data_context;
 pub mod network;
 
-#[allow(unknown_lints)]
-#[allow(
-    dead_code,
-    clippy::all,
-    unused_imports,
-    unsafe_code,
-    mismatched_lifetime_syntaxes
-)]
-#[path = "../flatbuffers/fb_network_filter_generated.rs"]
-mod flat;
-
 pub(crate) mod flatbuffer_generated {
-    pub use super::flat::fb;
+    pub use crate::flatbuffers::fb_network_filter_generated::fb;
 }

src/flatbuffers/mod.rs

@@ -1,2 +1,12 @@
 pub(crate) mod containers;
 pub(crate) mod unsafe_tools;
+
+#[allow(unknown_lints)]
+#[allow(
+    dead_code,
+    clippy::all,
+    unused_imports,
+    unsafe_code,
+    mismatched_lifetime_syntaxes
+)]
+pub(crate) mod fb_network_filter_generated;

src/lib.rs

@@ -32,6 +32,8 @@ mod optimizer;
 pub mod regex_manager;
 pub mod request;
 pub mod resources;
+#[doc(hidden)]
+pub mod test_utils;
 pub mod url_parser;
 
 #[doc(hidden)]
@@ -42,10 +44,6 @@ pub use engine::Engine;
 #[doc(inline)]
 pub use lists::FilterSet;
 
-#[cfg(test)]
-#[path = "../tests/test_utils.rs"]
-mod test_utils;
-
 #[cfg(test)]
 mod sync_tests {
     #[allow(unused)]

tests/test_utils.rs → src/test_utils/mod.rs

@@ -1,5 +1,5 @@
-//! Convenience functions used for tests across different build targets. Import via `#[path = ]` if
-//! needed outside of this directory.
+//! Test helper utilities for the adblock-rust project.
+//! Used in tests and benchmarks.
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn rules_from_lists(

tests/matching.rs

@@ -149,9 +149,7 @@ fn check_engine_matching() {
 #[test]
 #[cfg(not(debug_assertions))] // This test is too slow to run in debug mode
 fn check_rule_matching_browserlike() {
-    #[path = "../tests/test_utils.rs"]
-    mod test_utils;
-    use test_utils::rules_from_lists;
+    use adblock::test_utils::rules_from_lists;
 
     use adblock::request::Request;
     use adblock::Engine;

tests/ublock-coverage.rs

@@ -4,8 +4,7 @@ use adblock::Engine;
 #[allow(unused_imports)]
 use std::collections::HashMap;
 
-mod test_utils;
-use test_utils::rules_from_lists;
+use adblock::test_utils::rules_from_lists;
 
 #[cfg(not(debug_assertions))]
 #[allow(non_snake_case)]

tests/unit/engine.rs

@@ -1,8 +1,9 @@
 #[cfg(test)]
 mod tests {
     use super::super::*;
+    use crate::lists::FilterFormat;
     use crate::resources::MimeType;
-    use crate::{lists::FilterFormat, test_utils::rules_from_lists};
+    use crate::test_utils::rules_from_lists;
     use base64::{engine::Engine as _, prelude::BASE64_STANDARD};
     use seahash::hash;