This commit is contained in:
Paul Fariello 2019-12-30 07:35:32 +01:40 committed by Paul Fariello
commit 34a87e22a8
6 changed files with 27 additions and 31 deletions

View file

@ -137,7 +137,7 @@ mod tests {
let forwarded = Forwarded::try_from(elem).unwrap(); let forwarded = Forwarded::try_from(elem).unwrap();
let received = Received { let received = Received {
forwarded: forwarded, forwarded: forwarded,
}; };
let serialized: Element = received.into(); let serialized: Element = received.into();
@ -156,7 +156,7 @@ mod tests {
let forwarded = Forwarded::try_from(elem).unwrap(); let forwarded = Forwarded::try_from(elem).unwrap();
let sent = Sent { let sent = Sent {
forwarded: forwarded, forwarded: forwarded,
}; };
let serialized: Element = sent.into(); let serialized: Element = sent.into();

View file

@ -83,14 +83,15 @@ mod tests {
.unwrap(); .unwrap();
let message = Message::try_from(elem).unwrap(); let message = Message::try_from(elem).unwrap();
let elem: Element = "<delay xmlns='urn:xmpp:delay' from='capulet.com' stamp='2002-09-10T23:08:25Z'/>" let elem: Element =
.parse() "<delay xmlns='urn:xmpp:delay' from='capulet.com' stamp='2002-09-10T23:08:25Z'/>"
.unwrap(); .parse()
.unwrap();
let delay = Delay::try_from(elem).unwrap(); let delay = Delay::try_from(elem).unwrap();
let forwarded = Forwarded { let forwarded = Forwarded {
delay: Some(delay), delay: Some(delay),
stanza: Some(message) stanza: Some(message),
}; };
let serialized: Element = forwarded.into(); let serialized: Element = forwarded.into();

View file

@ -426,9 +426,9 @@ mod tests {
let forwarded = Forwarded::try_from(elem).unwrap(); let forwarded = Forwarded::try_from(elem).unwrap();
let result = Result_ { let result = Result_ {
id: String::from("28482-98726-73623"), id: String::from("28482-98726-73623"),
queryid: Some(QueryId(String::from("f27"))), queryid: Some(QueryId(String::from("f27"))),
forwarded: forwarded, forwarded: forwarded,
}; };
let serialized: Element = result.into(); let serialized: Element = result.into();
assert_eq!(serialized, reference); assert_eq!(serialized, reference);
@ -447,8 +447,8 @@ mod tests {
let set = SetResult::try_from(elem).unwrap(); let set = SetResult::try_from(elem).unwrap();
let fin = Fin { let fin = Fin {
set: set, set: set,
complete: Complete::default(), complete: Complete::default(),
}; };
let serialized: Element = fin.into(); let serialized: Element = fin.into();
assert_eq!(serialized, reference); assert_eq!(serialized, reference);

View file

@ -695,18 +695,19 @@ mod tests {
.unwrap(); .unwrap();
let elem: Element = "<actor xmlns='http://jabber.org/protocol/muc#user' nick='foobar'/>" let elem: Element = "<actor xmlns='http://jabber.org/protocol/muc#user' nick='foobar'/>"
.parse() .parse()
.unwrap(); .unwrap();
let actor = Actor::try_from(elem).unwrap(); let actor = Actor::try_from(elem).unwrap();
let elem: Element = "<continue xmlns='http://jabber.org/protocol/muc#user' thread='foobar'/>" let elem: Element =
.parse() "<continue xmlns='http://jabber.org/protocol/muc#user' thread='foobar'/>"
.unwrap(); .parse()
.unwrap();
let continue_ = Continue::try_from(elem).unwrap(); let continue_ = Continue::try_from(elem).unwrap();
let elem: Element = "<reason xmlns='http://jabber.org/protocol/muc#user'>foobar</reason>" let elem: Element = "<reason xmlns='http://jabber.org/protocol/muc#user'>foobar</reason>"
.parse() .parse()
.unwrap(); .unwrap();
let reason = Reason::try_from(elem).unwrap(); let reason = Reason::try_from(elem).unwrap();
let item = Item { let item = Item {

View file

@ -698,9 +698,7 @@ mod tests {
.parse() .parse()
.unwrap(); .unwrap();
let elem: Element = "<x xmlns='jabber:x:data' type='submit'/>" let elem: Element = "<x xmlns='jabber:x:data' type='submit'/>".parse().unwrap();
.parse()
.unwrap();
let form = DataForm::try_from(elem).unwrap(); let form = DataForm::try_from(elem).unwrap();
@ -720,15 +718,11 @@ mod tests {
.parse() .parse()
.unwrap(); .unwrap();
let elem: Element = "<x xmlns='jabber:x:data' type='submit'/>" let elem: Element = "<x xmlns='jabber:x:data' type='submit'/>".parse().unwrap();
.parse()
.unwrap();
let form = DataForm::try_from(elem).unwrap(); let form = DataForm::try_from(elem).unwrap();
let options = PublishOptions { let options = PublishOptions { form: Some(form) };
form: Some(form),
};
let serialized: Element = options.into(); let serialized: Element = options.into();
assert_eq!(serialized, reference); assert_eq!(serialized, reference);
} }

View file

@ -232,14 +232,14 @@ mod tests {
.unwrap(); .unwrap();
let elem: Element = "<unexpected-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>" let elem: Element = "<unexpected-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>"
.parse() .parse()
.unwrap(); .unwrap();
let error = DefinedCondition::try_from(elem).unwrap(); let error = DefinedCondition::try_from(elem).unwrap();
let failed = Failed { let failed = Failed {
h: None, h: None,
error: Some(error), error: Some(error),
}; };
let serialized: Element = failed.into(); let serialized: Element = failed.into();
assert_eq!(serialized, reference); assert_eq!(serialized, reference);