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

identifiers: Make more test assertions more helpful

Browse Source
This commit is contained in:
Kévin Commaille 2022-06-11 22:36:41 +02:00 committed by Kévin Commaille
parent 0384035c48
commit 4799da6e4d
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ruma-common/src/identifiers/client_secret.rs
View File

@ -34,6 +34,6 @@ mod tests {
#[test] #[test]
fn valid_secret() { fn valid_secret() {
assert!(<&ClientSecret>::try_from("this_=_a_valid_secret_1337").is_ok()); <&ClientSecret>::try_from("this_=_a_valid_secret_1337").unwrap();
} }
} }

2
crates/ruma-common/src/identifiers/device_key_id.rs
View File

@ -85,7 +85,7 @@ mod tests {
#[test] #[test]
fn empty_device_id_ok() { fn empty_device_id_ok() {
assert!(<&DeviceKeyId>::try_from("ed25519:").is_ok()); <&DeviceKeyId>::try_from("ed25519:").unwrap();
} }
#[test] #[test]

24
crates/ruma-common/src/identifiers/server_name.rs
View File

@ -57,58 +57,58 @@ mod tests {
#[test] #[test]
fn ipv4_host() { fn ipv4_host() {
assert!(<&ServerName>::try_from("127.0.0.1").is_ok()); <&ServerName>::try_from("127.0.0.1").unwrap();
} }
#[test] #[test]
fn ipv4_host_and_port() { 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] #[test]
fn ipv6() { fn ipv6() {
assert!(<&ServerName>::try_from("[::1]").is_ok()); <&ServerName>::try_from("[::1]").unwrap();
} }
#[test] #[test]
fn ipv6_with_port() { fn ipv6_with_port() {
assert!(<&ServerName>::try_from("[1234:5678::abcd]:5678").is_ok()); <&ServerName>::try_from("[1234:5678::abcd]:5678").unwrap();
} }
#[test] #[test]
fn dns_name() { fn dns_name() {
assert!(<&ServerName>::try_from("example.com").is_ok()); <&ServerName>::try_from("example.com").unwrap();
} }
#[test] #[test]
fn dns_name_with_port() { fn dns_name_with_port() {
assert!(<&ServerName>::try_from("ruma.io:8080").is_ok()); <&ServerName>::try_from("ruma.io:8080").unwrap();
} }
#[test] #[test]
fn empty_string() { fn empty_string() {
assert!(<&ServerName>::try_from("").is_err()); <&ServerName>::try_from("").unwrap_err();
} }
#[test] #[test]
fn invalid_ipv6() { fn invalid_ipv6() {
assert!(<&ServerName>::try_from("[test::1]").is_err()); <&ServerName>::try_from("[test::1]").unwrap_err();
} }
#[test] #[test]
fn ipv4_with_invalid_port() { 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] #[test]
fn ipv6_with_invalid_port() { fn ipv6_with_invalid_port() {
assert!(<&ServerName>::try_from("[fe80::1]:100000").is_err()); <&ServerName>::try_from("[fe80::1]:100000").unwrap_err();
assert!(<&ServerName>::try_from("[fe80::1]!").is_err()); <&ServerName>::try_from("[fe80::1]!").unwrap_err();
} }
#[test] #[test]
fn dns_name_with_invalid_port() { fn dns_name_with_invalid_port() {
assert!(<&ServerName>::try_from("matrix.org:hello").is_err()); <&ServerName>::try_from("matrix.org:hello").unwrap_err();
} }
#[test] #[test]

18
crates/ruma-common/src/identifiers/user_id.rs
View File

@ -195,15 +195,15 @@ mod tests {
let user_id = "@τ:example.com"; let user_id = "@τ:example.com";
let server_name = server_name!("example.com"); let server_name = server_name!("example.com");
assert!(<&UserId>::try_from(user_id).is_err()); <&UserId>::try_from(user_id).unwrap_err();
assert!(UserId::parse_with_server_name(user_id, server_name).is_err()); UserId::parse_with_server_name(user_id, server_name).unwrap_err();
assert!(UserId::parse_with_server_name(localpart, server_name).is_err()); UserId::parse_with_server_name(localpart, server_name).unwrap_err();
assert!(UserId::parse_with_server_name_rc(user_id, server_name).is_err()); UserId::parse_with_server_name_rc(user_id, server_name).unwrap_err();
assert!(UserId::parse_with_server_name_rc(localpart, server_name).is_err()); UserId::parse_with_server_name_rc(localpart, server_name).unwrap_err();
assert!(UserId::parse_with_server_name_arc(user_id, server_name).is_err()); UserId::parse_with_server_name_arc(user_id, server_name).unwrap_err();
assert!(UserId::parse_with_server_name_arc(localpart, server_name).is_err()); UserId::parse_with_server_name_arc(localpart, server_name).unwrap_err();
assert!(UserId::parse_rc(user_id).is_err()); UserId::parse_rc(user_id).unwrap_err();
assert!(UserId::parse_arc(user_id).is_err()); UserId::parse_arc(user_id).unwrap_err();
} }
#[test] #[test]

2
crates/ruma-common/src/identifiers/voip_id.rs
View File

@ -33,6 +33,6 @@ mod tests {
#[test] #[test]
fn try_from() { fn try_from() {
assert!(<&VoipId>::try_from("this_-_a_valid_secret_1337").is_ok()); <&VoipId>::try_from("this_-_a_valid_secret_1337").unwrap();
} }
} }