test mocks: deduplicate mock_encryption_state

Author: bnjbvr

crates/matrix-sdk-ui/tests/integration/main.rs

@@ -14,7 +14,6 @@
 
 use itertools::Itertools as _;
 use matrix_sdk::deserialized_responses::TimelineEvent;
-use matrix_sdk_test::test_json;
 use ruma::{events::AnyStateEvent, serde::Raw, EventId, RoomId};
 use serde::Serialize;
 use serde_json::json;
@@ -124,27 +123,3 @@ async fn mock_messages(
         .mount(server)
         .await;
 }
-
-/// Mount a Mock on the given server to handle the `GET
-/// /rooms/.../state/m.room.encryption` endpoint with an option whether it
-/// should return an encryption event or not.
-async fn mock_encryption_state(server: &MockServer, is_encrypted: bool) {
-    let builder = Mock::given(method("GET"))
-        .and(path_regex(r"^/_matrix/client/r0/rooms/.*/state/m.*room.*encryption.?"))
-        .and(header("authorization", "Bearer 1234"));
-
-    if is_encrypted {
-        builder
-            .respond_with(
-                ResponseTemplate::new(200)
-                    .set_body_json(&*test_json::sync_events::ENCRYPTION_CONTENT),
-            )
-            .mount(server)
-            .await;
-    } else {
-        builder
-            .respond_with(ResponseTemplate::new(404).set_body_json(&*test_json::NOT_FOUND))
-            .mount(server)
-            .await;
-    }
-}

crates/matrix-sdk-ui/tests/integration/notification_client.rs

@@ -5,7 +5,10 @@ use std::{
 
 use assert_matches::assert_matches;
 use matrix_sdk::{config::SyncSettings, test_utils::logged_in_client_with_server};
-use matrix_sdk_test::{async_test, sync_timeline_event, JoinedRoomBuilder, SyncResponseBuilder};
+use matrix_sdk_test::{
+    async_test, mocks::mock_encryption_state, sync_timeline_event, JoinedRoomBuilder,
+    SyncResponseBuilder,
+};
 use matrix_sdk_ui::{
     notification_client::{
         NotificationClient, NotificationEvent, NotificationProcessSetup, NotificationStatus,
@@ -20,7 +23,7 @@ use wiremock::{
 };
 
 use crate::{
-    mock_encryption_state, mock_sync,
+    mock_sync,
     sliding_sync::{check_requests, PartialSlidingSyncRequest, SlidingSyncMatcher},
 };
 

crates/matrix-sdk-ui/tests/integration/room_list_service.rs

@@ -10,7 +10,7 @@ use matrix_sdk::{test_utils::logged_in_client_with_server, Client};
 use matrix_sdk_base::{
     sliding_sync::http::request::RoomSubscription, sync::UnreadNotificationsCount,
 };
-use matrix_sdk_test::async_test;
+use matrix_sdk_test::{async_test, mocks::mock_encryption_state};
 use matrix_sdk_ui::{
     room_list_service::{
         filters::{new_filter_fuzzy_match_room_name, new_filter_non_left, new_filter_none},
@@ -29,10 +29,7 @@ use stream_assert::{assert_next_matches, assert_pending};
 use tokio::{spawn, sync::mpsc::channel, task::yield_now};
 use wiremock::MockServer;
 
-use crate::{
-    mock_encryption_state,
-    timeline::sliding_sync::{assert_timeline_stream, timeline_event},
-};
+use crate::timeline::sliding_sync::{assert_timeline_stream, timeline_event};
 
 async fn new_room_list_service() -> Result<(Client, MockServer, RoomListService), Error> {
     let (client, server) = logged_in_client_with_server().await;

crates/matrix-sdk-ui/tests/integration/timeline/echo.rs

@@ -22,7 +22,10 @@ use matrix_sdk::{
     config::SyncSettings, executor::spawn, ruma::MilliSecondsSinceUnixEpoch,
     test_utils::logged_in_client_with_server,
 };
-use matrix_sdk_test::{async_test, sync_timeline_event, JoinedRoomBuilder, SyncResponseBuilder};
+use matrix_sdk_test::{
+    async_test, mocks::mock_encryption_state, sync_timeline_event, JoinedRoomBuilder,
+    SyncResponseBuilder,
+};
 use matrix_sdk_ui::timeline::{EventSendState, RoomExt, TimelineItemContent};
 use ruma::{
     event_id,
@@ -37,7 +40,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_echo() {

crates/matrix-sdk-ui/tests/integration/timeline/edit.rs

@@ -20,7 +20,8 @@ use eyeball_im::VectorDiff;
 use futures_util::{FutureExt, StreamExt};
 use matrix_sdk::{config::SyncSettings, test_utils::logged_in_client_with_server};
 use matrix_sdk_test::{
-    async_test, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder, ALICE, BOB,
+    async_test, mocks::mock_encryption_state, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder,
+    ALICE, BOB,
 };
 use matrix_sdk_ui::timeline::{EventSendState, RoomExt, TimelineDetails, TimelineItemContent};
 use ruma::{
@@ -46,7 +47,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_edit() {

crates/matrix-sdk-ui/tests/integration/timeline/focus_event.rs

@@ -24,13 +24,14 @@ use matrix_sdk::{
     test_utils::{events::EventFactory, logged_in_client_with_server},
 };
 use matrix_sdk_test::{
-    async_test, sync_timeline_event, JoinedRoomBuilder, SyncResponseBuilder, ALICE, BOB,
+    async_test, mocks::mock_encryption_state, sync_timeline_event, JoinedRoomBuilder,
+    SyncResponseBuilder, ALICE, BOB,
 };
 use matrix_sdk_ui::{timeline::TimelineFocus, Timeline};
 use ruma::{event_id, events::room::message::RoomMessageEventContent, room_id};
 use stream_assert::assert_pending;
 
-use crate::{mock_context, mock_encryption_state, mock_messages, mock_sync};
+use crate::{mock_context, mock_messages, mock_sync};
 
 #[async_test]
 async fn test_new_focused() {

crates/matrix-sdk-ui/tests/integration/timeline/mod.rs

@@ -23,8 +23,10 @@ use matrix_sdk::{
     test_utils::{events::EventFactory, logged_in_client_with_server},
 };
 use matrix_sdk_test::{
-    async_test, mocks::mock_redaction, sync_timeline_event, JoinedRoomBuilder,
-    RoomAccountDataTestEvent, StateTestEvent, SyncResponseBuilder,
+    async_test,
+    mocks::{mock_encryption_state, mock_redaction},
+    sync_timeline_event, JoinedRoomBuilder, RoomAccountDataTestEvent, StateTestEvent,
+    SyncResponseBuilder,
 };
 use matrix_sdk_ui::timeline::{EventSendState, RoomExt, TimelineItemContent, VirtualTimelineItem};
 use ruma::{
@@ -37,7 +39,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 mod echo;
 mod edit;

crates/matrix-sdk-ui/tests/integration/timeline/pagination.rs

@@ -22,7 +22,8 @@ use futures_util::{
 };
 use matrix_sdk::{config::SyncSettings, test_utils::logged_in_client_with_server};
 use matrix_sdk_test::{
-    async_test, EventBuilder, JoinedRoomBuilder, StateTestEvent, SyncResponseBuilder, ALICE, BOB,
+    async_test, mocks::mock_encryption_state, EventBuilder, JoinedRoomBuilder, StateTestEvent,
+    SyncResponseBuilder, ALICE, BOB,
 };
 use matrix_sdk_ui::timeline::{
     AnyOtherFullStateEventContent, LiveBackPaginationStatus, RoomExt, TimelineItemContent,
@@ -46,7 +47,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_back_pagination() {

crates/matrix-sdk-ui/tests/integration/timeline/profiles.rs

@@ -17,8 +17,8 @@ use std::{sync::Arc, time::Duration};
 use assert_matches::assert_matches;
 use matrix_sdk::{config::SyncSettings, test_utils::logged_in_client_with_server};
 use matrix_sdk_test::{
-    async_test, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder, ALICE, BOB, CAROL,
-    DEFAULT_TEST_ROOM_ID,
+    async_test, mocks::mock_encryption_state, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder,
+    ALICE, BOB, CAROL, DEFAULT_TEST_ROOM_ID,
 };
 use matrix_sdk_ui::timeline::{RoomExt, TimelineDetails};
 use ruma::events::room::{
@@ -31,7 +31,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_update_sender_profiles() {

crates/matrix-sdk-ui/tests/integration/timeline/queue.rs

@@ -19,7 +19,10 @@ use assert_matches2::assert_let;
 use eyeball_im::VectorDiff;
 use futures_util::StreamExt;
 use matrix_sdk::{config::SyncSettings, test_utils::logged_in_client_with_server};
-use matrix_sdk_test::{async_test, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder, ALICE};
+use matrix_sdk_test::{
+    async_test, mocks::mock_encryption_state, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder,
+    ALICE,
+};
 use matrix_sdk_ui::timeline::{EventItemOrigin, EventSendState, RoomExt};
 use ruma::{
     event_id, events::room::message::RoomMessageEventContent, room_id, MilliSecondsSinceUnixEpoch,
@@ -32,7 +35,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_message_order() {

crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs

@@ -20,8 +20,8 @@ use eyeball_im::VectorDiff;
 use futures_util::StreamExt;
 use matrix_sdk::{config::SyncSettings, room::Receipts, test_utils::logged_in_client_with_server};
 use matrix_sdk_test::{
-    async_test, sync_timeline_event, EphemeralTestEvent, JoinedRoomBuilder,
-    RoomAccountDataTestEvent, SyncResponseBuilder, ALICE, BOB,
+    async_test, mocks::mock_encryption_state, sync_timeline_event, EphemeralTestEvent,
+    JoinedRoomBuilder, RoomAccountDataTestEvent, SyncResponseBuilder, ALICE, BOB,
 };
 use matrix_sdk_ui::timeline::RoomExt;
 use ruma::{
@@ -40,7 +40,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 fn filter_notice(ev: &AnySyncTimelineEvent, _room_version: &RoomVersionId) -> bool {
     match ev {

crates/matrix-sdk-ui/tests/integration/timeline/replies.rs

@@ -10,7 +10,8 @@ use matrix_sdk::{
 };
 use matrix_sdk_base::timeout::timeout;
 use matrix_sdk_test::{
-    async_test, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder, ALICE, BOB, CAROL,
+    async_test, mocks::mock_encryption_state, EventBuilder, JoinedRoomBuilder, SyncResponseBuilder,
+    ALICE, BOB, CAROL,
 };
 use matrix_sdk_ui::timeline::{
     Error as TimelineError, EventSendState, RoomExt, TimelineDetails, TimelineItemContent,
@@ -36,7 +37,7 @@ use wiremock::{
     Mock, Request, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_in_reply_to_details() {

crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs

@@ -23,7 +23,7 @@ use matrix_sdk::{
     test_utils::logged_in_client_with_server, SlidingSync, SlidingSyncList, SlidingSyncListBuilder,
     SlidingSyncMode, UpdateSummary,
 };
-use matrix_sdk_test::async_test;
+use matrix_sdk_test::{async_test, mocks::mock_encryption_state};
 use matrix_sdk_ui::{
     timeline::{TimelineItem, TimelineItemKind, VirtualTimelineItem},
     Timeline,
@@ -223,8 +223,6 @@ macro_rules! assert_timeline_stream {
 
 pub(crate) use assert_timeline_stream;
 
-use crate::mock_encryption_state;
-
 async fn new_sliding_sync(lists: Vec<SlidingSyncListBuilder>) -> Result<(MockServer, SlidingSync)> {
     let (client, server) = logged_in_client_with_server().await;
 

crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs

@@ -23,8 +23,8 @@ use matrix_sdk::{
     test_utils::{events::EventFactory, logged_in_client_with_server},
 };
 use matrix_sdk_test::{
-    async_test, sync_timeline_event, EventBuilder, GlobalAccountDataTestEvent, JoinedRoomBuilder,
-    SyncResponseBuilder, ALICE, BOB,
+    async_test, mocks::mock_encryption_state, sync_timeline_event, EventBuilder,
+    GlobalAccountDataTestEvent, JoinedRoomBuilder, SyncResponseBuilder, ALICE, BOB,
 };
 use matrix_sdk_ui::timeline::{RoomExt, TimelineDetails, TimelineItemContent};
 use ruma::{
@@ -38,7 +38,7 @@ use ruma::{
 use serde_json::json;
 use stream_assert::{assert_next_matches, assert_pending};
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_batched() {

crates/matrix-sdk/tests/integration/main.rs

@@ -6,7 +6,7 @@ use matrix_sdk_test::{test_json, SyncResponseBuilder};
 use ruma::RoomId;
 use serde::Serialize;
 use wiremock::{
-    matchers::{header, method, path, path_regex, query_param, query_param_is_missing},
+    matchers::{header, method, path, query_param, query_param_is_missing},
     Mock, MockGuard, MockServer, ResponseTemplate,
 };
 
@@ -78,30 +78,6 @@ async fn mock_sync_scoped(
         .await
 }
 
-/// Mount a Mock on the given server to handle the `GET
-/// /rooms/.../state/m.room.encryption` endpoint with an option whether it
-/// should return an encryption event or not.
-async fn mock_encryption_state(server: &MockServer, is_encrypted: bool) {
-    let builder = Mock::given(method("GET"))
-        .and(path_regex(r"^/_matrix/client/r0/rooms/.*/state/m.*room.*encryption.?"))
-        .and(header("authorization", "Bearer 1234"));
-
-    if is_encrypted {
-        builder
-            .respond_with(
-                ResponseTemplate::new(200)
-                    .set_body_json(&*test_json::sync_events::ENCRYPTION_CONTENT),
-            )
-            .mount(server)
-            .await;
-    } else {
-        builder
-            .respond_with(ResponseTemplate::new(404).set_body_json(&*test_json::NOT_FOUND))
-            .mount(server)
-            .await;
-    }
-}
-
 /// Does a sync for a given room, and returns its `Room` object.
 ///
 /// Note this sync is token-less.

crates/matrix-sdk/tests/integration/room/attachment/mod.rs

@@ -10,15 +10,15 @@ use matrix_sdk::{
     config::SyncSettings,
     test_utils::logged_in_client_with_server,
 };
-use matrix_sdk_test::{async_test, test_json, DEFAULT_TEST_ROOM_ID};
+use matrix_sdk_test::{async_test, mocks::mock_encryption_state, test_json, DEFAULT_TEST_ROOM_ID};
 use ruma::{event_id, events::Mentions, owned_user_id, uint};
 use serde_json::json;
 use wiremock::{
     matchers::{body_partial_json, header, method, path, path_regex},
     Mock, ResponseTemplate,
 };
 
-use crate::{mock_encryption_state, mock_sync};
+use crate::mock_sync;
 
 #[async_test]
 async fn test_room_attachment_send() {
@@ -474,6 +474,8 @@ async fn test_room_attachment_generate_thumbnail_not_fallback_format() {
 #[cfg(feature = "image-proc")]
 #[async_test]
 async fn test_room_attachment_generate_thumbnail_bigger_than_image() {
+    use matrix_sdk_test::mocks::mock_encryption_state;
+
     let (client, server) = logged_in_client_with_server().await;
 
     Mock::given(method("PUT"))

crates/matrix-sdk/tests/integration/room/beacon/mod.rs

@@ -1,15 +1,15 @@
 use std::time::{Duration, UNIX_EPOCH};
 
 use matrix_sdk::{config::SyncSettings, instant::SystemTime};
-use matrix_sdk_test::{async_test, test_json, DEFAULT_TEST_ROOM_ID};
+use matrix_sdk_test::{async_test, mocks::mock_encryption_state, test_json, DEFAULT_TEST_ROOM_ID};
 use ruma::event_id;
 use serde_json::json;
 use wiremock::{
     matchers::{body_partial_json, header, method, path_regex},
     Mock, ResponseTemplate,
 };
 
-use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync};
+use crate::{logged_in_client_with_server, mock_sync};
 #[async_test]
 async fn test_send_location_beacon() {
     let (client, server) = logged_in_client_with_server().await;

crates/matrix-sdk/tests/integration/room/joined.rs

@@ -12,7 +12,7 @@ use matrix_sdk::{
 use matrix_sdk_base::RoomState;
 use matrix_sdk_test::{
     async_test,
-    mocks::mock_redaction,
+    mocks::{mock_encryption_state, mock_redaction},
     test_json::{self, sync::CUSTOM_ROOM_POWER_LEVELS},
     EphemeralTestEvent, GlobalAccountDataTestEvent, JoinedRoomBuilder, SyncResponseBuilder,
     DEFAULT_TEST_ROOM_ID,
@@ -33,10 +33,7 @@ use wiremock::{
     Mock, ResponseTemplate,
 };
 
-use crate::{
-    logged_in_client_with_server, mock_encryption_state, mock_sync, mock_sync_with_new_room,
-    synced_client,
-};
+use crate::{logged_in_client_with_server, mock_sync, mock_sync_with_new_room, synced_client};
 #[async_test]
 async fn test_invite_user_by_id() {
     let (client, server) = logged_in_client_with_server().await;