From 4799da6e4d55b28f5f90473667a07d51967a0aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 11 Jun 2022 22:36:41 +0200 Subject: [PATCH] identifiers: Make more test assertions more helpful --- .../src/identifiers/client_secret.rs | 2 +- .../src/identifiers/device_key_id.rs | 2 +- .../src/identifiers/server_name.rs | 24 +++++++++---------- crates/ruma-common/src/identifiers/user_id.rs | 18 +++++++------- crates/ruma-common/src/identifiers/voip_id.rs | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/crates/ruma-common/src/identifiers/client_secret.rs b/crates/ruma-common/src/identifiers/client_secret.rs index c878f33a..1a9807be 100644 --- a/crates/ruma-common/src/identifiers/client_secret.rs +++ b/crates/ruma-common/src/identifiers/client_secret.rs @@ -34,6 +34,6 @@ mod tests { #[test] fn valid_secret() { - assert!(<&ClientSecret>::try_from("this_=_a_valid_secret_1337").is_ok()); + <&ClientSecret>::try_from("this_=_a_valid_secret_1337").unwrap(); } } diff --git a/crates/ruma-common/src/identifiers/device_key_id.rs b/crates/ruma-common/src/identifiers/device_key_id.rs index c73add43..8e198b17 100644 --- a/crates/ruma-common/src/identifiers/device_key_id.rs +++ b/crates/ruma-common/src/identifiers/device_key_id.rs @@ -85,7 +85,7 @@ mod tests { #[test] fn empty_device_id_ok() { - assert!(<&DeviceKeyId>::try_from("ed25519:").is_ok()); + <&DeviceKeyId>::try_from("ed25519:").unwrap(); } #[test] diff --git a/crates/ruma-common/src/identifiers/server_name.rs b/crates/ruma-common/src/identifiers/server_name.rs index 8ab8cda2..594a8407 100644 --- a/crates/ruma-common/src/identifiers/server_name.rs +++ b/crates/ruma-common/src/identifiers/server_name.rs @@ -57,58 +57,58 @@ mod tests { #[test] fn ipv4_host() { - assert!(<&ServerName>::try_from("127.0.0.1").is_ok()); + <&ServerName>::try_from("127.0.0.1").unwrap(); } #[test] fn ipv4_host_and_port() { - assert!(<&ServerName>::try_from("1.1.1.1:12000").is_ok()); + <&ServerName>::try_from("1.1.1.1:12000").unwrap(); } #[test] fn ipv6() { - assert!(<&ServerName>::try_from("[::1]").is_ok()); + <&ServerName>::try_from("[::1]").unwrap(); } #[test] fn ipv6_with_port() { - assert!(<&ServerName>::try_from("[1234:5678::abcd]:5678").is_ok()); + <&ServerName>::try_from("[1234:5678::abcd]:5678").unwrap(); } #[test] fn dns_name() { - assert!(<&ServerName>::try_from("example.com").is_ok()); + <&ServerName>::try_from("example.com").unwrap(); } #[test] fn dns_name_with_port() { - assert!(<&ServerName>::try_from("ruma.io:8080").is_ok()); + <&ServerName>::try_from("ruma.io:8080").unwrap(); } #[test] fn empty_string() { - assert!(<&ServerName>::try_from("").is_err()); + <&ServerName>::try_from("").unwrap_err(); } #[test] fn invalid_ipv6() { - assert!(<&ServerName>::try_from("[test::1]").is_err()); + <&ServerName>::try_from("[test::1]").unwrap_err(); } #[test] fn ipv4_with_invalid_port() { - assert!(<&ServerName>::try_from("127.0.0.1:").is_err()); + <&ServerName>::try_from("127.0.0.1:").unwrap_err(); } #[test] fn ipv6_with_invalid_port() { - assert!(<&ServerName>::try_from("[fe80::1]:100000").is_err()); - assert!(<&ServerName>::try_from("[fe80::1]!").is_err()); + <&ServerName>::try_from("[fe80::1]:100000").unwrap_err(); + <&ServerName>::try_from("[fe80::1]!").unwrap_err(); } #[test] fn dns_name_with_invalid_port() { - assert!(<&ServerName>::try_from("matrix.org:hello").is_err()); + <&ServerName>::try_from("matrix.org:hello").unwrap_err(); } #[test] diff --git a/crates/ruma-common/src/identifiers/user_id.rs b/crates/ruma-common/src/identifiers/user_id.rs index 8d90bd46..e68d2bbd 100644 --- a/crates/ruma-common/src/identifiers/user_id.rs +++ b/crates/ruma-common/src/identifiers/user_id.rs @@ -195,15 +195,15 @@ mod tests { let user_id = "@τ:example.com"; let server_name = server_name!("example.com"); - assert!(<&UserId>::try_from(user_id).is_err()); - assert!(UserId::parse_with_server_name(user_id, server_name).is_err()); - assert!(UserId::parse_with_server_name(localpart, server_name).is_err()); - assert!(UserId::parse_with_server_name_rc(user_id, server_name).is_err()); - assert!(UserId::parse_with_server_name_rc(localpart, server_name).is_err()); - assert!(UserId::parse_with_server_name_arc(user_id, server_name).is_err()); - assert!(UserId::parse_with_server_name_arc(localpart, server_name).is_err()); - assert!(UserId::parse_rc(user_id).is_err()); - assert!(UserId::parse_arc(user_id).is_err()); + <&UserId>::try_from(user_id).unwrap_err(); + UserId::parse_with_server_name(user_id, server_name).unwrap_err(); + UserId::parse_with_server_name(localpart, server_name).unwrap_err(); + UserId::parse_with_server_name_rc(user_id, server_name).unwrap_err(); + UserId::parse_with_server_name_rc(localpart, server_name).unwrap_err(); + UserId::parse_with_server_name_arc(user_id, server_name).unwrap_err(); + UserId::parse_with_server_name_arc(localpart, server_name).unwrap_err(); + UserId::parse_rc(user_id).unwrap_err(); + UserId::parse_arc(user_id).unwrap_err(); } #[test] diff --git a/crates/ruma-common/src/identifiers/voip_id.rs b/crates/ruma-common/src/identifiers/voip_id.rs index 36c42ea8..7ef8b914 100644 --- a/crates/ruma-common/src/identifiers/voip_id.rs +++ b/crates/ruma-common/src/identifiers/voip_id.rs @@ -33,6 +33,6 @@ mod tests { #[test] fn try_from() { - assert!(<&VoipId>::try_from("this_-_a_valid_secret_1337").is_ok()); + <&VoipId>::try_from("this_-_a_valid_secret_1337").unwrap(); } }