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

jingle: Wrap the disposition in a struct, to get better type safety.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-07-29 02:47:33 +01:00
parent 75ae6100b4
commit f83fe92244
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/jingle.rs
View file

@ -45,10 +45,19 @@ generate_attribute!(Senders, "senders", {
generate_id!(ContentId); generate_id!(ContentId);
// TODO: the list of values is defined, use an enum!
generate_id!(Disposition);
impl Default for Disposition {
fn default() -> Disposition {
Disposition(String::from("session"))
}
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Content { pub struct Content {
pub creator: Creator, pub creator: Creator,
pub disposition: String, // TODO: the list of values is defined, use an enum! pub disposition: Disposition,
pub name: ContentId, pub name: ContentId,
pub senders: Senders, pub senders: Senders,
pub description: Option<Element>, pub description: Option<Element>,
@ -66,7 +75,7 @@ impl TryFrom<Element> for Content {
let mut content = Content { let mut content = Content {
creator: get_attr!(elem, "creator", required), creator: get_attr!(elem, "creator", required),
disposition: get_attr!(elem, "disposition", optional).unwrap_or(String::from("session")), disposition: get_attr!(elem, "disposition", default),
name: get_attr!(elem, "name", required), name: get_attr!(elem, "name", required),
senders: get_attr!(elem, "senders", default), senders: get_attr!(elem, "senders", default),
description: None, description: None,
@ -344,7 +353,7 @@ mod tests {
assert_eq!(jingle.contents[0].creator, Creator::Initiator); assert_eq!(jingle.contents[0].creator, Creator::Initiator);
assert_eq!(jingle.contents[0].name, ContentId(String::from("coucou"))); assert_eq!(jingle.contents[0].name, ContentId(String::from("coucou")));
assert_eq!(jingle.contents[0].senders, Senders::Both); assert_eq!(jingle.contents[0].senders, Senders::Both);
assert_eq!(jingle.contents[0].disposition, "session"); assert_eq!(jingle.contents[0].disposition, Disposition(String::from("session")));
let elem: Element = "<jingle xmlns='urn:xmpp:jingle:1' action='session-initiate' sid='coucou'><content creator='initiator' name='coucou' senders='both'><description/><transport/></content></jingle>".parse().unwrap(); let elem: Element = "<jingle xmlns='urn:xmpp:jingle:1' action='session-initiate' sid='coucou'><content creator='initiator' name='coucou' senders='both'><description/><transport/></content></jingle>".parse().unwrap();
let jingle = Jingle::try_from(elem).unwrap(); let jingle = Jingle::try_from(elem).unwrap();
@ -352,7 +361,7 @@ mod tests {
let elem: Element = "<jingle xmlns='urn:xmpp:jingle:1' action='session-initiate' sid='coucou'><content creator='initiator' name='coucou' disposition='early-session'><description/><transport/></content></jingle>".parse().unwrap(); let elem: Element = "<jingle xmlns='urn:xmpp:jingle:1' action='session-initiate' sid='coucou'><content creator='initiator' name='coucou' disposition='early-session'><description/><transport/></content></jingle>".parse().unwrap();
let jingle = Jingle::try_from(elem).unwrap(); let jingle = Jingle::try_from(elem).unwrap();
assert_eq!(jingle.contents[0].disposition, "early-session"); assert_eq!(jingle.contents[0].disposition, Disposition(String::from("early-session")));
} }
#[test] #[test]