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

Update room::name tests

Browse Source
This commit is contained in:
Jonas Platte 2020-05-02 14:08:16 +02:00
parent d61b6c705c
commit 18a37efcac
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/room/name.rs
View File

@ -158,6 +158,7 @@ mod tests {
}; };
use js_int::Int; use js_int::Int;
use matches::assert_matches;
use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_identifiers::{EventId, RoomId, UserId};
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};
@ -262,11 +263,8 @@ mod tests {
let long_string: String = String::from_iter(std::iter::repeat('X').take(256)); let long_string: String = String::from_iter(std::iter::repeat('X').take(256));
assert_eq!(long_string.len(), 256); assert_eq!(long_string.len(), 256);
let long_content_json_string: String = let long_content_json = json!({ "name": &long_string });
serde_json::json!({ "name": &long_string }).to_string(); let from_raw: EventJson<NameEventContent> = from_json_value(long_content_json).unwrap();
let from_raw: EventJson<NameEventContent> =
serde_json::from_str(&long_content_json_string).unwrap();
let result = from_raw.deserialize(); let result = from_raw.deserialize();
assert!(result.is_err(), "Result should be invalid: {:?}", result); assert!(result.is_err(), "Result should be invalid: {:?}", result);
@ -274,11 +272,9 @@ mod tests {
#[test] #[test]
fn json_with_empty_name_creates_content_as_none() { fn json_with_empty_name_creates_content_as_none() {
let long_content_json_string: String = serde_json::json!({ "name": "" }).to_string(); let long_content_json = json!({ "name": "" });
let from_raw: EventJson<NameEventContent> = from_json_value(long_content_json).unwrap();
let from_raw: EventJson<NameEventContent> = assert_matches!(
serde_json::from_str(&long_content_json_string).unwrap();
assert_eq!(
from_raw.deserialize().unwrap(), from_raw.deserialize().unwrap(),
NameEventContent { name: None } NameEventContent { name: None }
); );
@ -286,7 +282,7 @@ mod tests {
#[test] #[test]
fn new_with_empty_name_creates_content_as_none() { fn new_with_empty_name_creates_content_as_none() {
assert_eq!( assert_matches!(
NameEventContent::new(String::new()).unwrap(), NameEventContent::new(String::new()).unwrap(),
NameEventContent { name: None } NameEventContent { name: None }
); );