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

use tokio::test, cargo fmt/clippy

master
Devin R 2020-03-28 08:27:16 -04:00
parent b760b32bae
commit bd50e615a7
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base_client.rs
View File

@ -72,7 +72,7 @@ pub struct RoomMember {
/// A Matrix rooom. /// A Matrix rooom.
pub struct Room { pub struct Room {
/// The unique id of the room. /// The unique id of the room.
pub room_id: RoomId, pub room_id: String,
/// The name of the room, clients use this to represent a room. /// The name of the room, clients use this to represent a room.
pub room_name: RoomName, pub room_name: RoomName,
/// The mxid of our own user. /// The mxid of our own user.

38
tests/async_client_tests.rs
View File

@ -9,10 +9,8 @@ use std::convert::TryFrom;
use std::str::FromStr; use std::str::FromStr;
use std::time::Duration; use std::time::Duration;
#[test] #[tokio::test]
fn login() { async fn login() {
let mut rt = Runtime::new().unwrap();
let homeserver = Url::from_str(&mockito::server_url()).unwrap(); let homeserver = Url::from_str(&mockito::server_url()).unwrap();
let _m = mock("POST", "/_matrix/client/r0/login") let _m = mock("POST", "/_matrix/client/r0/login")
@ -22,17 +20,17 @@ fn login() {
let mut client = AsyncClient::new(homeserver, None).unwrap(); let mut client = AsyncClient::new(homeserver, None).unwrap();
rt.block_on(client.login("example", "wordpass", None, None)) client
.login("example", "wordpass", None, None)
.await
.unwrap(); .unwrap();
let logged_in = rt.block_on(client.logged_in()); let logged_in = client.logged_in().await;
assert!(logged_in, "Clint should be logged in"); assert!(logged_in, "Clint should be logged in");
} }
#[test] #[tokio::test]
fn sync() { async fn sync() {
let mut rt = Runtime::new().unwrap();
let homeserver = Url::from_str(&mockito::server_url()).unwrap(); let homeserver = Url::from_str(&mockito::server_url()).unwrap();
let session = Session { let session = Session {
@ -53,17 +51,15 @@ fn sync() {
let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
let response = rt.block_on(client.sync(sync_settings)).unwrap(); let response = client.sync(sync_settings).await.unwrap();
assert_ne!(response.next_batch, ""); assert_ne!(response.next_batch, "");
assert!(rt.block_on(client.sync_token()).is_some()); assert!(client.sync_token().await.is_some());
} }
#[test] #[tokio::test]
fn timeline() { async fn timeline() {
let mut rt = Runtime::new().unwrap();
let homeserver = Url::from_str(&mockito::server_url()).unwrap(); let homeserver = Url::from_str(&mockito::server_url()).unwrap();
let session = Session { let session = Session {
@ -82,15 +78,15 @@ fn timeline() {
let mut client = AsyncClient::new(homeserver, Some(session)).unwrap(); let mut client = AsyncClient::new(homeserver, Some(session)).unwrap();
let sync_settings = SyncSettings::new().timeout(3000).unwrap(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
let _response = rt.block_on(client.sync(sync_settings)).unwrap(); let _response = client.sync(sync_settings).await.unwrap();
assert_eq!(vec!["tutorial"], rt.block_on(client.get_room_names())); assert_eq!(vec!["tutorial"], client.get_room_names().await);
assert_eq!( assert_eq!(
Some("tutorial".into()), Some("tutorial".into()),
rt.block_on(client.get_room_name("!SVkFJHzfwvuaIEawgC:localhost")) client.get_room_name("!SVkFJHzfwvuaIEawgC:localhost").await
); );
// rt.block_on(async { println!("{:#?}", &client.base_client().read().await.joined_rooms ) }); println!("{:#?}", &client.base_client().read().await.joined_rooms);
} }