From fbfb2b2ef93ecd00edd069c1e365e1e700c173de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Sat, 11 Jun 2022 19:00:32 +0200
Subject: [PATCH] client-api: Make some test assertions more helpful

---
 .../src/discovery/get_capabilities.rs             |  3 ++-
 .../src/media/get_media_preview.rs                | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/ruma-client-api/src/discovery/get_capabilities.rs b/crates/ruma-client-api/src/discovery/get_capabilities.rs
index 9248ae35..52b34986 100644
--- a/crates/ruma-client-api/src/discovery/get_capabilities.rs
+++ b/crates/ruma-client-api/src/discovery/get_capabilities.rs
@@ -295,6 +295,7 @@ impl Default for ThirdPartyIdChangesCapability {
 mod tests {
     use std::borrow::Cow;
 
+    use assert_matches::assert_matches;
     use serde_json::json;
 
     use super::Capabilities;
@@ -335,7 +336,7 @@ mod tests {
         assert_eq!(iter_res.name(), "m.some_random_capability");
         assert_eq!(iter_res.value(), Cow::Borrowed(&json!({ "key": "value" })));
 
-        assert!(caps_iter.next().is_none());
+        assert_matches!(caps_iter.next(), None);
         Ok(())
     }
 }
diff --git a/crates/ruma-client-api/src/media/get_media_preview.rs b/crates/ruma-client-api/src/media/get_media_preview.rs
index 0b065ca3..ebe8f292 100644
--- a/crates/ruma-client-api/src/media/get_media_preview.rs
+++ b/crates/ruma-client-api/src/media/get_media_preview.rs
@@ -72,6 +72,7 @@ pub mod v3 {
 
     #[cfg(test)]
     mod tests {
+        use assert_matches::assert_matches;
         use serde_json::{
             from_value as from_json_value, json,
             value::{to_raw_value as to_raw_json_value, RawValue as RawJsonValue},
@@ -83,18 +84,18 @@ pub mod v3 {
         fn raw_json_deserialize() {
             type OptRawJson = Option<Box<RawJsonValue>>;
 
-            assert!(from_json_value::<OptRawJson>(json!(null)).unwrap().is_none());
-            assert!(from_json_value::<OptRawJson>(json!("test")).unwrap().is_some());
-            assert!(from_json_value::<OptRawJson>(json!({ "a": "b" })).unwrap().is_some());
+            assert_matches!(from_json_value::<OptRawJson>(json!(null)).unwrap(), None);
+            from_json_value::<OptRawJson>(json!("test")).unwrap().unwrap();
+            from_json_value::<OptRawJson>(json!({ "a": "b" })).unwrap().unwrap();
         }
 
         // For completeness sake, make sure serialization works too
         #[test]
         fn raw_json_serialize() {
-            assert!(to_raw_json_value(&json!(null)).is_ok());
-            assert!(to_raw_json_value(&json!("string")).is_ok());
-            assert!(to_raw_json_value(&json!({})).is_ok());
-            assert!(to_raw_json_value(&json!({ "a": "b" })).is_ok());
+            to_raw_json_value(&json!(null)).unwrap();
+            to_raw_json_value(&json!("string")).unwrap();
+            to_raw_json_value(&json!({})).unwrap();
+            to_raw_json_value(&json!({ "a": "b" })).unwrap();
         }
     }
 }