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

common: Split test assertions

Browse Source
This commit is contained in:
Kévin Commaille 2022-06-04 19:25:11 +02:00 committed by Kévin Commaille
parent 35d6b90aeb
commit 63ec3a43aa
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,6 @@ fn f64_to_uint(val: f64) -> UInt {
mod tests { mod tests {
use std::time::{Duration, UNIX_EPOCH}; use std::time::{Duration, UNIX_EPOCH};
use assert_matches::assert_matches;
use js_int::uint; use js_int::uint;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::json; use serde_json::json;
@ -106,12 +105,9 @@ mod tests {
fn deserialize() { fn deserialize() {
let json = json!({ "millis": 3000, "secs": 60 }); let json = json!({ "millis": 3000, "secs": 60 });
assert_matches!( let time = serde_json::from_value::<SystemTimeTest>(json).unwrap();
serde_json::from_value::<SystemTimeTest>(json), assert_eq!(time.millis.to_system_time(), Some(UNIX_EPOCH + Duration::from_millis(3000)));
Ok(SystemTimeTest { millis, secs }) assert_eq!(time.secs.to_system_time(), Some(UNIX_EPOCH + Duration::from_secs(60)));
if millis.to_system_time() == Some(UNIX_EPOCH + Duration::from_millis(3000))
&& secs.to_system_time() == Some(UNIX_EPOCH + Duration::from_secs(60))
);
} }
#[test] #[test]
@ -121,9 +117,7 @@ mod tests {
.unwrap(), .unwrap(),
secs: SecondsSinceUnixEpoch(uint!(0)), secs: SecondsSinceUnixEpoch(uint!(0)),
}; };
assert_matches!(
serde_json::to_value(&request), assert_eq!(serde_json::to_value(&request).unwrap(), json!({ "millis": 2000, "secs": 0 }));
Ok(value) if value == json!({ "millis": 2000, "secs": 0 })
);
} }
} }