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

Move UnsignedData creation into function for redacted tests

Browse Source
This commit is contained in:
Devin R 2020-07-13 17:17:25 -04:00 committed by Jonas Platte
parent 24b0068213
commit 0bfb87fea0
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
ruma-events/tests/redacted.rs
View File

@ -23,6 +23,24 @@ fn is_zst<T>(_: &T) -> bool {
std::mem::size_of::<T>() == 0 std::mem::size_of::<T>() == 0
} }
fn full_unsigned() -> UnsignedData {
let mut unsigned = UnsignedData::default();
// The presence of `redacted_because` triggers the event enum to return early
// with `RedactedContent` instead of failing to deserialize according
// to the event type string.
unsigned.redacted_because = Some(EventJson::from(RedactionEvent {
content: RedactionEventContent { reason: Some("redacted because".into()) },
redacts: EventId::try_from("$h29iv0s8:example.com").unwrap(),
event_id: EventId::try_from("$h29iv0s8:example.com").unwrap(),
origin_server_ts: UNIX_EPOCH + Duration::from_millis(1),
room_id: RoomId::try_from("!roomid:room.com").unwrap(),
sender: UserId::try_from("@carl:example.com").unwrap(),
unsigned: UnsignedData::default(),
}));
unsigned
}
#[test] #[test]
fn redacted_message_event_serialize() { fn redacted_message_event_serialize() {
let redacted = RedactedSyncMessageEvent { let redacted = RedactedSyncMessageEvent {
@ -69,19 +87,7 @@ fn redacted_aliases_event_serialize() {
#[test] #[test]
fn redacted_deserialize_any_room() { fn redacted_deserialize_any_room() {
let mut unsigned = UnsignedData::default(); let unsigned = full_unsigned();
// The presence of `redacted_because` triggers the event enum (AnyRoomEvent in this case)
// to return early with `RedactedContent` instead of failing to deserialize according
// to the event type string.
unsigned.redacted_because = Some(EventJson::from(RedactionEvent {
content: RedactionEventContent { reason: Some("redacted because".into()) },
redacts: EventId::try_from("$h29iv0s8:example.com").unwrap(),
event_id: EventId::try_from("$h29iv0s8:example.com").unwrap(),
origin_server_ts: UNIX_EPOCH + Duration::from_millis(1),
room_id: RoomId::try_from("!roomid:room.com").unwrap(),
sender: UserId::try_from("@carl:example.com").unwrap(),
unsigned: UnsignedData::default(),
}));
let redacted = json!({ let redacted = json!({
"event_id": "$h29iv0s8:example.com", "event_id": "$h29iv0s8:example.com",
@ -147,16 +153,7 @@ fn redacted_deserialize_any_room_sync() {
#[test] #[test]
fn redacted_state_event_deserialize() { fn redacted_state_event_deserialize() {
let mut unsigned = UnsignedData::default(); let unsigned = full_unsigned();
unsigned.redacted_because = Some(EventJson::from(RedactionEvent {
content: RedactionEventContent { reason: Some("redacted because".into()) },
redacts: EventId::try_from("$h29iv0s8:example.com").unwrap(),
event_id: EventId::try_from("$h29iv0s8:example.com").unwrap(),
origin_server_ts: UNIX_EPOCH + Duration::from_millis(1),
room_id: RoomId::try_from("!roomid:room.com").unwrap(),
sender: UserId::try_from("@carl:example.com").unwrap(),
unsigned: UnsignedData::default(),
}));
let redacted = json!({ let redacted = json!({
"content": { "content": {
@ -189,16 +186,7 @@ fn redacted_state_event_deserialize() {
#[test] #[test]
fn redacted_custom_event_serialize() { fn redacted_custom_event_serialize() {
let mut unsigned = UnsignedData::default(); let unsigned = full_unsigned();
unsigned.redacted_because = Some(EventJson::from(RedactionEvent {
content: RedactionEventContent { reason: Some("redacted because".into()) },
redacts: EventId::try_from("$h29iv0s8:example.com").unwrap(),
event_id: EventId::try_from("$h29iv0s8:example.com").unwrap(),
origin_server_ts: UNIX_EPOCH + Duration::from_millis(1),
room_id: RoomId::try_from("!roomid:room.com").unwrap(),
sender: UserId::try_from("@carl:example.com").unwrap(),
unsigned: UnsignedData::default(),
}));
let redacted = json!({ let redacted = json!({
"event_id": "$h29iv0s8:example.com", "event_id": "$h29iv0s8:example.com",
@ -234,16 +222,7 @@ fn redacted_custom_event_serialize() {
#[test] #[test]
fn redacted_custom_event_deserialize() { fn redacted_custom_event_deserialize() {
let mut unsigned = UnsignedData::default(); let unsigned = full_unsigned();
unsigned.redacted_because = Some(EventJson::from(RedactionEvent {
content: RedactionEventContent { reason: Some("redacted because".into()) },
redacts: EventId::try_from("$h29iv0s8:example.com").unwrap(),
event_id: EventId::try_from("$h29iv0s8:example.com").unwrap(),
origin_server_ts: UNIX_EPOCH + Duration::from_millis(1),
room_id: RoomId::try_from("!roomid:room.com").unwrap(),
sender: UserId::try_from("@carl:example.com").unwrap(),
unsigned: UnsignedData::default(),
}));
let redacted = RedactedSyncStateEvent { let redacted = RedactedSyncStateEvent {
content: RedactedCustomEventContent { event_type: "m.made.up".into() }, content: RedactedCustomEventContent { event_type: "m.made.up".into() },