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

refactor(tests): make use of MatrixMockServer in other room_list_service tests

Browse Source
This commit is contained in:
Benjamin Bouvier
2026-04-09 15:08:00 +02:00
parent 31e4657718
commit 2da262e56c
19 changed files with 144 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/matrix-sdk-ui/src/room_list_service/filters/all.rs
+5 -3
View File
@@ -24,7 +24,7 @@ pub fn new_filter(filters: Vec<BoxedFilterFn>) -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -32,7 +32,8 @@ mod tests {
#[async_test]
async fn test_one_filter() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
{
@@ -52,7 +53,8 @@ mod tests {
#[async_test]
async fn test_two_filters() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
{
crates/matrix-sdk-ui/src/room_list_service/filters/any.rs
+13 -7
View File
@@ -24,7 +24,7 @@ pub fn new_filter(filters: Vec<BoxedFilterFn>) -> impl Filter + use<> {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -32,7 +32,8 @@ mod tests {
#[async_test]
async fn test_one_filter_is_true() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter = |_: &_| true;
@@ -43,7 +44,8 @@ mod tests {
#[async_test]
async fn test_one_filter_is_false() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter = |_: &_| false;
@@ -54,7 +56,8 @@ mod tests {
#[async_test]
async fn test_two_filters_with_true_true() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter1 = |_: &_| true;
@@ -66,7 +69,8 @@ mod tests {
#[async_test]
async fn test_two_filters_with_true_false() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter1 = |_: &_| true;
@@ -78,7 +82,8 @@ mod tests {
#[async_test]
async fn test_two_filters_with_false_true() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter1 = |_: &_| false;
@@ -90,7 +95,8 @@ mod tests {
#[async_test]
async fn test_two_filters_with_false_false() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter1 = |_: &_| false;
crates/matrix-sdk-ui/src/room_list_service/filters/category.rs
+7 -4
View File
@@ -68,7 +68,7 @@ pub fn new_filter(expected_category: RoomCategory) -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -76,7 +76,8 @@ mod tests {
#[async_test]
async fn test_kind_is_group() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let number_of_direct_targets = |_room: &RoomListItem| Some(42);
@@ -98,7 +99,8 @@ mod tests {
#[async_test]
async fn test_kind_is_people() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let number_of_direct_targets = |_room: &RoomListItem| Some(1);
@@ -120,7 +122,8 @@ mod tests {
#[async_test]
async fn test_room_kind_cannot_be_found() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let number_of_direct_targets = |_room: &RoomListItem| None;
crates/matrix-sdk-ui/src/room_list_service/filters/deduplicate_versions.rs
+29 -15
View File
@@ -82,7 +82,7 @@ pub fn new_filter() -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_base::RoomState;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -91,7 +91,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_joined_and_room_b_is_none() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_room: &RoomListItem| (RoomState::Joined, None), &room));
@@ -99,7 +100,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_joined_and_room_b_is_joined() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Joined, Some(SuccessorRoomState::Joined)), &room).not());
@@ -107,7 +109,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_joined_and_room_b_is_left() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Joined, Some(SuccessorRoomState::Left)), &room).not());
@@ -115,7 +118,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_joined_and_room_b_is_banned() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Joined, Some(SuccessorRoomState::Banned)), &room).not());
@@ -123,7 +127,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_joined_and_room_b_is_invited() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Joined, Some(SuccessorRoomState::Invited)), &room));
@@ -131,7 +136,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_joined_and_room_b_is_knocked() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Joined, Some(SuccessorRoomState::Knocked)), &room));
@@ -139,7 +145,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_left_and_room_b_is_joined() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Left, Some(RoomState::Joined)), &room).not());
@@ -147,7 +154,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_invited_and_room_b_is_joined() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Invited, Some(RoomState::Joined)), &room).not());
@@ -155,7 +163,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_banned_and_room_b_is_joined() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Banned, Some(RoomState::Joined)), &room).not());
@@ -163,7 +172,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_knocked_and_room_b_is_joined() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| (RoomState::Knocked, Some(RoomState::Joined)), &room).not());
@@ -171,7 +181,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_left_and_room_b_is_none() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let state = |_: &RoomListItem| (RoomState::Left, None);
@@ -180,7 +191,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_invited_and_room_b_is_none() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let state = |_: &RoomListItem| (RoomState::Invited, None);
@@ -189,7 +201,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_banned_and_room_b_is_none() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let state = |_: &RoomListItem| (RoomState::Banned, None);
@@ -198,7 +211,8 @@ mod tests {
#[async_test]
async fn test_room_a_is_knocked_and_room_b_is_none() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let state = |_: &RoomListItem| (RoomState::Knocked, None);
crates/matrix-sdk-ui/src/room_list_service/filters/favourite.rs
+5 -3
View File
@@ -31,7 +31,7 @@ pub fn new_filter() -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -39,7 +39,8 @@ mod tests {
#[async_test]
async fn test_is_favourite() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_: &RoomListItem| true, &room));
@@ -47,7 +48,8 @@ mod tests {
#[async_test]
async fn test_is_not_favourite() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_: &RoomListItem| false, &room).not());
crates/matrix-sdk-ui/src/room_list_service/filters/identifiers.rs
+3 -2
View File
@@ -24,7 +24,7 @@ pub fn new_filter(identifiers: Vec<OwnedRoomId>) -> impl Filter {
#[cfg(test)]
mod tests {
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::{owned_room_id, room_id};
@@ -32,7 +32,8 @@ mod tests {
#[async_test]
async fn test_space() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let rooms = new_rooms(
[room_id!("!alpha:b.c"), room_id!("!beta:b.c"), room_id!("!gamma:b.c")],
&client,
crates/matrix-sdk-ui/src/room_list_service/filters/invite.rs
+3 -2
View File
@@ -33,7 +33,7 @@ pub fn new_filter() -> impl Filter {
#[cfg(test)]
mod tests {
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_base::RoomState;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -42,7 +42,8 @@ mod tests {
#[async_test]
async fn test_all_invite_kind() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
// When a room has been left, it doesn't match.
crates/matrix-sdk-ui/src/room_list_service/filters/joined.rs
+3 -2
View File
@@ -33,7 +33,7 @@ pub fn new_filter() -> impl Filter {
#[cfg(test)]
mod tests {
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_base::RoomState;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -42,7 +42,8 @@ mod tests {
#[async_test]
async fn test_all_joined_kind() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
// When a room has been left, it doesn't match.
crates/matrix-sdk-ui/src/room_list_service/filters/low_priority.rs
+5 -3
View File
@@ -33,7 +33,7 @@ pub fn new_filter() -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -41,7 +41,8 @@ mod tests {
#[async_test]
async fn test_is_low_priority() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| true, &room));
@@ -49,7 +50,8 @@ mod tests {
#[async_test]
async fn test_is_not_low_priority() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(matches(|_| false, &room).not());
crates/matrix-sdk-ui/src/room_list_service/filters/mod.rs
+10 -23
View File
@@ -79,9 +79,9 @@ pub use invite::new_filter as new_filter_invite;
pub use joined::new_filter as new_filter_joined;
pub use low_priority::new_filter as new_filter_low_priority;
#[cfg(test)]
use matrix_sdk::Client;
use matrix_sdk::{Client, test_utils::mocks::MatrixMockServer};
#[cfg(test)]
use matrix_sdk_test::{JoinedRoomBuilder, SyncResponseBuilder};
use matrix_sdk_test::JoinedRoomBuilder;
pub use non_left::new_filter as new_filter_non_left;
pub use none::new_filter as new_filter_none;
pub use normalized_match_room_name::new_filter as new_filter_normalized_match_room_name;
@@ -91,11 +91,6 @@ use ruma::RoomId;
pub use space::new_filter as new_filter_space;
use unicode_normalization::{UnicodeNormalization, char::is_combining_mark};
pub use unread::new_filter as new_filter_unread;
#[cfg(test)]
use wiremock::{
Mock, MockServer, ResponseTemplate,
matchers::{header, method, path},
};
use super::RoomListItem;
@@ -123,25 +118,17 @@ fn normalize_string(str: &str) -> String {
pub(super) async fn new_rooms<const N: usize>(
room_ids: [&RoomId; N],
client: &Client,
server: &MockServer,
server: &MatrixMockServer,
) -> [RoomListItem; N] {
let mut response_builder = SyncResponseBuilder::default();
for room_id in room_ids {
response_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
}
let json_response = response_builder.build_json_sync_response();
let _scope = Mock::given(method("GET"))
.and(path("/_matrix/client/r0/sync"))
.and(header("authorization", "Bearer 1234"))
.respond_with(ResponseTemplate::new(200).set_body_json(json_response))
.mount_as_scoped(server)
server
.mock_sync()
.ok_and_run(client, |builder| {
for room_id in room_ids {
builder.add_joined_room(JoinedRoomBuilder::new(room_id));
}
})
.await;
let _response = client.sync_once(Default::default()).await.unwrap();
room_ids.map(|room_id| client.get_room(room_id).unwrap().into())
}
crates/matrix-sdk-ui/src/room_list_service/filters/non_left.rs
+3 -2
View File
@@ -35,7 +35,7 @@ pub fn new_filter() -> impl Filter {
#[cfg(test)]
mod tests {
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_base::RoomState;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -44,7 +44,8 @@ mod tests {
#[async_test]
async fn test_all_non_left_kind_of_room_list_entry() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
// When a room has been left, it doesn't match.
crates/matrix-sdk-ui/src/room_list_service/filters/none.rs
+3 -2
View File
@@ -23,7 +23,7 @@ pub fn new_filter() -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -31,7 +31,8 @@ mod tests {
#[async_test]
async fn test_all_kind_of_room_list_entry() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let none = new_filter();
crates/matrix-sdk-ui/src/room_list_service/filters/not.rs
+5 -3
View File
@@ -26,7 +26,7 @@ pub fn new_filter(filter: BoxedFilterFn) -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -34,7 +34,8 @@ mod tests {
#[async_test]
async fn test_true() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter = Box::new(|_: &_| true);
@@ -45,7 +46,8 @@ mod tests {
#[async_test]
async fn test_false() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let filter = Box::new(|_: &_| false);
crates/matrix-sdk-ui/src/room_list_service/filters/space.rs
+3 -2
View File
@@ -31,7 +31,7 @@ pub fn new_filter() -> impl Filter {
#[cfg(test)]
mod tests {
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -39,7 +39,8 @@ mod tests {
#[async_test]
async fn test_space() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
assert!(!matches(|_| false, &room));
crates/matrix-sdk-ui/src/room_list_service/filters/unread.rs
+11 -6
View File
@@ -40,7 +40,7 @@ pub fn new_filter() -> impl Filter {
mod tests {
use std::ops::Not;
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_base::read_receipts::RoomReadReceipts;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -49,7 +49,8 @@ mod tests {
#[async_test]
async fn test_has_unread_notifications() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
for is_marked_as_unread in [true, false] {
@@ -69,7 +70,8 @@ mod tests {
#[async_test]
async fn test_has_unread_messages_but_no_unread_notifications_and_is_not_marked_as_unread() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let read_receipts_and_unread = |_: &RoomListItem| {
@@ -84,7 +86,8 @@ mod tests {
#[async_test]
async fn test_has_unread_messages_but_no_unread_notifications_and_is_marked_as_unread() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let read_receipts_and_unread = |_: &RoomListItem| {
@@ -99,7 +102,8 @@ mod tests {
#[async_test]
async fn test_has_no_unread_notifications_and_is_not_marked_as_unread() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let read_receipts_and_unread = |_: &RoomListItem| (RoomReadReceipts::default(), false);
@@ -109,7 +113,8 @@ mod tests {
#[async_test]
async fn test_has_no_unread_notifications_and_is_marked_as_unread() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room] = new_rooms([room_id!("!a:b.c")], &client, &server).await;
let read_receipts_and_unread = |_: &RoomListItem| (RoomReadReceipts::default(), true);
crates/matrix-sdk-ui/src/room_list_service/sorters/latest_event.rs
+9 -5
View File
@@ -68,7 +68,7 @@ mod tests {
use matrix_sdk::{
latest_events::{LatestEventValue, LocalLatestEventValue, RemoteLatestEventValue},
store::SerializableEventContent,
test_utils::logged_in_client_with_server,
test_utils::mocks::MatrixMockServer,
};
use matrix_sdk_test::async_test;
use ruma::{
@@ -142,7 +142,8 @@ mod tests {
#[async_test]
async fn test_none_or_remote_and_none_or_remote() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -170,7 +171,8 @@ mod tests {
#[async_test]
async fn test_none_or_remote_and_local() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -210,7 +212,8 @@ mod tests {
#[async_test]
async fn test_local_and_none_or_remote() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -250,7 +253,8 @@ mod tests {
#[async_test]
async fn test_local_and_local() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
crates/matrix-sdk-ui/src/room_list_service/sorters/lexicographic.rs
+9 -5
View File
@@ -37,7 +37,7 @@ pub fn new_sorter(sorters: Vec<BoxedSorterFn>) -> impl Sorter {
#[cfg(test)]
mod tests {
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -45,7 +45,8 @@ mod tests {
#[async_test]
async fn test_with_zero_sorter() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -56,7 +57,8 @@ mod tests {
#[async_test]
async fn test_with_one_sorter() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -68,7 +70,8 @@ mod tests {
#[async_test]
async fn test_with_two_sorters() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -81,7 +84,8 @@ mod tests {
#[async_test]
async fn test_with_more_sorters() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
crates/matrix-sdk-ui/src/room_list_service/sorters/name.rs
+7 -4
View File
@@ -41,7 +41,7 @@ pub fn new_sorter() -> impl Sorter {
#[cfg(test)]
mod tests {
use matrix_sdk::test_utils::logged_in_client_with_server;
use matrix_sdk::test_utils::mocks::MatrixMockServer;
use matrix_sdk_test::async_test;
use ruma::room_id;
@@ -49,7 +49,8 @@ mod tests {
#[async_test]
async fn test_with_two_names() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -80,7 +81,8 @@ mod tests {
#[async_test]
async fn test_with_one_name() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -100,7 +102,8 @@ mod tests {
#[async_test]
async fn test_with_zero_name() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
crates/matrix-sdk-ui/src/room_list_service/sorters/recency.rs
+11 -6
View File
@@ -107,7 +107,7 @@ mod tests {
RoomRecencyStamp,
latest_events::{LatestEventValue, LocalLatestEventValue, RemoteLatestEventValue},
store::SerializableEventContent,
test_utils::logged_in_client_with_server,
test_utils::mocks::MatrixMockServer,
};
use matrix_sdk_base::RoomInfoNotableUpdateReasons;
use matrix_sdk_test::async_test;
@@ -179,7 +179,8 @@ mod tests {
#[async_test]
async fn test_extract_scores_with_none() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [mut room_a, mut room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -219,7 +220,8 @@ mod tests {
#[async_test]
async fn test_extract_scores_with_remote_or_local() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [mut room_a, mut room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -245,7 +247,8 @@ mod tests {
#[async_test]
async fn test_with_two_scores() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -274,7 +277,8 @@ mod tests {
#[async_test]
async fn test_with_one_score() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;
@@ -293,7 +297,8 @@ mod tests {
#[async_test]
async fn test_with_zero_score() {
let (client, server) = logged_in_client_with_server().await;
let server = MatrixMockServer::new().await;
let client = server.client_builder().build().await;
let [room_a, room_b] =
new_rooms([room_id!("!a:b.c"), room_id!("!d:e.f")], &client, &server).await;