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.
120 lines
4 KiB
Rust
120 lines
4 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::ibb::{Stanza, StreamId};
|
|
|
|
generate_element!(
|
|
/// Describes an [In-Band Bytestream](https://xmpp.org/extensions/xep-0047.html)
|
|
/// Jingle transport, see also the [IBB module](../ibb.rs).
|
|
Transport, "transport", JINGLE_IBB,
|
|
attributes: [
|
|
/// Maximum size in bytes for each chunk.
|
|
block_size: Required<u16> = "block-size",
|
|
|
|
/// The identifier to be used to create a stream.
|
|
sid: Required<StreamId> = "sid",
|
|
|
|
/// Which stanza type to use to exchange data.
|
|
stanza: Default<Stanza> = "stanza",
|
|
]);
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::Element;
|
|
use xso::error::{Error, FromElementError};
|
|
|
|
#[cfg(target_pointer_width = "32")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(Transport, 16);
|
|
}
|
|
|
|
#[cfg(target_pointer_width = "64")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(Transport, 32);
|
|
}
|
|
|
|
#[test]
|
|
fn test_simple() {
|
|
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();
|
|
assert_eq!(transport.block_size, 3);
|
|
assert_eq!(transport.sid, StreamId(String::from("coucou")));
|
|
assert_eq!(transport.stanza, Stanza::Iq);
|
|
}
|
|
|
|
#[test]
|
|
fn test_invalid() {
|
|
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = Transport::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::Other(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(message, "Required attribute 'block-size' missing.");
|
|
|
|
let elem: Element =
|
|
"<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='65536'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = Transport::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::TextParseError(error))
|
|
if error.is::<std::num::ParseIntError>() =>
|
|
{
|
|
error
|
|
}
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(
|
|
message.to_string(),
|
|
"number too large to fit in target type"
|
|
);
|
|
|
|
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='-5'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = Transport::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::TextParseError(error))
|
|
if error.is::<std::num::ParseIntError>() =>
|
|
{
|
|
error
|
|
}
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(message.to_string(), "invalid digit found in string");
|
|
|
|
let elem: Element =
|
|
"<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='128'/>"
|
|
.parse()
|
|
.unwrap();
|
|
let error = Transport::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::Other(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(message, "Required attribute 'sid' missing.");
|
|
}
|
|
|
|
#[test]
|
|
fn test_invalid_stanza() {
|
|
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='128' sid='coucou' stanza='fdsq'/>".parse().unwrap();
|
|
let error = Transport::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::TextParseError(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(message.to_string(), "Unknown value for 'stanza' attribute.");
|
|
}
|
|
}
|