char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify tests in matrix_sdk::client

master
Jonas Platte 2020-08-15 02:49:34 +02:00
parent 09f009ebd7
commit ad2d3d2037
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 17 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
matrix_sdk/src/client.rs
View File

@ -1559,12 +1559,10 @@ impl Client {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::{ use super::{
ban_user, create_receipt, create_typing_event, forget_room, get_public_rooms, create_typing_event, get_public_rooms,
get_public_rooms_filtered::{self, Filter}, get_public_rooms_filtered::{self, Filter},
invite_user, kick_user, leave_room,
register::RegistrationKind, register::RegistrationKind,
set_read_marker, Client, ClientConfig, Invite3pid, MessageEventContent, Session, Client, ClientConfig, Invite3pid, MessageEventContent, Session, SyncSettings, Url,
SyncSettings, Url,
}; };
use crate::{RegistrationBuilder, RoomListFilterBuilder}; use crate::{RegistrationBuilder, RoomListFilterBuilder};
@ -1852,7 +1850,6 @@ mod test {
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn invite_user_by_id() { async fn invite_user_by_id() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -1868,11 +1865,10 @@ mod test {
let user = user_id!("@example:localhost"); let user = user_id!("@example:localhost");
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
if let invite_user::Response = client.invite_user_by_id(&room_id, &user).await.unwrap() {} client.invite_user_by_id(&room_id, &user).await.unwrap();
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn invite_user_by_3pid() { async fn invite_user_by_3pid() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -1888,7 +1884,7 @@ mod test {
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
if let invite_user::Response = client client
.invite_user_by_3pid( .invite_user_by_3pid(
&room_id, &room_id,
&Invite3pid { &Invite3pid {
@ -1899,12 +1895,10 @@ mod test {
}, },
) )
.await .await
.unwrap() .unwrap();
{}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn room_search_all() { async fn room_search_all() {
let homeserver = Url::from_str(&mockito::server_url()).unwrap(); let homeserver = Url::from_str(&mockito::server_url()).unwrap();
let client = Client::new(homeserver).unwrap(); let client = Client::new(homeserver).unwrap();
@ -1917,15 +1911,12 @@ mod test {
.with_body(test_json::PUBLIC_ROOMS.to_string()) .with_body(test_json::PUBLIC_ROOMS.to_string())
.create(); .create();
if let get_public_rooms::Response { chunk, .. } = let get_public_rooms::Response { chunk, .. } =
client.public_rooms(Some(10), None, None).await.unwrap() client.public_rooms(Some(10), None, None).await.unwrap();
{ assert_eq!(chunk.len(), 1);
assert_eq!(chunk.len(), 1)
}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn room_search_filtered() { async fn room_search_filtered() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -1944,15 +1935,12 @@ mod test {
generic_search_term, generic_search_term,
}); });
if let get_public_rooms_filtered::Response { chunk, .. } = let get_public_rooms_filtered::Response { chunk, .. } =
client.public_rooms_filtered(request).await.unwrap() client.public_rooms_filtered(request).await.unwrap();
{ assert_eq!(chunk.len(), 1);
assert_eq!(chunk.len(), 1)
}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn leave_room() { async fn leave_room() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -1968,18 +1956,10 @@ mod test {
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
let response = client.leave_room(&room_id).await.unwrap(); client.leave_room(&room_id).await.unwrap();
if let leave_room::Response = response {
} else {
panic!(
"expected `ruma_client_api::leave_room::Response` found {:?}",
response
)
}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn ban_user() { async fn ban_user() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -1995,19 +1975,10 @@ mod test {
let user = user_id!("@example:localhost"); let user = user_id!("@example:localhost");
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
let response = client.ban_user(&room_id, &user, None).await.unwrap(); client.ban_user(&room_id, &user, None).await.unwrap();
if let ban_user::Response = response {
} else {
panic!(
"expected `ruma_client_api::ban_user::Response` found {:?}",
response
)
}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn kick_user() { async fn kick_user() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -2024,19 +1995,10 @@ mod test {
let user = user_id!("@example:localhost"); let user = user_id!("@example:localhost");
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
let response = client.kick_user(&room_id, &user, None).await.unwrap(); client.kick_user(&room_id, &user, None).await.unwrap();
if let kick_user::Response = response {
} else {
panic!(
"expected `ruma_client_api::kick_user::Response` found {:?}",
response
)
}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn forget_room() { async fn forget_room() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -2052,18 +2014,10 @@ mod test {
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
let response = client.forget_room_by_id(&room_id).await.unwrap(); client.forget_room_by_id(&room_id).await.unwrap();
if let forget_room::Response = response {
} else {
panic!(
"expected `ruma_client_api::forget_room::Response` found {:?}",
response
)
}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn read_receipt() { async fn read_receipt() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -2080,18 +2034,10 @@ mod test {
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
let event_id = event_id!("$xxxxxx:example.org"); let event_id = event_id!("$xxxxxx:example.org");
let response = client.read_receipt(&room_id, &event_id).await.unwrap(); client.read_receipt(&room_id, &event_id).await.unwrap();
if let create_receipt::Response = response {
} else {
panic!(
"expected `ruma_client_api::create_receipt::Response` found {:?}",
response
)
}
} }
#[tokio::test] #[tokio::test]
#[allow(irrefutable_let_patterns)]
async fn read_marker() { async fn read_marker() {
let client = logged_in_client().await; let client = logged_in_client().await;
@ -2108,14 +2054,7 @@ mod test {
let room_id = room_id!("!testroom:example.org"); let room_id = room_id!("!testroom:example.org");
let event_id = event_id!("$xxxxxx:example.org"); let event_id = event_id!("$xxxxxx:example.org");
let response = client.read_marker(&room_id, &event_id, None).await.unwrap(); client.read_marker(&room_id, &event_id, None).await.unwrap();
if let set_read_marker::Response = response {
} else {
panic!(
"expected `ruma_client_api::set_read_marker::Response` found {:?}",
response
)
}
} }
#[tokio::test] #[tokio::test]