Skip to content

Commit

Permalink
Replace test issue_default_namespace_on_outermost_element with more f…
Browse files Browse the repository at this point in the history 
…ormal test in reader-namespaces.rs

(Review in whitespace changes ignored mode)
  • Loading branch information
@Mingun
Mingun committed Jun 19, 2024
1 parent c49ead8 commit e82e5c5
Show file tree
Hide file tree
Showing 2 changed files with 139 additions and 112 deletions.
238 changes: 139 additions & 99 deletions tests/reader-namespaces.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,117 +87,157 @@ fn namespace() {
);
}

#[test]
fn default_namespace() {
let mut r = NsReader::from_str(r#"<a ><b xmlns="www1"></b></a>"#);
mod default_namespace {
use super::*;
use pretty_assertions::assert_eq;

// <a>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Unbound),
e => panic!(
"expecting outer start element with no namespace, got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(0)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);
#[test]
fn event_empty() {
let mut r = NsReader::from_str("<a attr='val' xmlns='ns' />");

// <b>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting inner start element with to resolve to 'www1', got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);
let e = match r.read_resolved_event() {
Ok((ns, Empty(e))) => {
assert_eq!(ns, Bound(Namespace(b"ns")));
e
}
e => panic!("Expecting Empty event, got {:?}", e),
};

// </b>
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting inner end element with to resolve to 'www1', got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);
let mut attrs = e
.attributes()
.map(|ar| ar.expect("Expecting attribute parsing to succeed."))
// we don't care about xmlns attributes for this test
.filter(|kv| kv.key.as_namespace_binding().is_none())
.map(|Attribute { key: name, value }| {
let (opt_ns, local_name) = r.resolve_attribute(name);
(opt_ns, local_name.into_inner(), value)
});
assert_eq!(
attrs.next(),
Some((Unbound, &b"attr"[..], Cow::Borrowed(&b"val"[..])))
);
assert_eq!(attrs.next(), None);

// </a> very important: a should not be in any namespace. The default namespace only applies to
// the sub-document it is defined on.
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Unbound),
e => panic!("expecting outer end element with no namespace, got {:?}", e),
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"ns"))]
);
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(0)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);
}

#[test]
fn default_namespace_reset() {
let mut r = NsReader::from_str(r#"<a xmlns="www1"><b xmlns=""></b></a>"#);
#[test]
fn event_start_end() {
let mut r = NsReader::from_str(r#"<a ><b xmlns="www1"></b></a>"#);

// <a>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting outer start element with to resolve to 'www1', got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);
// <a>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Unbound),
e => panic!(
"expecting outer start element with no namespace, got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(0)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);

// <b>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Unbound),
e => panic!(
"expecting inner start element with no namespace, got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(2)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);
// <b>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting inner start element with to resolve to 'www1', got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);

// </b>
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Unbound),
e => panic!("expecting inner end element with no namespace, got {:?}", e),
// </b>
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting inner end element with to resolve to 'www1', got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);

// </a> very important: a should not be in any namespace. The default namespace only applies to
// the sub-document it is defined on.
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Unbound),
e => panic!("expecting outer end element with no namespace, got {:?}", e),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(0)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(2)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);

// </a>
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting outer end element with to resolve to 'www1', got {:?}",
e
),
#[test]
fn reset() {
let mut r = NsReader::from_str(r#"<a xmlns="www1"><b xmlns=""></b></a>"#);

// <a>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting outer start element with to resolve to 'www1', got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);

// <b>
match r.read_resolved_event() {
Ok((ns, Start(_))) => assert_eq!(ns, Unbound),
e => panic!(
"expecting inner start element with no namespace, got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(2)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);

// </b>
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Unbound),
e => panic!("expecting inner end element with no namespace, got {:?}", e),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(2)));
assert_eq!(it.collect::<Vec<_>>(), vec![]);

// </a>
match r.read_resolved_event() {
Ok((ns, End(_))) => assert_eq!(ns, Bound(Namespace(b"www1"))),
e => panic!(
"expecting outer end element with to resolve to 'www1', got {:?}",
e
),
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);
}
let it = r.prefixes();
assert_eq!(it.size_hint(), (0, Some(1)));
assert_eq!(
it.collect::<Vec<_>>(),
vec![(PrefixDeclaration::Default, Namespace(b"www1"))]
);
}

/// Single empty element with qualified attributes.
Expand Down
13 changes: 0 additions & 13 deletions tests/xmlrs_reader_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,19 +267,6 @@ fn issue_105_unexpected_double_dash() {
);
}

#[test]
fn issue_default_namespace_on_outermost_element() {
// Regression test
test(
r#"<hello xmlns="urn:foo"/>"#,
r#"
|EmptyElement({urn:foo}hello)
|EndDocument
"#,
true,
);
}

#[track_caller]
fn test(input: &str, output: &str, trim: bool) {
test_bytes(input.as_bytes(), output.as_bytes(), trim);
Expand Down

0 comments on commit e82e5c5

Please sign in to comment.