mirror of
https://gitlab.com/xmpp-rs/xmpp-rs.git
synced 2024-07-12 22:21:53 +00:00
xso: only fail on non-whitespace unknown text
We hereby ignore whitespace-only unexpected text, because that's generally harmless.
This commit is contained in:
parent
1e3c075fbf
commit
ae30221e3c
2 changed files with 59 additions and 1 deletions
|
@ -398,6 +398,17 @@ fn text_string_roundtrip() {
|
||||||
roundtrip_full::<TextString>("<text xmlns='urn:example:ns1'>hello world!</text>");
|
roundtrip_full::<TextString>("<text xmlns='urn:example:ns1'>hello world!</text>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn text_string_positive_preserves_whitespace() {
|
||||||
|
#[allow(unused_imports)]
|
||||||
|
use std::{
|
||||||
|
option::Option::{None, Some},
|
||||||
|
result::Result::{Err, Ok},
|
||||||
|
};
|
||||||
|
let el = parse_str::<TextString>("<text xmlns='urn:example:ns1'> \t\n</text>").unwrap();
|
||||||
|
assert_eq!(el.text, " \t\n");
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(FromXml, IntoXml, PartialEq, Debug, Clone)]
|
#[derive(FromXml, IntoXml, PartialEq, Debug, Clone)]
|
||||||
#[xml(namespace = NS1, name = "text")]
|
#[xml(namespace = NS1, name = "text")]
|
||||||
struct TextNonString {
|
struct TextNonString {
|
||||||
|
@ -414,3 +425,42 @@ fn text_non_string_roundtrip() {
|
||||||
};
|
};
|
||||||
roundtrip_full::<TextNonString>("<text xmlns='urn:example:ns1'>123456</text>");
|
roundtrip_full::<TextNonString>("<text xmlns='urn:example:ns1'>123456</text>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(FromXml, IntoXml, PartialEq, Debug, Clone)]
|
||||||
|
#[xml(namespace = NS1, name = "elem")]
|
||||||
|
struct IgnoresWhitespaceWithoutTextConsumer;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn ignores_whitespace_without_text_consumer_positive() {
|
||||||
|
#[allow(unused_imports)]
|
||||||
|
use std::{
|
||||||
|
option::Option::{None, Some},
|
||||||
|
result::Result::{Err, Ok},
|
||||||
|
};
|
||||||
|
let _ = parse_str::<IgnoresWhitespaceWithoutTextConsumer>(
|
||||||
|
"<elem xmlns='urn:example:ns1'> \t\r\n</elem>",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(FromXml, IntoXml, PartialEq, Debug, Clone)]
|
||||||
|
#[xml(namespace = NS1, name = "elem")]
|
||||||
|
struct FailsTextWithoutTextConsumer;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fails_text_without_text_consumer_positive() {
|
||||||
|
#[allow(unused_imports)]
|
||||||
|
use std::{
|
||||||
|
option::Option::{None, Some},
|
||||||
|
result::Result::{Err, Ok},
|
||||||
|
};
|
||||||
|
match parse_str::<FailsTextWithoutTextConsumer>("<elem xmlns='urn:example:ns1'> quak </elem>")
|
||||||
|
{
|
||||||
|
Err(::xso::error::FromElementError::Invalid(::xso::error::Error::Other(e)))
|
||||||
|
if e.contains("Unexpected text") =>
|
||||||
|
{
|
||||||
|
()
|
||||||
|
}
|
||||||
|
other => panic!("unexpected result: {:?}", other),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -132,7 +132,15 @@ impl Compound {
|
||||||
let text_handler = match text_handler {
|
let text_handler = match text_handler {
|
||||||
Some(v) => v,
|
Some(v) => v,
|
||||||
None => quote! {
|
None => quote! {
|
||||||
|
// note: u8::is_ascii_whitespace includes U+000C, which is not
|
||||||
|
// part of XML's white space definition.'
|
||||||
|
if #text.as_bytes().iter().any(|b| *b != b' ' && *b != b'\t' && *b != b'\r' && *b != b'\n') {
|
||||||
::core::result::Result::Err(::xso::error::Error::Other("Unexpected text content".into()))
|
::core::result::Result::Err(::xso::error::Error::Other("Unexpected text content".into()))
|
||||||
|
} else {
|
||||||
|
::core::result::Result::Ok(::std::ops::ControlFlow::Break(
|
||||||
|
Self::#default_state_ident { #builder_data_ident }
|
||||||
|
))
|
||||||
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue