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

federation-api: Split some test assertions

Browse Source
This commit is contained in:
Kévin Commaille 2022-06-04 23:08:33 +02:00 committed by Kévin Commaille
parent c1d10b1061
commit f1079c94ee
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
crates/ruma-federation-api/src/transactions/edu.rs
View File

@ -364,10 +364,10 @@ mod test {
prev_id, prev_id,
deleted, deleted,
keys, keys,
} = match &edu { } = assert_matches!(
Edu::DeviceListUpdate(u) => u, &edu,
_ => panic!("Unexpected Edu variant: {:#?}", edu), Edu::DeviceListUpdate(u) => u
}; );
assert_eq!(user_id, "@john:example.com"); assert_eq!(user_id, "@john:example.com");
assert_eq!(device_id, "QBUAZIFURK"); assert_eq!(device_id, "QBUAZIFURK");
@ -400,10 +400,10 @@ mod test {
prev_id, prev_id,
deleted, deleted,
keys, keys,
} = match &edu { } = assert_matches!(
Edu::DeviceListUpdate(u) => u, &edu,
_ => panic!("Unexpected Edu variant: {:#?}", edu), Edu::DeviceListUpdate(u) => u
}; );
assert_eq!(user_id, "@john:example.com"); assert_eq!(user_id, "@john:example.com");
assert_eq!(device_id, "QBUAZIFURK"); assert_eq!(device_id, "QBUAZIFURK");
@ -437,11 +437,11 @@ mod test {
}); });
let edu = serde_json::from_value::<Edu>(json.clone()).unwrap(); let edu = serde_json::from_value::<Edu>(json.clone()).unwrap();
assert_matches!( let receipts = assert_matches!(
&edu, &edu,
Edu::Receipt(ReceiptContent { receipts }) Edu::Receipt(ReceiptContent { receipts }) => receipts
if receipts.get(room_id!("!some_room:example.org")).is_some()
); );
assert!(receipts.get(room_id!("!some_room:example.org")).is_some());
assert_eq!(serde_json::to_value(&edu).unwrap(), json); assert_eq!(serde_json::to_value(&edu).unwrap(), json);
} }
@ -458,14 +458,13 @@ mod test {
}); });
let edu = serde_json::from_value::<Edu>(json.clone()).unwrap(); let edu = serde_json::from_value::<Edu>(json.clone()).unwrap();
assert_matches!( let content = assert_matches!(
&edu, &edu,
Edu::Typing(TypingContent { Edu::Typing(content) => content
room_id, user_id, typing
}) if room_id == "!somewhere:matrix.org"
&& user_id == "@john:matrix.org"
&& *typing
); );
assert_eq!(content.room_id, "!somewhere:matrix.org");
assert_eq!(content.user_id, "@john:matrix.org");
assert!(content.typing);
assert_eq!(serde_json::to_value(&edu).unwrap(), json); assert_eq!(serde_json::to_value(&edu).unwrap(), json);
} }
@ -492,15 +491,14 @@ mod test {
}); });
let edu = serde_json::from_value::<Edu>(json.clone()).unwrap(); let edu = serde_json::from_value::<Edu>(json.clone()).unwrap();
assert_matches!( let content = assert_matches!(
&edu, &edu,
Edu::DirectToDevice(DirectDeviceContent { Edu::DirectToDevice(content) => content
sender, ev_type, message_id, messages
}) if sender == "@john:example.com"
&& *ev_type == ToDeviceEventType::RoomKeyRequest
&& message_id == "hiezohf6Hoo7kaev"
&& messages.get(user_id!("@alice:example.org")).is_some()
); );
assert_eq!(content.sender, "@john:example.com");
assert_eq!(content.ev_type, ToDeviceEventType::RoomKeyRequest);
assert_eq!(content.message_id, "hiezohf6Hoo7kaev");
assert!(content.messages.get(user_id!("@alice:example.org")).is_some());
assert_eq!(serde_json::to_value(&edu).unwrap(), json); assert_eq!(serde_json::to_value(&edu).unwrap(), json);
} }
@ -546,14 +544,13 @@ mod test {
}); });
let edu = serde_json::from_value::<Edu>(json.clone()).unwrap(); let edu = serde_json::from_value::<Edu>(json.clone()).unwrap();
assert_matches!( let content = assert_matches!(
&edu, &edu,
Edu::SigningKeyUpdate(SigningKeyUpdateContent { Edu::SigningKeyUpdate(content) => content
user_id,
master_key: Some(_),
self_signing_key: Some(_),
}) if user_id == "@alice:example.com"
); );
assert_eq!(content.user_id, "@alice:example.com");
assert!(content.master_key.is_some());
assert!(content.self_signing_key.is_some());
assert_eq!(serde_json::to_value(&edu).unwrap(), json); assert_eq!(serde_json::to_value(&edu).unwrap(), json);
} }