pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jingle_ibb: Strengthen sid’s type safety.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-06-25 22:15:18 +01:00
parent a219501fed
commit f6b222f49a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/jingle_ibb.rs
View file

@ -5,8 +5,9 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
use std::convert::TryFrom; use std::convert::TryFrom;
use std::str::FromStr;
use minidom::Element; use minidom::{Element, IntoAttributeValue};
use error::Error; use error::Error;
@ -14,10 +15,12 @@ use ns;
use ibb::Stanza; use ibb::Stanza;
generate_id!(StreamId);
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Transport { pub struct Transport {
pub block_size: u16, pub block_size: u16,
pub sid: String, pub sid: StreamId,
pub stanza: Stanza, pub stanza: Stanza,
} }
@ -60,7 +63,7 @@ mod tests {
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='3' sid='coucou'/>".parse().unwrap(); let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='3' sid='coucou'/>".parse().unwrap();
let transport = Transport::try_from(elem).unwrap(); let transport = Transport::try_from(elem).unwrap();
assert_eq!(transport.block_size, 3); assert_eq!(transport.block_size, 3);
assert_eq!(transport.sid, "coucou"); assert_eq!(transport.sid, StreamId(String::from("coucou")));
assert_eq!(transport.stanza, Stanza::Iq); assert_eq!(transport.stanza, Stanza::Iq);
} }