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

jingle: Type Content::name better.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-07-15 11:37:29 +01:00
parent 4c1a716945
commit 161e5dcc9b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/jingle.rs
View file

@ -43,11 +43,13 @@ generate_attribute!(Senders, "senders", {
Responder => "responder", Responder => "responder",
}, Default = Both); }, Default = Both);
generate_id!(ContentId);
#[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: String, // TODO: the list of values is defined, use an enum!
pub name: String, pub name: ContentId,
pub senders: Senders, pub senders: Senders,
pub description: Option<Element>, pub description: Option<Element>,
pub transport: Option<Element>, pub transport: Option<Element>,
@ -353,7 +355,7 @@ mod tests {
let elem: Element = "<jingle xmlns='urn:xmpp:jingle:1' action='session-initiate' sid='coucou'><content creator='initiator' name='coucou'><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'><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].creator, Creator::Initiator); assert_eq!(jingle.contents[0].creator, Creator::Initiator);
assert_eq!(jingle.contents[0].name, "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, "session");