19865e5f1e
- Move Element.attributes to `AttrMap`, slowly using rxml's features and unrolling our own. - Add Element::attr_ns that requires the attribute namespace. Element:attr defaults to rxml::Namespace::none() but the interface changes nonetheless for a &NcNameStr. Similar changes on `ElementBuilder` methods. - Remove iterator structs for attributes, return a ref on the AttrMap directly as we don't need to keep attributes' internals hidden anymore. - Enable rxml's `macros` feature within tests to access the `xml_ncname` macro. Signed-off-by: pep <pep@bouah.net>
93 lines
2.6 KiB
Rust
93 lines
2.6 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 xso::{AsXml, FromXml};
|
|
|
|
use crate::message::MessagePayload;
|
|
use crate::ns;
|
|
|
|
/// Requests that this message is acked by the final recipient once
|
|
/// received.
|
|
#[derive(FromXml, AsXml, PartialEq, Debug, Clone)]
|
|
#[xml(namespace = ns::RECEIPTS, name = "request")]
|
|
pub struct Request;
|
|
|
|
impl MessagePayload for Request {}
|
|
|
|
/// Notes that a previous message has correctly been received, it is
|
|
/// referenced by its 'id' attribute.
|
|
#[derive(FromXml, AsXml, PartialEq, Debug, Clone)]
|
|
#[xml(namespace = ns::RECEIPTS, name = "received")]
|
|
pub struct Received {
|
|
/// The 'id' attribute of the received message.
|
|
#[xml(attribute)]
|
|
pub id: String,
|
|
}
|
|
|
|
impl MessagePayload for Received {}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::ns;
|
|
use minidom::Element;
|
|
use xso::error::{Error, FromElementError};
|
|
use xso::exports::rxml;
|
|
|
|
#[cfg(target_pointer_width = "32")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(Request, 0);
|
|
assert_size!(Received, 12);
|
|
}
|
|
|
|
#[cfg(target_pointer_width = "64")]
|
|
#[test]
|
|
fn test_size() {
|
|
assert_size!(Request, 0);
|
|
assert_size!(Received, 24);
|
|
}
|
|
|
|
#[test]
|
|
fn test_simple() {
|
|
let elem: Element = "<request xmlns='urn:xmpp:receipts'/>".parse().unwrap();
|
|
Request::try_from(elem).unwrap();
|
|
|
|
let elem: Element = "<received xmlns='urn:xmpp:receipts' id='coucou'/>"
|
|
.parse()
|
|
.unwrap();
|
|
Received::try_from(elem).unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn test_missing_id() {
|
|
let elem: Element = "<received xmlns='urn:xmpp:receipts'/>".parse().unwrap();
|
|
let error = Received::try_from(elem).unwrap_err();
|
|
let message = match error {
|
|
FromElementError::Invalid(Error::Other(string)) => string,
|
|
_ => panic!(),
|
|
};
|
|
assert_eq!(
|
|
message,
|
|
"Required attribute field 'id' on Received element missing."
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_serialise() {
|
|
let receipt = Request;
|
|
let elem: Element = receipt.into();
|
|
assert!(elem.is("request", ns::RECEIPTS));
|
|
assert_eq!(elem.attrs().into_iter().count(), 0);
|
|
|
|
let receipt = Received {
|
|
id: String::from("coucou"),
|
|
};
|
|
let elem: Element = receipt.into();
|
|
assert!(elem.is("received", ns::RECEIPTS));
|
|
assert_eq!(elem.attr(rxml::xml_ncname!("id")), Some("coucou"));
|
|
}
|
|
}
|