chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events: Make the json_object macro syntax easier to read

Browse Source
This commit is contained in:
Kévin Commaille 2023-02-23 19:03:30 +01:00 committed by Kévin Commaille
parent 32901da35f
commit f29bbebf08
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/ruma-common/tests/events/room_message.rs
View File

@ -24,22 +24,19 @@ use ruma_common::{
use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
macro_rules! json_object { macro_rules! json_object {
( $($key:expr => $value:expr),* $(,)? ) => { ( $($tt:tt)+ ) => {
{ match serde_json::json!({ $($tt)+ }) {
let mut _map = serde_json::Map::<String, serde_json::Value>::new(); serde_json::value::Value::Object(map) => map,
$( _ => panic!("Not a JSON object"),
let _ = _map.insert($key, $value);
)*
_map
} }
}; }
} }
#[test] #[test]
fn custom_msgtype_serialization() { fn custom_msgtype_serialization() {
let json_data = json_object! { let json_data = json_object! {
"custom_field".into() => json!("baba"), "custom_field": "baba",
"another_one".into() => json!("abab"), "another_one": "abab",
}; };
let custom_msgtype = let custom_msgtype =
MessageType::new("my_custom_msgtype", "my message body".into(), json_data).unwrap(); MessageType::new("my_custom_msgtype", "my message body".into(), json_data).unwrap();
@ -65,8 +62,8 @@ fn custom_msgtype_deserialization() {
}); });
let expected_json_data = json_object! { let expected_json_data = json_object! {
"custom_field".into() => json!("baba"), "custom_field": "baba",
"another_one".into() => json!("abab"), "another_one": "abab",
}; };
let custom_event: MessageType = from_json_value(json_data).unwrap(); let custom_event: MessageType = from_json_value(json_data).unwrap();