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

tests: Remove unnecessary borrows

Browse Source
This commit is contained in:
Kévin Commaille 2023-02-06 18:42:59 +01:00 committed by Kévin Commaille
parent ad86f4603a
commit e58b9fcd92
5 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/ruma-common/src/push/condition.rs
View File

@ -469,7 +469,7 @@ mod tests {
"pattern": "m.notice" "pattern": "m.notice"
}); });
assert_eq!( assert_eq!(
to_json_value(&PushCondition::EventMatch { to_json_value(PushCondition::EventMatch {
key: "content.msgtype".into(), key: "content.msgtype".into(),
pattern: "m.notice".into(), pattern: "m.notice".into(),
}) })
@ -481,7 +481,7 @@ mod tests {
#[test] #[test]
fn serialize_contains_display_name_condition() { fn serialize_contains_display_name_condition() {
assert_eq!( assert_eq!(
to_json_value(&PushCondition::ContainsDisplayName).unwrap(), to_json_value(PushCondition::ContainsDisplayName).unwrap(),
json!({ "kind": "contains_display_name" }) json!({ "kind": "contains_display_name" })
); );
} }
@ -493,10 +493,8 @@ mod tests {
"kind": "room_member_count" "kind": "room_member_count"
}); });
assert_eq!( assert_eq!(
to_json_value(&PushCondition::RoomMemberCount { to_json_value(PushCondition::RoomMemberCount { is: RoomMemberCountIs::from(uint!(2)) })
is: RoomMemberCountIs::from(uint!(2)) .unwrap(),
})
.unwrap(),
json_data json_data
); );
} }
@ -509,7 +507,7 @@ mod tests {
}); });
assert_eq!( assert_eq!(
json_data, json_data,
to_json_value(&PushCondition::SenderNotificationPermission { key: "room".into() }) to_json_value(PushCondition::SenderNotificationPermission { key: "room".into() })
.unwrap() .unwrap()
); );
} }

4
crates/ruma-common/src/serde/duration/opt_ms.rs
View File

@ -86,12 +86,12 @@ mod tests {
#[test] #[test]
fn serialize_some() { fn serialize_some() {
let request = DurationTest { timeout: Some(Duration::new(2, 0)) }; let request = DurationTest { timeout: Some(Duration::new(2, 0)) };
assert_eq!(serde_json::to_value(&request).unwrap(), json!({ "timeout": 2000 })); assert_eq!(serde_json::to_value(request).unwrap(), json!({ "timeout": 2000 }));
} }
#[test] #[test]
fn serialize_none() { fn serialize_none() {
let request = DurationTest { timeout: None }; let request = DurationTest { timeout: None };
assert_eq!(serde_json::to_value(&request).unwrap(), json!({})); assert_eq!(serde_json::to_value(request).unwrap(), json!({}));
} }
} }

2
crates/ruma-common/src/time.rs
View File

@ -137,6 +137,6 @@ mod tests {
secs: SecondsSinceUnixEpoch(uint!(0)), secs: SecondsSinceUnixEpoch(uint!(0)),
}; };
assert_eq!(serde_json::to_value(&request).unwrap(), json!({ "millis": 2000, "secs": 0 })); assert_eq!(serde_json::to_value(request).unwrap(), json!({ "millis": 2000, "secs": 0 }));
} }
} }

12
crates/ruma-common/tests/events/redacted.rs
View File

@ -60,10 +60,8 @@ fn deserialize_redacted_aliases() {
"type": "m.room.aliases", "type": "m.room.aliases",
}); });
let actual = to_json_value(&redacted).unwrap();
let redacted = assert_matches!( let redacted = assert_matches!(
from_json_value::<AnySyncTimelineEvent>(actual), from_json_value::<AnySyncTimelineEvent>(redacted),
Ok(AnySyncTimelineEvent::State(AnySyncStateEvent::RoomAliases( Ok(AnySyncTimelineEvent::State(AnySyncStateEvent::RoomAliases(
SyncStateEvent::Redacted(redacted), SyncStateEvent::Redacted(redacted),
))) => redacted ))) => redacted
@ -84,10 +82,8 @@ fn deserialize_redacted_any_room() {
"type": "m.room.message", "type": "m.room.message",
}); });
let actual = to_json_value(&redacted).unwrap();
let redacted = assert_matches!( let redacted = assert_matches!(
from_json_value::<AnyTimelineEvent>(actual), from_json_value::<AnyTimelineEvent>(redacted),
Ok(AnyTimelineEvent::MessageLike(AnyMessageLikeEvent::RoomMessage( Ok(AnyTimelineEvent::MessageLike(AnyMessageLikeEvent::RoomMessage(
MessageLikeEvent::Redacted(redacted), MessageLikeEvent::Redacted(redacted),
))) => redacted ))) => redacted
@ -107,10 +103,8 @@ fn deserialize_redacted_any_room_sync() {
"type": "m.room.message", "type": "m.room.message",
}); });
let actual = to_json_value(&redacted).unwrap();
let redacted = assert_matches!( let redacted = assert_matches!(
from_json_value::<AnySyncTimelineEvent>(actual), from_json_value::<AnySyncTimelineEvent>(redacted),
Ok(AnySyncTimelineEvent::MessageLike(AnySyncMessageLikeEvent::RoomMessage( Ok(AnySyncTimelineEvent::MessageLike(AnySyncMessageLikeEvent::RoomMessage(
SyncMessageLikeEvent::Redacted(redacted), SyncMessageLikeEvent::Redacted(redacted),
))) => redacted ))) => redacted

7
crates/ruma-federation-api/src/serde/v1_pdu.rs
View File

@ -71,7 +71,7 @@ where
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use assert_matches::assert_matches; use assert_matches::assert_matches;
use serde_json::{json, to_value as to_json_value}; use serde_json::json;
use super::{deserialize, serialize}; use super::{deserialize, serialize};
use crate::membership::create_join_event::v1::RoomState; use crate::membership::create_join_event::v1::RoomState;
@ -104,7 +104,7 @@ mod tests {
}; };
let serialized = serialize(&room_state, serde_json::value::Serializer).unwrap(); let serialized = serialize(&room_state, serde_json::value::Serializer).unwrap();
let expected = to_json_value(&json!( let expected = json!(
[ [
200, 200,
{ {
@ -113,8 +113,7 @@ mod tests {
"state": [] "state": []
} }
] ]
)) );
.unwrap();
assert_eq!(serialized, expected); assert_eq!(serialized, expected);
} }