xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minidom: loosen type requirement on Element::attr{,_ns} getters

Browse source 
Signed-off-by: pep <pep@bouah.net>
This commit is contained in:
pep 2025-10-21 19:34:37 +02:00
commit 15ac51829f
5 changed files with 52 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

39
jid/src/lib.rs
View file

@ -1126,35 +1126,19 @@ mod tests {
#[test]
fn minidom() {
let elem: minidom::Element = "<message xmlns='ns1' from='a@b/c'/>".parse().unwrap();
let to: Jid = elem
.attr("from".try_into().unwrap())
.unwrap()
.parse()
.unwrap();
let to: Jid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, Jid::from(FullJid::new("a@b/c").unwrap()));
let elem: minidom::Element = "<message xmlns='ns1' from='a@b'/>".parse().unwrap();
let to: Jid = elem
.attr("from".try_into().unwrap())
.unwrap()
.parse()
.unwrap();
let to: Jid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, Jid::from(BareJid::new("a@b").unwrap()));
let elem: minidom::Element = "<message xmlns='ns1' from='a@b/c'/>".parse().unwrap();
let to: FullJid = elem
.attr("from".try_into().unwrap())
.unwrap()
.parse()
.unwrap();
let to: FullJid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, FullJid::new("a@b/c").unwrap());
let elem: minidom::Element = "<message xmlns='ns1' from='a@b'/>".parse().unwrap();
let to: BareJid = elem
.attr("from".try_into().unwrap())
.unwrap()
.parse()
.unwrap();
let to: BareJid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, BareJid::new("a@b").unwrap());
}
@ -1165,28 +1149,19 @@ mod tests {
let elem = minidom::Element::builder("message", "jabber:client")
.attr("from".try_into().unwrap(), full.clone())
.build();
assert_eq!(
elem.attr("from".try_into().unwrap()),
Some(full.to_string().as_str())
);
assert_eq!(elem.attr("from"), Some(full.to_string().as_str()));
let bare = BareJid::new("a@b").unwrap();
let elem = minidom::Element::builder("message", "jabber:client")
.attr("from".try_into().unwrap(), bare.clone())
.build();
assert_eq!(
elem.attr("from".try_into().unwrap()),
Some(bare.to_string().as_str())
);
assert_eq!(elem.attr("from"), Some(bare.to_string().as_str()));
let jid = Jid::from(bare.clone());
let _elem = minidom::Element::builder("message", "jabber:client")
.attr("from".try_into().unwrap(), jid)
.build();
assert_eq!(
elem.attr("from".try_into().unwrap()),
Some(bare.to_string().as_str())
);
assert_eq!(elem.attr("from"), Some(bare.to_string().as_str()));
}
#[test]