diff --git a/parsers/ChangeLog b/parsers/ChangeLog index 3ea4f2a2..372dd640 100644 --- a/parsers/ChangeLog +++ b/parsers/ChangeLog @@ -24,6 +24,7 @@ XXXX-YY-ZZ RELEASER - ibr::LegacyQuery now implements Default, allowing users to more easily construct it (!660) - jingle_rtp::Description gained a bandwidth child. + - Fix cargo test for the disable-validation and component features. Version 0.22.0: 2025-10-28 pep diff --git a/parsers/src/carbons.rs b/parsers/src/carbons.rs index 002a4940..0b6603ce 100644 --- a/parsers/src/carbons.rs +++ b/parsers/src/carbons.rs @@ -58,6 +58,7 @@ impl MessagePayload for Sent {} #[cfg(test)] mod tests { use super::*; + #[cfg(not(feature = "component"))] use jid::Jid; use minidom::Element; @@ -94,6 +95,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn forwarded_elements() { let elem: Element = " @@ -135,6 +137,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn test_serialize_received() { let reference: Element = "" .parse() @@ -154,6 +157,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn test_serialize_sent() { let reference: Element = "" .parse() diff --git a/parsers/src/data_forms.rs b/parsers/src/data_forms.rs index b469385c..9ebcd171 100644 --- a/parsers/src/data_forms.rs +++ b/parsers/src/data_forms.rs @@ -485,6 +485,7 @@ mod tests { } #[test] + #[cfg(not(feature = "disable-validation"))] fn test_wrong_child() { let elem: Element = "" .parse() diff --git a/parsers/src/forwarding.rs b/parsers/src/forwarding.rs index 202ac4cb..0e3e557f 100644 --- a/parsers/src/forwarding.rs +++ b/parsers/src/forwarding.rs @@ -47,6 +47,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn test_simple() { let elem: Element = "" @@ -56,6 +57,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace #[cfg_attr(feature = "disable-validation", should_panic = "Result::unwrap_err")] fn test_invalid_child() { let elem: Element = "" @@ -70,6 +72,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn test_serialise() { let elem: Element = "".parse().unwrap(); let forwarded = Forwarded { @@ -81,6 +84,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn test_serialize_with_delay_and_stanza() { let reference: Element = "" .parse() @@ -123,6 +127,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn test_invalid_duplicate_message() { let elem: Element = "" .parse() diff --git a/parsers/src/mam.rs b/parsers/src/mam.rs index ed5f0f56..84883e4b 100644 --- a/parsers/src/mam.rs +++ b/parsers/src/mam.rs @@ -300,6 +300,7 @@ mod tests { } #[test] + #[cfg_attr(feature = "disable-validation", should_panic = "Result::unwrap_err")] fn test_invalid_child() { let elem: Element = "" .parse() @@ -350,6 +351,7 @@ mod tests { } #[test] + #[cfg(not(feature = "component"))] // feature = "component" changes namespace fn test_serialize_result() { let reference: Element = "" .parse() diff --git a/parsers/src/rsm.rs b/parsers/src/rsm.rs index 296eb59a..62e7c937 100644 --- a/parsers/src/rsm.rs +++ b/parsers/src/rsm.rs @@ -130,6 +130,7 @@ mod tests { } #[test] + #[cfg_attr(feature = "disable-validation", should_panic = "Result::unwrap_err")] fn test_invalid_child() { let elem: Element = "" .parse() diff --git a/parsers/src/util/macro_tests.rs b/parsers/src/util/macro_tests.rs index b0121807..b5bdb2b9 100644 --- a/parsers/src/util/macro_tests.rs +++ b/parsers/src/util/macro_tests.rs @@ -140,10 +140,6 @@ fn empty_unexpected_attribute() { } #[test] -#[cfg_attr( - feature = "disable-validation", - should_panic = "unexpected result: Ok(" -)] fn empty_ignores_xml_lang() { #[allow(unused_imports)] use core::{ @@ -1651,6 +1647,7 @@ fn element_catch_one_negative_none() { } #[test] +#[cfg(not(feature = "disable-validation"))] fn element_catch_one_negative_more_than_one_child() { #[allow(unused_imports)] use core::{ @@ -1693,6 +1690,7 @@ fn element_catch_maybe_one_roundtrip_some() { } #[test] +#[cfg(not(feature = "disable-validation"))] fn element_catch_maybe_one_negative_more_than_one_child() { #[allow(unused_imports)] use core::{