xmpp-rs/parsers/src/mam.rs

// Copyright (c) 2017-2021 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::data_forms::DataForm;
use crate::forwarding::Forwarded;
use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
use crate::message::MessagePayload;
use crate::pubsub::NodeName;
use crate::rsm::{SetQuery, SetResult};

generate_id!(
    /// An identifier matching a result message to the query requesting it.
    QueryId
);

generate_element!(
    /// Starts a query to the archive.
    Query, "query", MAM,
    attributes: [
        /// An optional identifier for matching forwarded messages to this
        /// query.
        queryid: Option<QueryId> = "queryid",

        /// Must be set to Some when querying a PubSub node’s archive.
        node: Option<NodeName> = "node"
    ],
    children: [
        /// Used for filtering the results.
        form: Option<DataForm> = ("x", DATA_FORMS) => DataForm,

        /// Used for paging through results.
        set: Option<SetQuery> = ("set", RSM) => SetQuery
    ]
);

impl IqGetPayload for Query {}
impl IqSetPayload for Query {}
impl IqResultPayload for Query {}

generate_element!(
    /// The wrapper around forwarded stanzas.
    Result_, "result", MAM,
    attributes: [
        /// The stanza-id under which the archive stored this stanza.
        id: Required<String> = "id",

        /// The same queryid as the one requested in the
        /// [query](struct.Query.html).
        queryid: Option<QueryId> = "queryid",
    ],
    children: [
        /// The actual stanza being forwarded.
        forwarded: Required<Forwarded> = ("forwarded", FORWARD) => Forwarded
    ]
);

impl MessagePayload for Result_ {}

generate_attribute!(
    /// True when the end of a MAM query has been reached.
    Complete,
    "complete",
    bool
);

generate_element!(
    /// Notes the end of a page in a query.
    Fin, "fin", MAM,
    attributes: [
        /// True when the end of a MAM query has been reached.
        complete: Default<Complete> = "complete",
    ],
    children: [
        /// Describes the current page, it should contain at least [first]
        /// (with an [index]) and [last], and generally [count].
        ///
        /// [first]: ../rsm/struct.SetResult.html#structfield.first
        /// [index]: ../rsm/struct.SetResult.html#structfield.first_index
        /// [last]: ../rsm/struct.SetResult.html#structfield.last
        /// [count]: ../rsm/struct.SetResult.html#structfield.count
        set: Required<SetResult> = ("set", RSM) => SetResult
    ]
);

impl IqResultPayload for Fin {}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::util::error::Error;
    use minidom::Element;

    #[cfg(target_pointer_width = "32")]
    #[test]
    fn test_size() {
        assert_size!(QueryId, 12);
        assert_size!(Query, 116);
        assert_size!(Result_, 176);
        assert_size!(Complete, 1);
        assert_size!(Fin, 44);
    }

    #[cfg(target_pointer_width = "64")]
    #[test]
    fn test_size() {
        assert_size!(QueryId, 24);
        assert_size!(Query, 232);
        assert_size!(Result_, 336);
        assert_size!(Complete, 1);
        assert_size!(Fin, 88);
    }

    #[test]
    fn test_query() {
        let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap();
        Query::try_from(elem).unwrap();
    }

    #[test]
    fn test_result() {
        #[cfg(not(feature = "component"))]
        let elem: Element = r#"<result xmlns='urn:xmpp:mam:2' queryid='f27' id='28482-98726-73623'>
  <forwarded xmlns='urn:xmpp:forward:0'>
    <delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>
    <message xmlns='jabber:client' from="witch@shakespeare.lit" to="macbeth@shakespeare.lit">
      <body>Hail to thee</body>
    </message>
  </forwarded>
</result>
"#
        .parse()
        .unwrap();
        #[cfg(feature = "component")]
        let elem: Element = r#"<result xmlns='urn:xmpp:mam:2' queryid='f27' id='28482-98726-73623'>
  <forwarded xmlns='urn:xmpp:forward:0'>
    <delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>
    <message xmlns='jabber:component:accept' from="witch@shakespeare.lit" to="macbeth@shakespeare.lit">
      <body>Hail to thee</body>
    </message>
  </forwarded>
</result>
"#.parse().unwrap();
        Result_::try_from(elem).unwrap();
    }

    #[test]
    fn test_fin() {
        let elem: Element = r#"<fin xmlns='urn:xmpp:mam:2'>
  <set xmlns='http://jabber.org/protocol/rsm'>
    <first index='0'>28482-98726-73623</first>
    <last>09af3-cc343-b409f</last>
  </set>
</fin>
"#
        .parse()
        .unwrap();
        Fin::try_from(elem).unwrap();
    }

    #[test]
    fn test_query_x() {
        let elem: Element = r#"<query xmlns='urn:xmpp:mam:2'>
  <x xmlns='jabber:x:data' type='submit'>
    <field var='FORM_TYPE' type='hidden'>
      <value>urn:xmpp:mam:2</value>
    </field>
    <field var='with'>
      <value>juliet@capulet.lit</value>
    </field>
  </x>
</query>
"#
        .parse()
        .unwrap();
        Query::try_from(elem).unwrap();
    }

    #[test]
    fn test_query_x_set() {
        let elem: Element = r#"<query xmlns='urn:xmpp:mam:2'>
  <x xmlns='jabber:x:data' type='submit'>
    <field var='FORM_TYPE' type='hidden'>
      <value>urn:xmpp:mam:2</value>
    </field>
    <field var='start'>
      <value>2010-08-07T00:00:00Z</value>
    </field>
  </x>
  <set xmlns='http://jabber.org/protocol/rsm'>
    <max>10</max>
  </set>
</query>
"#
        .parse()
        .unwrap();
        Query::try_from(elem).unwrap();
    }

    #[test]
    fn test_invalid_child() {
        let elem: Element = "<query xmlns='urn:xmpp:mam:2'><coucou/></query>"
            .parse()
            .unwrap();
        let error = Query::try_from(elem).unwrap_err();
        let message = match error {
            Error::ParseError(string) => string,
            _ => panic!(),
        };
        assert_eq!(message, "Unknown child in query element.");
    }

    #[test]
    fn test_serialise_empty() {
        let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap();
        let replace = Query {
            queryid: None,
            node: None,
            form: None,
            set: None,
        };
        let elem2 = replace.into();
        assert_eq!(elem, elem2);
    }

    #[test]
    fn test_serialize_query_with_form() {
        let reference: Element = "<query xmlns='urn:xmpp:mam:2'><x xmlns='jabber:x:data' type='submit'><field xmlns='jabber:x:data' var='FORM_TYPE' type='hidden'><value xmlns='jabber:x:data'>urn:xmpp:mam:2</value></field><field xmlns='jabber:x:data' var='with'><value xmlns='jabber:x:data'>juliet@capulet.lit</value></field></x></query>"
        .parse()
        .unwrap();

        let elem: Element = "<x xmlns='jabber:x:data' type='submit'><field xmlns='jabber:x:data' var='FORM_TYPE' type='hidden'><value xmlns='jabber:x:data'>urn:xmpp:mam:2</value></field><field xmlns='jabber:x:data' var='with'><value xmlns='jabber:x:data'>juliet@capulet.lit</value></field></x>"
          .parse()
          .unwrap();

        let form = DataForm::try_from(elem).unwrap();

        let query = Query {
            queryid: None,
            node: None,
            set: None,
            form: Some(form),
        };
        let serialized: Element = query.into();
        assert_eq!(serialized, reference);
    }

    #[test]
    fn test_serialize_result() {
        let reference: Element = "<result xmlns='urn:xmpp:mam:2' queryid='f27' id='28482-98726-73623'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:08:25+00:00'/><message xmlns='jabber:client' to='juliet@capulet.example/balcony' from='romeo@montague.example/home'/></forwarded></result>"
        .parse()
        .unwrap();

        let elem: Element = "<forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:08:25+00:00'/><message xmlns='jabber:client' to='juliet@capulet.example/balcony' from='romeo@montague.example/home'/></forwarded>"
          .parse()
          .unwrap();

        let forwarded = Forwarded::try_from(elem).unwrap();

        let result = Result_ {
            id: String::from("28482-98726-73623"),
            queryid: Some(QueryId(String::from("f27"))),
            forwarded: forwarded,
        };
        let serialized: Element = result.into();
        assert_eq!(serialized, reference);
    }

    #[test]
    fn test_serialize_fin() {
        let reference: Element = "<fin xmlns='urn:xmpp:mam:2'><set xmlns='http://jabber.org/protocol/rsm'><first index='0'>28482-98726-73623</first><last>09af3-cc343-b409f</last></set></fin>"
        .parse()
        .unwrap();

        let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'><first index='0'>28482-98726-73623</first><last>09af3-cc343-b409f</last></set>"
          .parse()
          .unwrap();

        let set = SetResult::try_from(elem).unwrap();

        let fin = Fin {
            set: set,
            complete: Complete::default(),
        };
        let serialized: Element = fin.into();
        assert_eq!(serialized, reference);
    }
}
-												xmpp-parsers/mam: Split into mam_prefs following XEP-0411

											
										
										
											2021-09-29 18:08:08 +00:00
+								// Copyright (c) 2017-2021 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-												License the project under MPL-2.0.

											
										
										
											2017-04-29 21:14:34 +00:00
+								//
 								// 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/.
-												Run `cargo fix --edition` to move to Edition 2018.

											
										
										
											2018-12-18 14:27:30 +00:00
+								use crate::data_forms::DataForm;
 								use crate::forwarding::Forwarded;
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
 								use crate::message::MessagePayload;
 								use crate::pubsub::NodeName;
 								use crate::rsm::{SetQuery, SetResult};
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
-												mam: Replace Strings with proper wrappers, and make queryid optional as it should be.

											
										
										
											2018-08-02 18:05:35 +00:00
+								generate_id!(
 								    /// An identifier matching a result message to the query requesting it.
 								    QueryId
 								);
-												macros: Merge generate_element_with_children!() into generate_element!().

											
										
										
											2018-05-28 14:45:13 +00:00
+								generate_element!(
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								    /// Starts a query to the archive.
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								    Query, "query", MAM,
 								    attributes: [
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								        /// An optional identifier for matching forwarded messages to this
 								        /// query.
-												macros: Use a nicer syntax when declaring attributes.

The previous version had a => required|optional|default token, this was
duplicating information for Option types and didn’t look very good.

This new version looks like a type, which can be either Required<_>,
Option<_> or Default<_>, and means the same thing.

											
										
										
											2019-02-24 19:26:40 +00:00
+								        queryid: Option<QueryId> = "queryid",
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
 								        /// Must be set to Some when querying a PubSub node’s archive.
-												macros: Use a nicer syntax when declaring attributes.

The previous version had a => required|optional|default token, this was
duplicating information for Option types and didn’t look very good.

This new version looks like a type, which can be either Required<_>,
Option<_> or Default<_>, and means the same thing.

											
										
										
											2019-02-24 19:26:40 +00:00
+								        node: Option<NodeName> = "node"
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								    ],
 								    children: [
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								        /// Used for filtering the results.
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								        form: Option<DataForm> = ("x", DATA_FORMS) => DataForm,
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
 								        /// Used for paging through results.
-												rsm: Split Set into SetQuery and SetResult, and document this.

											
										
										
											2018-08-02 18:35:15 +00:00
+								        set: Option<SetQuery> = ("set", RSM) => SetQuery
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								    ]
 								);
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
-												iq: Implement the Iq*Payload traits on every possible payload.

											
										
										
											2018-05-16 13:08:17 +00:00
+								impl IqGetPayload for Query {}
 								impl IqSetPayload for Query {}
 								impl IqResultPayload for Query {}
-												macros: Merge generate_element_with_children!() into generate_element!().

											
										
										
											2018-05-28 14:45:13 +00:00
+								generate_element!(
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								    /// The wrapper around forwarded stanzas.
-												mam: Use a macro to generate Result_.

											
										
										
											2018-05-15 00:06:38 +00:00
+								    Result_, "result", MAM,
 								    attributes: [
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								        /// The stanza-id under which the archive stored this stanza.
-												macros: Use a nicer syntax when declaring attributes.

The previous version had a => required|optional|default token, this was
duplicating information for Option types and didn’t look very good.

This new version looks like a type, which can be either Required<_>,
Option<_> or Default<_>, and means the same thing.

											
										
										
											2019-02-24 19:26:40 +00:00
+								        id: Required<String> = "id",
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
 								        /// The same queryid as the one requested in the
 								        /// [query](struct.Query.html).
-												macros: Use a nicer syntax when declaring attributes.

The previous version had a => required|optional|default token, this was
duplicating information for Option types and didn’t look very good.

This new version looks like a type, which can be either Required<_>,
Option<_> or Default<_>, and means the same thing.

											
										
										
											2019-02-24 19:26:40 +00:00
+								        queryid: Option<QueryId> = "queryid",
-												mam: Use a macro to generate Result_.

											
										
										
											2018-05-15 00:06:38 +00:00
+								    ],
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								    children: [
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								        /// The actual stanza being forwarded.
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								        forwarded: Required<Forwarded> = ("forwarded", FORWARD) => Forwarded
 								    ]
-												mam: Use a macro to generate Result_.

											
										
										
											2018-05-15 00:06:38 +00:00
+								);
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
-												message: Make MessagePayload a trait, and implement it on every payload.

											
										
										
											2018-09-20 18:58:27 +00:00
+								impl MessagePayload for Result_ {}
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								generate_attribute!(
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								    /// True when the end of a MAM query has been reached.
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								    Complete,
 								    "complete",
 								    bool
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								);
-												macros: Merge generate_element_with_children!() into generate_element!().

											
										
										
											2018-05-28 14:45:13 +00:00
+								generate_element!(
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								    /// Notes the end of a page in a query.
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								    Fin, "fin", MAM,
 								    attributes: [
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								        /// True when the end of a MAM query has been reached.
-												macros: Use a nicer syntax when declaring attributes.

The previous version had a => required|optional|default token, this was
duplicating information for Option types and didn’t look very good.

This new version looks like a type, which can be either Required<_>,
Option<_> or Default<_>, and means the same thing.

											
										
										
											2019-02-24 19:26:40 +00:00
+								        complete: Default<Complete> = "complete",
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								    ],
 								    children: [
-												mam: Document this module.

											
										
										
											2018-08-02 18:05:51 +00:00
+								        /// Describes the current page, it should contain at least [first]
 								        /// (with an [index]) and [last], and generally [count].
 								        ///
-												rsm: Split Set into SetQuery and SetResult, and document this.

											
										
										
											2018-08-02 18:35:15 +00:00
+								        /// [first]: ../rsm/struct.SetResult.html#structfield.first
 								        /// [index]: ../rsm/struct.SetResult.html#structfield.first_index
 								        /// [last]: ../rsm/struct.SetResult.html#structfield.last
 								        /// [count]: ../rsm/struct.SetResult.html#structfield.count
 								        set: Required<SetResult> = ("set", RSM) => SetResult
-												macros: Merge all element children into a common syntax.

											
										
										
											2018-05-28 14:29:51 +00:00
+								    ]
 								);
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
-												iq: Implement the Iq*Payload traits on every possible payload.

											
										
										
											2018-05-16 13:08:17 +00:00
+								impl IqResultPayload for Fin {}
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								#[cfg(test)]
 								mod tests {
-												mam: Switch to Into/TryFrom.

											
										
										
											2017-05-06 20:08:44 +00:00
+								    use super::*;
-												xmpp-parsers/mam: Split into mam_prefs following XEP-0411

											
										
										
											2021-09-29 18:08:08 +00:00
+								    use crate::util::error::Error;
 								    use minidom::Element;
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
-												Test struct sizes on 32-bit too.

											
										
										
											2018-10-28 12:10:48 +00:00
+								    #[cfg(target_pointer_width = "32")]
 								    #[test]
 								    fn test_size() {
 								        assert_size!(QueryId, 12);
 								        assert_size!(Query, 116);
-												xmpp-parsers: Fix size tests on 32-bit

											
										
										
											2023-06-20 12:14:15 +00:00
+								        assert_size!(Result_, 176);
-												Test struct sizes on 32-bit too.

											
										
										
											2018-10-28 12:10:48 +00:00
+								        assert_size!(Complete, 1);
 								        assert_size!(Fin, 44);
 								    }
 								    #[cfg(target_pointer_width = "64")]
-												Test the size of every struct defined here.

											
										
										
											2018-10-26 12:26:16 +00:00
+								    #[test]
 								    fn test_size() {
 								        assert_size!(QueryId, 24);
 								        assert_size!(Query, 232);
-												xmpp-parsers: Fix size tests on 64-bit

											
										
										
											2023-06-20 12:08:58 +00:00
+								        assert_size!(Result_, 336);
-												Test the size of every struct defined here.

											
										
										
											2018-10-26 12:26:16 +00:00
+								        assert_size!(Complete, 1);
 								        assert_size!(Fin, 88);
 								    }
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								    #[test]
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								    fn test_query() {
 								        let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap();
-												Convert all of the parsers/serialisers into consuming their parameter.

											
										
										
											2017-05-23 22:31:33 +00:00
+								        Query::try_from(elem).unwrap();
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								    }
 								    #[test]
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								    fn test_result() {
-												message, iq, presence, stanza_error, forwarded: Add support for components hidden behind the component feature flag.

											
										
										
											2017-07-29 05:49:02 +00:00
+								        #[cfg(not(feature = "component"))]
-												minidom, tokio-xmpp: switch xml parsing to rxml

											
										
										
											2022-03-22 22:29:25 +00:00
+								        let elem: Element = r#"<result xmlns='urn:xmpp:mam:2' queryid='f27' id='28482-98726-73623'>
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								  <forwarded xmlns='urn:xmpp:forward:0'>
 								    <delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>
 								    <message xmlns='jabber:client' from="witch@shakespeare.lit" to="macbeth@shakespeare.lit">
 								      <body>Hail to thee</body>
 								    </message>
 								  </forwarded>
 								</result>
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								"#
 								        .parse()
 								        .unwrap();
-												message, iq, presence, stanza_error, forwarded: Add support for components hidden behind the component feature flag.

											
										
										
											2017-07-29 05:49:02 +00:00
+								        #[cfg(feature = "component")]
-												minidom, tokio-xmpp: switch xml parsing to rxml

											
										
										
											2022-03-22 22:29:25 +00:00
+								        let elem: Element = r#"<result xmlns='urn:xmpp:mam:2' queryid='f27' id='28482-98726-73623'>
-												message, iq, presence, stanza_error, forwarded: Add support for components hidden behind the component feature flag.

											
										
										
											2017-07-29 05:49:02 +00:00
+								  <forwarded xmlns='urn:xmpp:forward:0'>
 								    <delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>
 								    <message xmlns='jabber:component:accept' from="witch@shakespeare.lit" to="macbeth@shakespeare.lit">
 								      <body>Hail to thee</body>
 								    </message>
 								  </forwarded>
 								</result>
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								"#.parse().unwrap();
-												Convert all of the parsers/serialisers into consuming their parameter.

											
										
										
											2017-05-23 22:31:33 +00:00
+								        Result_::try_from(elem).unwrap();
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								    }
 								    #[test]
 								    fn test_fin() {
-												minidom, tokio-xmpp: switch xml parsing to rxml

											
										
										
											2022-03-22 22:29:25 +00:00
+								        let elem: Element = r#"<fin xmlns='urn:xmpp:mam:2'>
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								  <set xmlns='http://jabber.org/protocol/rsm'>
 								    <first index='0'>28482-98726-73623</first>
 								    <last>09af3-cc343-b409f</last>
 								  </set>
 								</fin>
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								"#
 								        .parse()
 								        .unwrap();
-												Convert all of the parsers/serialisers into consuming their parameter.

											
										
										
											2017-05-23 22:31:33 +00:00
+								        Fin::try_from(elem).unwrap();
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								    }
 								    #[test]
 								    fn test_query_x() {
-												minidom, tokio-xmpp: switch xml parsing to rxml

											
										
										
											2022-03-22 22:29:25 +00:00
+								        let elem: Element = r#"<query xmlns='urn:xmpp:mam:2'>
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								  <x xmlns='jabber:x:data' type='submit'>
 								    <field var='FORM_TYPE' type='hidden'>
 								      <value>urn:xmpp:mam:2</value>
 								    </field>
 								    <field var='with'>
 								      <value>juliet@capulet.lit</value>
 								    </field>
 								  </x>
 								</query>
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								"#
 								        .parse()
 								        .unwrap();
-												Convert all of the parsers/serialisers into consuming their parameter.

											
										
										
											2017-05-23 22:31:33 +00:00
+								        Query::try_from(elem).unwrap();
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								    }
 								    #[test]
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								    fn test_query_x_set() {
-												minidom, tokio-xmpp: switch xml parsing to rxml

											
										
										
											2022-03-22 22:29:25 +00:00
+								        let elem: Element = r#"<query xmlns='urn:xmpp:mam:2'>
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								  <x xmlns='jabber:x:data' type='submit'>
 								    <field var='FORM_TYPE' type='hidden'>
 								      <value>urn:xmpp:mam:2</value>
 								    </field>
 								    <field var='start'>
 								      <value>2010-08-07T00:00:00Z</value>
 								    </field>
 								  </x>
 								  <set xmlns='http://jabber.org/protocol/rsm'>
 								    <max>10</max>
 								  </set>
 								</query>
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								"#
 								        .parse()
 								        .unwrap();
-												Convert all of the parsers/serialisers into consuming their parameter.

											
										
										
											2017-05-23 22:31:33 +00:00
+								        Query::try_from(elem).unwrap();
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								    }
 								    #[test]
 								    fn test_invalid_child() {
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								        let elem: Element = "<query xmlns='urn:xmpp:mam:2'><coucou/></query>"
 								            .parse()
 								            .unwrap();
-												Convert all of the parsers/serialisers into consuming their parameter.

											
										
										
											2017-05-23 22:31:33 +00:00
+								        let error = Query::try_from(elem).unwrap_err();
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								        let message = match error {
 								            Error::ParseError(string) => string,
 								            _ => panic!(),
 								        };
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								        assert_eq!(message, "Unknown child in query element.");
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								    }
 								    #[test]
-												parsers/mam: add ignored failing test for serialization

Add failing test for #20. Thanks Paul.
Now that needs fixing..

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

											
										
										
											2019-11-22 16:31:25 +00:00
+								    fn test_serialise_empty() {
-												mam: Add tests.

											
										
										
											2017-04-29 05:41:55 +00:00
+								        let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap();
-												Run `cargo fmt`.

											
										
										
											2018-12-18 14:32:05 +00:00
+								        let replace = Query {
 								            queryid: None,
 								            node: None,
 								            form: None,
 								            set: None,
 								        };
-												Convert all of the parsers/serialisers into consuming their parameter.

											
										
										
											2017-05-23 22:31:33 +00:00
+								        let elem2 = replace.into();
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								        assert_eq!(elem, elem2);
 								    }
-												parsers/mam: add ignored failing test for serialization

Add failing test for #20. Thanks Paul.
Now that needs fixing..

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

											
										
										
											2019-11-22 16:31:25 +00:00
 								    #[test]
-												Add serialization test for mam result and fin element

											
										
										
											2019-12-05 20:41:43 +00:00
+								    fn test_serialize_query_with_form() {
-												mam: Fix test on serialisation

											
										
										
											2019-11-27 17:16:51 +00:00
+								        let reference: Element = "<query xmlns='urn:xmpp:mam:2'><x xmlns='jabber:x:data' type='submit'><field xmlns='jabber:x:data' var='FORM_TYPE' type='hidden'><value xmlns='jabber:x:data'>urn:xmpp:mam:2</value></field><field xmlns='jabber:x:data' var='with'><value xmlns='jabber:x:data'>juliet@capulet.lit</value></field></x></query>"
-												parsers/mam: add ignored failing test for serialization

Add failing test for #20. Thanks Paul.
Now that needs fixing..

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

											
										
										
											2019-11-22 16:31:25 +00:00
+								        .parse()
 								        .unwrap();
-												Add serialization test for mam result and fin element

											
										
										
											2019-12-05 20:41:43 +00:00
+								        let elem: Element = "<x xmlns='jabber:x:data' type='submit'><field xmlns='jabber:x:data' var='FORM_TYPE' type='hidden'><value xmlns='jabber:x:data'>urn:xmpp:mam:2</value></field><field xmlns='jabber:x:data' var='with'><value xmlns='jabber:x:data'>juliet@capulet.lit</value></field></x>"
 								          .parse()
 								          .unwrap();
 								        let form = DataForm::try_from(elem).unwrap();
-												Add serialization test for pubsub publish-options and options element

											
										
										
											2019-12-05 21:24:25 +00:00
+								        let query = Query {
-												parsers/mam: add ignored failing test for serialization

Add failing test for #20. Thanks Paul.
Now that needs fixing..

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

											
										
										
											2019-11-22 16:31:25 +00:00
+								            queryid: None,
 								            node: None,
 								            set: None,
 								            form: Some(form),
 								        };
-												Add serialization test for pubsub publish-options and options element

											
										
										
											2019-12-05 21:24:25 +00:00
+								        let serialized: Element = query.into();
-												mam: Fix test on serialisation

											
										
										
											2019-11-27 17:16:51 +00:00
+								        assert_eq!(serialized, reference);
-												parsers/mam: add ignored failing test for serialization

Add failing test for #20. Thanks Paul.
Now that needs fixing..

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

											
										
										
											2019-11-22 16:31:25 +00:00
+								    }
-												Add more test on Optionnal, Required children serialization

											
										
										
											2019-11-28 17:00:40 +00:00
 								    #[test]
 								    fn test_serialize_result() {
-												Add serialization test for mam result and fin element

											
										
										
											2019-12-05 20:41:43 +00:00
+								        let reference: Element = "<result xmlns='urn:xmpp:mam:2' queryid='f27' id='28482-98726-73623'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:08:25+00:00'/><message xmlns='jabber:client' to='juliet@capulet.example/balcony' from='romeo@montague.example/home'/></forwarded></result>"
 								        .parse()
 								        .unwrap();
 								        let elem: Element = "<forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:08:25+00:00'/><message xmlns='jabber:client' to='juliet@capulet.example/balcony' from='romeo@montague.example/home'/></forwarded>"
 								          .parse()
 								          .unwrap();
 								        let forwarded = Forwarded::try_from(elem).unwrap();
 								        let result = Result_ {
-												Fix fmt

											
										
										
											2019-12-30 05:55:32 +00:00
+								            id: String::from("28482-98726-73623"),
 								            queryid: Some(QueryId(String::from("f27"))),
 								            forwarded: forwarded,
-												Add serialization test for mam result and fin element

											
										
										
											2019-12-05 20:41:43 +00:00
+								        };
 								        let serialized: Element = result.into();
 								        assert_eq!(serialized, reference);
-												Add more test on Optionnal, Required children serialization

											
										
										
											2019-11-28 17:00:40 +00:00
+								    }
 								    #[test]
 								    fn test_serialize_fin() {
-												Add serialization test for mam result and fin element

											
										
										
											2019-12-05 20:41:43 +00:00
+								        let reference: Element = "<fin xmlns='urn:xmpp:mam:2'><set xmlns='http://jabber.org/protocol/rsm'><first index='0'>28482-98726-73623</first><last>09af3-cc343-b409f</last></set></fin>"
 								        .parse()
 								        .unwrap();
 								        let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'><first index='0'>28482-98726-73623</first><last>09af3-cc343-b409f</last></set>"
 								          .parse()
 								          .unwrap();
 								        let set = SetResult::try_from(elem).unwrap();
 								        let fin = Fin {
-												Fix fmt

											
										
										
											2019-12-30 05:55:32 +00:00
+								            set: set,
 								            complete: Complete::default(),
-												Add serialization test for mam result and fin element

											
										
										
											2019-12-05 20:41:43 +00:00
+								        };
 								        let serialized: Element = fin.into();
 								        assert_eq!(serialized, reference);
-												Add more test on Optionnal, Required children serialization

											
										
										
											2019-11-28 17:00:40 +00:00
+								    }
-												Add a MAM parser and serialiser.

											
										
										
											2017-04-29 05:07:00 +00:00
+								}