Rip out rustc-test

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 /.vscode/
+/.idea/
 Cargo.lock
 target
 **/*.rs.bk

Cargo.toml

@@ -10,7 +10,6 @@ categories = ["parser-implementations", "web-programming"]
 keywords = ["html", "css-selectors", "parser", "rewriter", "streaming"]
 readme = "README.md"
 include = ["/Cargo.toml", "/LICENSE", "/README.md", "/media", "/src"]
-autotests = false
 edition = "2021"
 
 [lib]
@@ -23,10 +22,6 @@ debug_trace = []
 # Unstable: for internal use only
 integration_test = []
 
-[[test]]
-harness = false
-name = "integration_tests"
-
 [[bench]]
 harness = false
 name = "bench"
@@ -55,7 +50,6 @@ serde_derive = "1.0.19"
 serde_json = "1.0.65"
 static_assertions = "1.1.0"
 rand = "0.8.5"
-rustc-test = "0.3.1"
 itertools = "0.13"
 
 [lints.rust]

tests/fixtures/element_content_replacement.rs

@@ -1,8 +1,8 @@
 use crate::harness::suites::selectors_tests::{get_test_cases, TestCase};
 use crate::harness::TestFixture;
-use lol_html::test_utils::Output;
-use lol_html::{HtmlRewriter, Settings, element};
 use lol_html::html_content::ContentType;
+use lol_html::test_utils::Output;
+use lol_html::{element, HtmlRewriter, Settings};
 
 // NOTE: Inner element content replacement functionality used as a basis for
 // the multiple element methods and it's easy to get it wrong, so we have
@@ -19,21 +19,20 @@ impl TestFixture<TestCase> for ElementContentReplacementTests {
         let mut output = Output::new(encoding.into());
 
         {
-            let mut rewriter = HtmlRewriter::new(Settings {
-                    element_content_handlers: vec![
-                        element!(test.selector, |el| {
-                            el.set_inner_content(
-                                &format!("<!--Replaced ({}) -->", test.selector),
-                                ContentType::Html,
-                            );
-
-                            Ok(())
-                        })
-                    ],
+            let mut rewriter = HtmlRewriter::new(
+                Settings {
+                    element_content_handlers: vec![element!(test.selector, |el| {
+                        el.set_inner_content(
+                            &format!("<!--Replaced ({}) -->", test.selector),
+                            ContentType::Html,
+                        );
+
+                        Ok(())
+                    })],
                     encoding,
                     ..Settings::new()
                 },
-                |c: &[u8]| output.push(c)
+                |c: &[u8]| output.push(c),
             );
 
             for chunk in test.input.chunks() {
@@ -49,4 +48,7 @@ impl TestFixture<TestCase> for ElementContentReplacementTests {
     }
 }
 
-test_fixture!(ElementContentReplacementTests);
+#[test]
+fn test_element_content_replacement() {
+    ElementContentReplacementTests::run_tests();
+}

tests/fixtures/selector_matching.rs

@@ -1,8 +1,8 @@
 use crate::harness::suites::selectors_tests::{get_test_cases, TestCase};
 use crate::harness::TestFixture;
-use lol_html::test_utils::Output;
-use lol_html::{HtmlRewriter, Settings, element, comments, text};
 use lol_html::html_content::ContentType;
+use lol_html::test_utils::Output;
+use lol_html::{comments, element, text, HtmlRewriter, Settings};
 
 pub struct SelectorMatchingTests;
 
@@ -65,12 +65,12 @@ impl TestFixture<TestCase> for SelectorMatchingTests {
                             }
 
                             Ok(())
-                        })
+                        }),
                     ],
                     encoding,
                     ..Settings::new()
                 },
-                |c: &[u8]| output.push(c)
+                |c: &[u8]| output.push(c),
             );
 
             for chunk in test.input.chunks() {
@@ -86,4 +86,7 @@ impl TestFixture<TestCase> for SelectorMatchingTests {
     }
 }
 
-test_fixture!(SelectorMatchingTests);
+#[test]
+fn test_selector_matching() {
+    SelectorMatchingTests::run_tests();
+}

tests/fixtures/token_capturing.rs

@@ -4,8 +4,9 @@ use lol_html::errors::RewritingError;
 use lol_html::html_content::{DocumentEnd, TextType};
 use lol_html::test_utils::Output;
 use lol_html::{
-    LocalName, LocalNameHash, SharedMemoryLimiter, Namespace, SharedEncoding, StartTagHandlingResult,
-    Token, TokenCaptureFlags, TransformController, TransformStream, TransformStreamSettings,
+    LocalName, LocalNameHash, Namespace, SharedEncoding, SharedMemoryLimiter,
+    StartTagHandlingResult, Token, TokenCaptureFlags, TransformController, TransformStream,
+    TransformStreamSettings,
 };
 
 macro_rules! expect_eql {
@@ -258,4 +259,7 @@ impl TestFixture<TestCase> for TokenCapturingTests {
     }
 }
 
-test_fixture!(TokenCapturingTests);
+#[test]
+fn test_token_capturing() {
+    TokenCapturingTests::run_tests();
+}

tests/harness/mod.rs

@@ -17,56 +17,21 @@ pub mod suites;
 
 pub use self::input::Input;
 
-pub trait TestFixture<T> {
+pub trait TestFixture<T: std::fmt::Debug> {
     fn test_cases() -> Vec<T>;
     fn run(test: &T);
-}
-
-macro_rules! create_test {
-    ($name:expr, $should_panic:expr, $body:tt) => {{
-        use rustc_test::{TestDesc, TestDescAndFn, TestFn, TestName};
-
-        TestDescAndFn {
-            desc: TestDesc {
-                name: TestName::DynTestName($name),
-                ignore: false,
-                should_panic: $should_panic,
-                allow_fail: false,
-            },
-            testfn: TestFn::DynTestFn(Box::new(move || $body)),
-        }
-    }};
-}
-
-macro_rules! test_fixture {
-    ($fixture:ident) => {
-        use rustc_test::{ShouldPanic, TestDescAndFn};
-
-        pub fn get_tests() -> Vec<TestDescAndFn> {
-            $fixture::test_cases()
-                .into_iter()
-                .map(|t| {
-                    create_test!(t.description.to_owned(), ShouldPanic::No, {
-                        $fixture::run(&t);
-                    })
-                })
-                .collect()
+    fn run_tests() {
+        for test in Self::test_cases() {
+            let d = DumpOnPanic(&test);
+            Self::run(&test);
+            std::mem::forget(d);
         }
-    };
+    }
 }
 
-macro_rules! test_modules {
-    ($($m:ident),+) => {
-        $(mod $m;)+
-
-        use rustc_test::TestDescAndFn;
-
-        pub fn get_tests() -> Vec<TestDescAndFn> {
-            let mut tests = Vec::default();
-
-            $(tests.extend($m::get_tests());)+
-
-            tests
-        }
-    };
+struct DumpOnPanic<'a, T: std::fmt::Debug>(&'a T);
+impl<T: std::fmt::Debug> Drop for DumpOnPanic<'_, T> {
+    fn drop(&mut self) {
+        eprintln!("test case failed: {:?}", self.0);
+    }
 }

tests/harness/suites/html5lib_tests/mod.rs

@@ -24,7 +24,7 @@ pub struct Bailout {
     pub parsed_chunk: String,
 }
 
-#[derive(Deserialize, Clone)]
+#[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct TestCase {
     pub description: String,

tests/harness/suites/selectors_tests.rs

@@ -24,8 +24,9 @@ struct TestData {
     pub src: String,
 }
 
+#[derive(Debug)]
 pub struct TestCase {
-    pub description: String,
+    pub _description: String,
     pub selector: String,
     pub input: Input,
     pub expected: String,
@@ -65,7 +66,7 @@ pub fn get_test_cases(suite: &'static str) -> Vec<TestCase> {
                 }
 
                 test_cases.push(TestCase {
-                    description,
+                    _description: description,
                     selector: selector.clone(),
                     input,
                     expected: read_test_file(suite, &expected_file),

tests/integration_tests.rs

@@ -1,27 +1,10 @@
-use cfg_if::cfg_if;
+#![cfg(feature = "integration_test")]
 
-cfg_if! {
-    if #[cfg(feature="integration_test")] {
-        #[macro_use]
-        mod harness;
+#[macro_use]
+mod harness;
 
-        mod fixtures;
-
-        use self::fixtures::get_tests;
-        use rustc_test::test_main;
-
-        fn main() {
-            let args: Vec<_> = ::std::env::args().collect();
-
-            test_main(&args, get_tests());
-        }
-    } else {
-        fn main() {
-            println!(concat![
-                "Integration tests will not run. ",
-                "To run integration tests either run `./scripts/test.sh` ",
-                "or pass `--features=integration_test` flag to `cargo test`."
-            ]);
-        }
-    }
+mod fixtures {
+    mod element_content_replacement;
+    mod selector_matching;
+    mod token_capturing;
 }