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

jid: update for minidom changes

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2020-04-02 23:11:58 +02:00
commit eca44f5602
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
jid-rs/src/lib.rs
View file

@ -773,19 +773,19 @@ mod tests {
#[cfg(feature = "minidom")] #[cfg(feature = "minidom")]
#[test] #[test]
fn minidom() { fn minidom() {
let elem: minidom::Element = "<message from='a@b/c'/>".parse().unwrap(); let elem: minidom::Element = "<message xmlns='ns1' from='a@b/c'/>".parse().unwrap();
let to: Jid = elem.attr("from").unwrap().parse().unwrap(); let to: Jid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, Jid::Full(FullJid::new("a", "b", "c"))); assert_eq!(to, Jid::Full(FullJid::new("a", "b", "c")));
let elem: minidom::Element = "<message from='a@b'/>".parse().unwrap(); let elem: minidom::Element = "<message xmlns='ns1' from='a@b'/>".parse().unwrap();
let to: Jid = elem.attr("from").unwrap().parse().unwrap(); let to: Jid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, Jid::Bare(BareJid::new("a", "b"))); assert_eq!(to, Jid::Bare(BareJid::new("a", "b")));
let elem: minidom::Element = "<message from='a@b/c'/>".parse().unwrap(); let elem: minidom::Element = "<message xmlns='ns1' from='a@b/c'/>".parse().unwrap();
let to: FullJid = elem.attr("from").unwrap().parse().unwrap(); let to: FullJid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, FullJid::new("a", "b", "c")); assert_eq!(to, FullJid::new("a", "b", "c"));
let elem: minidom::Element = "<message from='a@b'/>".parse().unwrap(); let elem: minidom::Element = "<message xmlns='ns1' from='a@b'/>".parse().unwrap();
let to: BareJid = elem.attr("from").unwrap().parse().unwrap(); let to: BareJid = elem.attr("from").unwrap().parse().unwrap();
assert_eq!(to, BareJid::new("a", "b")); assert_eq!(to, BareJid::new("a", "b"));
} }
@ -794,22 +794,19 @@ mod tests {
#[test] #[test]
fn minidom_into_attr() { fn minidom_into_attr() {
let full = FullJid::new("a", "b", "c"); let full = FullJid::new("a", "b", "c");
let elem = minidom::Element::builder("message") let elem = minidom::Element::builder("message", "jabber:client")
.ns("jabber:client")
.attr("from", full.clone()) .attr("from", full.clone())
.build(); .build();
assert_eq!(elem.attr("from"), Some(String::from(full).as_ref())); assert_eq!(elem.attr("from"), Some(String::from(full).as_ref()));
let bare = BareJid::new("a", "b"); let bare = BareJid::new("a", "b");
let elem = minidom::Element::builder("message") let elem = minidom::Element::builder("message", "jabber:client")
.ns("jabber:client")
.attr("from", bare.clone()) .attr("from", bare.clone())
.build(); .build();
assert_eq!(elem.attr("from"), Some(String::from(bare.clone()).as_ref())); assert_eq!(elem.attr("from"), Some(String::from(bare.clone()).as_ref()));
let jid = Jid::Bare(bare.clone()); let jid = Jid::Bare(bare.clone());
let _elem = minidom::Element::builder("message") let _elem = minidom::Element::builder("message", "jabber:client")
.ns("jabber:client")
.attr("from", jid) .attr("from", jid)
.build(); .build();
assert_eq!(elem.attr("from"), Some(String::from(bare).as_ref())); assert_eq!(elem.attr("from"), Some(String::from(bare).as_ref()));