mirror of
https://gitlab.com/xmpp-rs/xmpp-rs.git
synced 2024-07-12 22:21:53 +00:00
6ef8dbefa3
This is a large change and as such, it needs good motivation. Let me remind you of the ultimate goal: we want a derive macro which allows us to FromXml/IntoXml, and that derive macro should be usable from `xmpp_parsers` and other crates. For that, any code generated by the derive macro mustn't depend on any code in the `xmpp_parsers` crate, because you cannot name the crate you are in portably (`xmpp_parsers::..` wouldn't resolve within `xmpp_parsers`, and `crate::..` would point at other crates if the macro was used in other crates). We also want to interoperate with code already implementing `TryFrom<Element>` and `Into<Element>` on structs. This ultimately requires that we have an error type which is shared by the two implementations and that error type must be declared in the `xso` crate to be usable by the macros. Thus, we port the error type over to use the type declared in `xso`. This changes the structure of the error type greatly; I do not think that `xso` should have to know about all the different types we are parsing there and they don't deserve special treatment. Wrapping them in a `Box<dyn ..>` seems more appropriate.
118 lines
3.5 KiB
Rust
118 lines
3.5 KiB
Rust
// Copyright (c) 2017 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
use crate::date::DateTime;
|
|
use crate::message::MessagePayload;
|
|
use crate::presence::PresencePayload;
|
|
use crate::util::text_node_codecs::{Codec, OptionalCodec, Text};
|
|
use jid::Jid;
|
|
|
|
generate_element!(
|
|
/// Notes when and by whom a message got stored for later delivery.
|
|
Delay, "delay", DELAY,
|
|
attributes: [
|
|
/// The entity which delayed this message.
|
|
from: Option<Jid> = "from",
|
|
|
|
/// The time at which this message got stored.
|
|
stamp: Required<DateTime> = "stamp"
|
|
],
|
|
text: (
|
|
/// The optional reason this message got delayed.
|
|
data: OptionalCodec<Text>
|
|
)
|
|
);
|
|
|
|
impl MessagePayload for Delay {}
|
|
impl PresencePayload for Delay {}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::Element;
|
|
use jid::BareJid;
|
|
use std::str::FromStr;
|
|
use xso::error::{Error, FromElementError};
|
|
|
|
#[cfg(target_pointer_width = "32")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(Delay, 44);
|
|
}
|
|
|
|
#[cfg(target_pointer_width = "64")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(Delay, 72);
|
|
}
|
|
|
|
#[test]
|
|
fn test_simple() {
|
|
let elem: Element =
|
|
"<delay xmlns='urn:xmpp:delay' from='capulet.com' stamp='2002-09-10T23:08:25Z'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let delay = Delay::try_from(elem).unwrap();
|
|
assert_eq!(delay.from.unwrap(), BareJid::new("capulet.com").unwrap());
|
|
assert_eq!(
|
|
delay.stamp,
|
|
DateTime::from_str("2002-09-10T23:08:25Z").unwrap()
|
|
);
|
|
assert_eq!(delay.data, None);
|
|
}
|
|
|
|
#[test]
|
|
fn test_unknown() {
|
|
let elem: Element = "<replace xmlns='urn:xmpp:message-correct:0'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = Delay::try_from(elem.clone()).unwrap_err();
|
|
let returned_elem = match error {
|
|
FromElementError::Mismatch(elem) => elem,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(elem, returned_elem);
|
|
}
|
|
|
|
#[test]
|
|
fn test_invalid_child() {
|
|
let elem: Element = "<delay xmlns='urn:xmpp:delay'><coucou/></delay>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = Delay::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::Other(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(message, "Unknown child in delay element.");
|
|
}
|
|
|
|
#[test]
|
|
fn test_serialise() {
|
|
let elem: Element = "<delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:08:25+00:00'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let delay = Delay {
|
|
from: None,
|
|
stamp: DateTime::from_str("2002-09-10T23:08:25Z").unwrap(),
|
|
data: None,
|
|
};
|
|
let elem2 = delay.into();
|
|
assert_eq!(elem, elem2);
|
|
}
|
|
|
|
#[test]
|
|
fn test_serialise_data() {
|
|
let elem: Element = "<delay xmlns='urn:xmpp:delay' from='juliet@example.org' stamp='2002-09-10T23:08:25+00:00'>Reason</delay>".parse().unwrap();
|
|
let delay = Delay {
|
|
from: Some(Jid::new("juliet@example.org").unwrap()),
|
|
stamp: DateTime::from_str("2002-09-10T23:08:25Z").unwrap(),
|
|
data: Some(String::from("Reason")),
|
|
};
|
|
let elem2 = delay.into();
|
|
assert_eq!(elem, elem2);
|
|
}
|
|
}
|