test: Rename EventBuilder to SyncResponseBuilder

… because that's what it is.

crates/matrix-sdk-base/src/client.rs

@@ -1296,8 +1296,8 @@ impl Default for BaseClient {
 #[cfg(test)]
 mod tests {
     use matrix_sdk_test::{
-        async_test, response_from_file, EventBuilder, InvitedRoomBuilder, JoinedRoomBuilder,
-        LeftRoomBuilder, StrippedStateTestEvent, TimelineTestEvent,
+        async_test, response_from_file, InvitedRoomBuilder, JoinedRoomBuilder, LeftRoomBuilder,
+        StrippedStateTestEvent, SyncResponseBuilder, TimelineTestEvent,
     };
     use ruma::{
         api::{client as api, IncomingResponse},
@@ -1315,7 +1315,7 @@ mod tests {
 
         let client = logged_in_client(user_id).await;
 
-        let mut ev_builder = EventBuilder::new();
+        let mut ev_builder = SyncResponseBuilder::new();
 
         let response = ev_builder
             .add_left_room(LeftRoomBuilder::new(room_id).add_timeline_event(
@@ -1489,7 +1489,7 @@ mod tests {
         event_id: &str,
         user_id: &UserId,
     ) -> Room {
-        let mut ev_builder = EventBuilder::new();
+        let mut ev_builder = SyncResponseBuilder::new();
         let response = ev_builder
             .add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event(
                 TimelineTestEvent::Custom(json!({

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

@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use matrix_sdk::config::SyncSettings;
-use matrix_sdk_test::{async_test, EventBuilder, JoinedRoomBuilder, TimelineTestEvent};
+use matrix_sdk_test::{async_test, JoinedRoomBuilder, SyncResponseBuilder, TimelineTestEvent};
 use matrix_sdk_ui::notification_client::NotificationClient;
 use ruma::{event_id, events::TimelineEventType, room_id, user_id};
 use serde_json::json;
@@ -33,7 +33,7 @@ async fn test_notification_client_simple() {
         "type": "m.room.message",
     });
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(
         JoinedRoomBuilder::new(room_id.clone())
             .add_timeline_event(TimelineTestEvent::Custom(event_json.clone())),

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

@@ -18,7 +18,7 @@ use assert_matches::assert_matches;
 use eyeball_im::VectorDiff;
 use futures_util::StreamExt;
 use matrix_sdk::{config::SyncSettings, executor::spawn, ruma::MilliSecondsSinceUnixEpoch};
-use matrix_sdk_test::{async_test, EventBuilder, JoinedRoomBuilder, TimelineTestEvent};
+use matrix_sdk_test::{async_test, JoinedRoomBuilder, SyncResponseBuilder, TimelineTestEvent};
 use matrix_sdk_ui::timeline::{
     EventSendState, RoomExt, TimelineItemContent, TimelineItemKind, VirtualTimelineItem,
 };
@@ -42,7 +42,7 @@ async fn echo() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -139,7 +139,7 @@ async fn retry_failed() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -194,7 +194,7 @@ async fn dedup_by_event_id_late() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -264,7 +264,7 @@ async fn cancel_failed() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;

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

@@ -19,7 +19,7 @@ use eyeball_im::VectorDiff;
 use futures_util::StreamExt;
 use matrix_sdk::{config::SyncSettings, ruma::MilliSecondsSinceUnixEpoch};
 use matrix_sdk_test::{
-    async_test, EventBuilder, JoinedRoomBuilder, RoomAccountDataTestEvent, StateTestEvent,
+    async_test, JoinedRoomBuilder, RoomAccountDataTestEvent, StateTestEvent, SyncResponseBuilder,
     TimelineTestEvent,
 };
 use matrix_sdk_ui::timeline::{
@@ -47,7 +47,7 @@ async fn edit() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -161,7 +161,7 @@ async fn reaction() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -259,7 +259,7 @@ async fn redacted_message() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -322,7 +322,7 @@ async fn read_marker() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -397,7 +397,7 @@ async fn in_reply_to_details() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -552,7 +552,7 @@ async fn sync_highlighted() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder
         // We need the member event and power levels locally so the push rules processor works.
         .add_joined_room(
@@ -631,7 +631,7 @@ async fn event_filter() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;

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

@@ -18,7 +18,9 @@ use assert_matches::assert_matches;
 use eyeball_im::VectorDiff;
 use futures_util::future::join;
 use matrix_sdk::config::SyncSettings;
-use matrix_sdk_test::{async_test, test_json, EventBuilder, JoinedRoomBuilder, StateTestEvent};
+use matrix_sdk_test::{
+    async_test, test_json, JoinedRoomBuilder, StateTestEvent, SyncResponseBuilder,
+};
 use matrix_sdk_ui::timeline::{
     AnyOtherFullStateEventContent, BackPaginationStatus, PaginationOptions, RoomExt,
     TimelineItemContent, VirtualTimelineItem,
@@ -42,7 +44,7 @@ async fn back_pagination() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -142,7 +144,7 @@ async fn back_pagination_highlighted() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder
         // We need the member event and power levels locally so the push rules processor works.
         .add_joined_room(

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

@@ -18,7 +18,7 @@ use assert_matches::assert_matches;
 use eyeball_im::VectorDiff;
 use futures_util::StreamExt;
 use matrix_sdk::config::SyncSettings;
-use matrix_sdk_test::{async_test, EventBuilder, JoinedRoomBuilder};
+use matrix_sdk_test::{async_test, JoinedRoomBuilder, SyncResponseBuilder};
 use matrix_sdk_ui::timeline::{EventSendState, RoomExt};
 use ruma::{events::room::message::RoomMessageEventContent, room_id};
 use serde_json::json;
@@ -37,7 +37,7 @@ async fn message_order() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -109,7 +109,7 @@ async fn retry_order() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;

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

@@ -19,8 +19,8 @@ use eyeball_im::VectorDiff;
 use futures_util::StreamExt;
 use matrix_sdk::{config::SyncSettings, room::Receipts};
 use matrix_sdk_test::{
-    async_test, EphemeralTestEvent, EventBuilder, JoinedRoomBuilder, RoomAccountDataTestEvent,
-    TimelineTestEvent,
+    async_test, EphemeralTestEvent, JoinedRoomBuilder, RoomAccountDataTestEvent,
+    SyncResponseBuilder, TimelineTestEvent,
 };
 use matrix_sdk_ui::timeline::RoomExt;
 use ruma::{
@@ -48,7 +48,7 @@ async fn read_receipts_updates() {
     let second_event_id = event_id!("$e32037280er453l:localhost");
     let third_event_id = event_id!("$Sg2037280074GZr34:localhost");
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -245,7 +245,7 @@ async fn send_single_receipt() {
 
     let own_user_id = client.user_id().unwrap();
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;
@@ -592,7 +592,7 @@ async fn send_multiple_receipts() {
 
     let own_user_id = client.user_id().unwrap();
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
 
     mock_sync(&server, ev_builder.build_json_sync_response(), None).await;

crates/matrix-sdk/src/client/mod.rs

@@ -1941,7 +1941,9 @@ impl Client {
 pub(crate) mod tests {
     use std::time::Duration;
 
-    use matrix_sdk_test::{async_test, test_json, EventBuilder, JoinedRoomBuilder, StateTestEvent};
+    use matrix_sdk_test::{
+        async_test, test_json, JoinedRoomBuilder, StateTestEvent, SyncResponseBuilder,
+    };
     #[cfg(target_arch = "wasm32")]
     wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 
@@ -2035,7 +2037,7 @@ pub(crate) mod tests {
         let server = MockServer::start().await;
         let client = logged_in_client(Some(server.uri())).await;
 
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default()
                     .add_state_event(StateTestEvent::Member)

crates/matrix-sdk/src/encryption/mod.rs

@@ -954,8 +954,8 @@ mod tests {
 
     use matrix_sdk_base::SessionMeta;
     use matrix_sdk_test::{
-        async_test, test_json, EventBuilder, GlobalAccountDataTestEvent, JoinedRoomBuilder,
-        StateTestEvent,
+        async_test, test_json, GlobalAccountDataTestEvent, JoinedRoomBuilder, StateTestEvent,
+        SyncResponseBuilder,
     };
     use ruma::{
         device_id, event_id,
@@ -1001,7 +1001,7 @@ mod tests {
             .mount(&server)
             .await;
 
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default()
                     .add_state_event(StateTestEvent::Member)
@@ -1034,7 +1034,7 @@ mod tests {
         let user_id = user_id!("@invited:localhost");
 
         // When we receive a sync response saying "invited" is invited to a DM
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default().add_state_event(StateTestEvent::MemberAdditional),
             )
@@ -1055,7 +1055,7 @@ mod tests {
         let user_id = user_id!("@invited:localhost");
 
         // When we receive a sync response saying "invited" is invited to a DM
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default().add_state_event(StateTestEvent::MemberInvite),
             )
@@ -1081,7 +1081,7 @@ mod tests {
         let user_id = user_id!("@invited:localhost");
 
         // When we receive a sync response saying "invited" is invited to a DM
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default().add_state_event(StateTestEvent::MemberLeave),
             )

crates/matrix-sdk/src/event_handler/mod.rs

@@ -551,7 +551,8 @@ mod tests {
     };
 
     use matrix_sdk_test::{
-        EphemeralTestEvent, EventBuilder, StateTestEvent, StrippedStateTestEvent, TimelineTestEvent,
+        EphemeralTestEvent, StateTestEvent, StrippedStateTestEvent, SyncResponseBuilder,
+        TimelineTestEvent,
     };
     use ruma::{
         events::{
@@ -613,7 +614,7 @@ mod tests {
             }
         });
 
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default()
                     .add_timeline_event(TimelineTestEvent::Member)
@@ -709,7 +710,7 @@ mod tests {
             unreachable!("No room event in room B")
         });
 
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::new(room_id_a)
                     .add_timeline_event(TimelineTestEvent::Member)
@@ -763,7 +764,7 @@ mod tests {
             }
         });
 
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default().add_timeline_event(TimelineTestEvent::Member),
             )
@@ -822,7 +823,7 @@ mod tests {
             },
         );
 
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default().add_timeline_event(TimelineTestEvent::Member),
             )
@@ -844,7 +845,7 @@ mod tests {
             },
         );
 
-        let response = EventBuilder::default()
+        let response = SyncResponseBuilder::default()
             .add_joined_room(
                 JoinedRoomBuilder::default().add_timeline_event(TimelineTestEvent::Member),
             )

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

@@ -3,8 +3,8 @@ use std::time::Duration;
 use assert_matches::assert_matches;
 use matrix_sdk::{config::SyncSettings, room::RoomMember, DisplayName, RoomMemberships};
 use matrix_sdk_test::{
-    async_test, bulk_room_members, test_json, EventBuilder, JoinedRoomBuilder, StateTestEvent,
-    TimelineTestEvent,
+    async_test, bulk_room_members, test_json, JoinedRoomBuilder, StateTestEvent,
+    SyncResponseBuilder, TimelineTestEvent,
 };
 use ruma::{
     event_id,
@@ -180,7 +180,7 @@ async fn test_state_event_getting() {
 #[async_test]
 async fn room_route() {
     let (client, server) = logged_in_client().await;
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     let room_id = room_id!("!test_room:127.0.0.1");
 
     // Without elligible server
@@ -352,7 +352,7 @@ async fn room_route() {
 #[async_test]
 async fn room_permalink() {
     let (client, server) = logged_in_client().await;
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     let room_id = room_id!("!test_room:127.0.0.1");
 
     // Without aliases
@@ -441,7 +441,7 @@ async fn room_permalink() {
 #[async_test]
 async fn room_event_permalink() {
     let (client, server) = logged_in_client().await;
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     let room_id = room_id!("!test_room:127.0.0.1");
     let event_id = event_id!("$15139375512JaHAW");
 
@@ -509,7 +509,7 @@ async fn event() {
     let (client, server) = logged_in_client().await;
     let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
 
-    let mut ev_builder = EventBuilder::new();
+    let mut ev_builder = SyncResponseBuilder::new();
     ev_builder
         // We need the member event and power levels locally so the push rules processor works.
         .add_joined_room(

testing/matrix-sdk-test/src/appservice.rs

@@ -16,7 +16,7 @@ pub fn value_with_room_id(value: &mut Value) {
 /// The `TransactionBuilder` struct can be used to easily generate valid
 /// incoming appservice transactions in json value format for testing.
 ///
-/// Usage is similar to [`super::EventBuilder`]
+/// Usage is similar to [`super::SyncResponseBuilder`]
 #[derive(Debug, Default)]
 pub struct TransactionBuilder {
     events: Vec<Raw<AnyTimelineEvent>>,

testing/matrix-sdk-test/src/event_builder/mod.rs

@@ -31,7 +31,7 @@ pub use test_event::{
     StateTestEvent, StrippedStateTestEvent, TimelineTestEvent,
 };
 
-/// The `EventBuilder` struct can be used to easily generate valid sync
+/// The `SyncResponseBuilder` struct can be used to easily generate valid sync
 /// responses for testing. These can be then fed into either `Client` or `Room`.
 ///
 /// It supports generated a number of canned events, such as a member entering a
@@ -46,9 +46,9 @@ pub use test_event::{
 /// # Example usage
 ///
 /// ```rust
-/// use matrix_sdk_test::{EventBuilder, JoinedRoomBuilder, TimelineTestEvent};
+/// use matrix_sdk_test::{SyncResponseBuilder, JoinedRoomBuilder, TimelineTestEvent};
 ///
-/// let mut builder = EventBuilder::new();
+/// let mut builder = SyncResponseBuilder::new();
 ///
 /// // response1 now contains events that add an example member to the room and change their power
 /// // level
@@ -73,7 +73,7 @@ pub use test_event::{
 ///     .build_sync_response();
 /// ```
 #[derive(Default)]
-pub struct EventBuilder {
+pub struct SyncResponseBuilder {
     /// Updates to joined `Room`s.
     joined_rooms: HashMap<OwnedRoomId, JoinedRoom>,
     /// Updates to invited `Room`s.
@@ -89,7 +89,7 @@ pub struct EventBuilder {
     batch_counter: i64,
 }
 
-impl EventBuilder {
+impl SyncResponseBuilder {
     pub fn new() -> Self {
         Self::default()
     }

testing/matrix-sdk-test/src/lib.rs

@@ -9,9 +9,9 @@ mod event_builder;
 pub mod test_json;
 
 pub use event_builder::{
-    bulk_room_members, EphemeralTestEvent, EventBuilder, GlobalAccountDataTestEvent,
-    InvitedRoomBuilder, JoinedRoomBuilder, LeftRoomBuilder, PresenceTestEvent,
-    RoomAccountDataTestEvent, StateTestEvent, StrippedStateTestEvent, TimelineTestEvent,
+    bulk_room_members, EphemeralTestEvent, GlobalAccountDataTestEvent, InvitedRoomBuilder,
+    JoinedRoomBuilder, LeftRoomBuilder, PresenceTestEvent, RoomAccountDataTestEvent,
+    StateTestEvent, StrippedStateTestEvent, SyncResponseBuilder, TimelineTestEvent,
 };
 
 /// Embedded sync response files