pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xmpp-parsers/bookmarks: Make @name actually optional

Browse source 
No idea why these two attribute got considered required, maybe a wrong
read of the spec.
This commit is contained in:
Emmanuel Gil Peyrot 2020-10-16 22:02:14 +02:00 committed by Link Mauve
parent 3a73ce3fd4
commit 0c0be96ec4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xmpp-parsers/src/bookmarks.rs
View file

@ -24,7 +24,7 @@ generate_element!(
jid: Required<BareJid> = "jid", jid: Required<BareJid> = "jid",
/// A user-defined name for this conference. /// A user-defined name for this conference.
name: Required<String> = "name", name: Option<String> = "name",
], ],
children: [ children: [
/// The nick the user will use to join this conference. /// The nick the user will use to join this conference.
@ -40,7 +40,7 @@ generate_element!(
Url, "url", BOOKMARKS, Url, "url", BOOKMARKS,
attributes: [ attributes: [
/// A user-defined name for this URL. /// A user-defined name for this URL.
name: Required<String> = "name", name: Option<String> = "name",
/// The URL of this bookmark. /// The URL of this bookmark.
url: Required<String> = "url", url: Required<String> = "url",
@ -106,7 +106,7 @@ mod tests {
let elem: Element = "<storage xmlns='storage:bookmarks'><url name='Example' url='https://example.org/'/><conference autojoin='true' jid='test-muc@muc.localhost' name='Test MUC'><nick>Coucou</nick><password>secret</password></conference></storage>".parse().unwrap(); let elem: Element = "<storage xmlns='storage:bookmarks'><url name='Example' url='https://example.org/'/><conference autojoin='true' jid='test-muc@muc.localhost' name='Test MUC'><nick>Coucou</nick><password>secret</password></conference></storage>".parse().unwrap();
let storage = Storage::try_from(elem).unwrap(); let storage = Storage::try_from(elem).unwrap();
assert_eq!(storage.urls.len(), 1); assert_eq!(storage.urls.len(), 1);
assert_eq!(storage.urls[0].name, "Example"); assert_eq!(storage.urls[0].clone().name.unwrap(), "Example");
assert_eq!(storage.urls[0].url, "https://example.org/"); assert_eq!(storage.urls[0].url, "https://example.org/");
assert_eq!(storage.conferences.len(), 1); assert_eq!(storage.conferences.len(), 1);
assert_eq!(storage.conferences[0].autojoin, Autojoin::True); assert_eq!(storage.conferences[0].autojoin, Autojoin::True);
@ -114,7 +114,7 @@ mod tests {
storage.conferences[0].jid, storage.conferences[0].jid,
BareJid::new("test-muc", "muc.localhost") BareJid::new("test-muc", "muc.localhost")
); );
assert_eq!(storage.conferences[0].name, "Test MUC"); assert_eq!(storage.conferences[0].clone().name.unwrap(), "Test MUC");
assert_eq!(storage.conferences[0].clone().nick.unwrap(), "Coucou"); assert_eq!(storage.conferences[0].clone().nick.unwrap(), "Coucou");
assert_eq!(storage.conferences[0].clone().password.unwrap(), "secret"); assert_eq!(storage.conferences[0].clone().password.unwrap(), "secret");
} }