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

serde: Split test assertions

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

36
crates/ruma-common/src/serde/strings.rs
View File

@ -179,7 +179,6 @@ where
#[cfg(test)]
mod tests {
use assert_matches::assert_matches;
use js_int::{int, Int};
use serde::Deserialize;
@ -192,32 +191,25 @@ mod tests {
}
#[test]
fn int_or_string() -> serde_json::Result<()> {
assert_matches!(
serde_json::from_value::<Test>(serde_json::json!({ "num": "0" }))?,
Test { num } if num == int!(0)
);
Ok(())
fn int_or_string() {
let test = serde_json::from_value::<Test>(serde_json::json!({ "num": "0" })).unwrap();
assert_eq!(test.num, int!(0));
}
#[test]
fn weird_plus_string() -> serde_json::Result<()> {
assert_matches!(
serde_json::from_value::<Test>(serde_json::json!({ "num": " +0000000001000 " }))?,
Test { num } if num == int!(1000)
);
Ok(())
fn weird_plus_string() {
let test =
serde_json::from_value::<Test>(serde_json::json!({ "num": " +0000000001000 " }))
.unwrap();
assert_eq!(test.num, int!(1000));
}
#[test]
fn weird_minus_string() -> serde_json::Result<()> {
assert_matches!(
serde_json::from_value::<Test>(serde_json::json!({ "num": " \n\n-0000000000000001000 " }))?,
Test { num } if num == int!(-1000)
);
Ok(())
fn weird_minus_string() {
let test = serde_json::from_value::<Test>(
serde_json::json!({ "num": " \n\n-0000000000000001000 " }),
)
.unwrap();
assert_eq!(test.num, int!(-1000));
}
}

8
crates/ruma-common/src/serde/urlencoded/de/val_or_vec.rs
View File

@ -238,7 +238,8 @@ mod tests {
let mut x = ValOrVec::Val(Cow::Borrowed("a"));
x.push(Cow::Borrowed("b"));
x.push(Cow::Borrowed("c"));
assert_matches!(x, ValOrVec::Vec(v) if v == vec!["a", "b", "c"]);
let v = assert_matches!(x, ValOrVec::Vec(v) => v);
assert_eq!(v, vec!["a", "b", "c"]);
}
#[test]
@ -246,9 +247,10 @@ mod tests {
let mut x = ValOrVec::Val(Cow::from("a".to_owned()));
x.push(Cow::from("b".to_owned()));
x.push(Cow::from("c".to_owned()));
assert_matches!(
let v = assert_matches!(
x,
ValOrVec::Vec(v) if v == vec!["a".to_owned(), "b".to_owned(), "c".to_owned()]
ValOrVec::Vec(v) => v
);
assert_eq!(v, vec!["a".to_owned(), "b".to_owned(), "c".to_owned()]);
}
}