diff --git a/crates/matrix-sdk-base/src/client.rs b/crates/matrix-sdk-base/src/client.rs index babd5d38edb..b88c6d924f2 100644 --- a/crates/matrix-sdk-base/src/client.rs +++ b/crates/matrix-sdk-base/src/client.rs @@ -1515,9 +1515,9 @@ mod tests { let client = logged_in_base_client(Some(user_id)).await; - let mut ev_builder = SyncResponseBuilder::new(); + let mut sync_builder = SyncResponseBuilder::new(); - let response = ev_builder + let response = sync_builder .add_left_room(LeftRoomBuilder::new(room_id).add_timeline_event(sync_timeline_event!({ "content": { "displayname": "Alice", @@ -1533,7 +1533,7 @@ mod tests { client.receive_sync_response(response).await.unwrap(); assert_eq!(client.get_room(room_id).unwrap().state(), RoomState::Left); - let response = ev_builder + let response = sync_builder .add_invited_room(InvitedRoomBuilder::new(room_id).add_state_event( StrippedStateTestEvent::Custom(json!({ "content": { @@ -1675,8 +1675,8 @@ mod tests { event_id: &str, user_id: &UserId, ) -> crate::Room { - let mut ev_builder = SyncResponseBuilder::new(); - let response = ev_builder + let mut sync_builder = SyncResponseBuilder::new(); + let response = sync_builder .add_joined_room(matrix_sdk_test::JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { @@ -1802,8 +1802,8 @@ mod tests { .unwrap(); // Preamble: let the SDK know about the room. - let mut ev_builder = SyncResponseBuilder::new(); - let response = ev_builder + let mut sync_builder = SyncResponseBuilder::new(); + let response = sync_builder .add_joined_room(matrix_sdk_test::JoinedRoomBuilder::new(room_id)) .build_sync_response(); client.receive_sync_response(response).await.unwrap(); @@ -1861,8 +1861,8 @@ mod tests { .unwrap(); // Preamble: let the SDK know about the room, and that the invited user left it. - let mut ev_builder = SyncResponseBuilder::new(); - let response = ev_builder + let mut sync_builder = SyncResponseBuilder::new(); + let response = sync_builder .add_joined_room(matrix_sdk_test::JoinedRoomBuilder::new(room_id).add_state_event( StateTestEvent::Custom(json!({ "content": { diff --git a/crates/matrix-sdk-ui/tests/integration/notification_client.rs b/crates/matrix-sdk-ui/tests/integration/notification_client.rs index 071a33b8d16..f69153f804f 100644 --- a/crates/matrix-sdk-ui/tests/integration/notification_client.rs +++ b/crates/matrix-sdk-ui/tests/integration/notification_client.rs @@ -45,13 +45,13 @@ async fn test_notification_client_with_context() { "type": "m.room.message", }); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room( + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id).add_timeline_event(sync_timeline_event!(event_json)), ); // First, mock a sync that contains a text message. - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs b/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs index c157bd2d654..a62e852f23c 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs @@ -44,10 +44,10 @@ async fn test_echo() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -95,7 +95,7 @@ async fn test_echo() { let item = sent_confirmation.as_event().unwrap(); assert_matches!(item.send_state(), Some(EventSendState::Sent { .. })); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "body": "Hello, World!", @@ -109,7 +109,7 @@ async fn test_echo() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -132,10 +132,10 @@ async fn test_retry_failed() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -188,10 +188,10 @@ async fn test_dedup_by_event_id_late() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -226,7 +226,7 @@ async fn test_dedup_by_event_id_late() { assert_next_matches!( timeline_stream, VectorDiff::PushFront { value } => value); assert!(day_divider.is_day_divider()); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "body": "Hello, World!", @@ -240,7 +240,7 @@ async fn test_dedup_by_event_id_late() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); let remote_echo = @@ -263,10 +263,10 @@ async fn test_cancel_failed() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs b/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs index fd5b572d76c..d0e2b27d77b 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs @@ -55,10 +55,10 @@ async fn test_edit() { let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -67,7 +67,7 @@ async fn test_edit() { let (_, mut timeline_stream) = timeline.subscribe().await; let event_id = event_id!("$msda7m:localhost"); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( event_builder.make_sync_message_event_with_id( &ALICE, event_id, @@ -75,7 +75,7 @@ async fn test_edit() { ), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -90,7 +90,7 @@ async fn test_edit() { assert_let!(Some(VectorDiff::PushFront { value: day_divider }) = timeline_stream.next().await); assert!(day_divider.is_day_divider()); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(event_builder.make_sync_message_event( &BOB, @@ -107,7 +107,7 @@ async fn test_edit() { ), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs b/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs index 4277af25285..130f9166481 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs @@ -46,10 +46,10 @@ async fn test_reaction() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -57,7 +57,7 @@ async fn test_reaction() { let timeline = room.timeline().await.unwrap(); let (_, mut timeline_stream) = timeline.subscribe().await; - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -84,7 +84,7 @@ async fn test_reaction() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -125,7 +125,7 @@ async fn test_reaction() { // TODO: After adding raw timeline items, check for one here - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": {}, "redacts": "$031IXQRi27504", @@ -136,7 +136,7 @@ async fn test_reaction() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -155,10 +155,10 @@ async fn test_redacted_message() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -166,7 +166,7 @@ async fn test_redacted_message() { let timeline = room.timeline().await.unwrap(); let (_, mut timeline_stream) = timeline.subscribe().await; - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": {}, @@ -195,7 +195,7 @@ async fn test_redacted_message() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -214,10 +214,10 @@ async fn test_read_marker() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -225,7 +225,7 @@ async fn test_read_marker() { let timeline = room.timeline().await.unwrap(); let (_, mut timeline_stream) = timeline.subscribe().await; - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "body": "hello", @@ -238,7 +238,7 @@ async fn test_read_marker() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -248,17 +248,17 @@ async fn test_read_marker() { assert_let!(Some(VectorDiff::PushFront { value: day_divider }) = timeline_stream.next().await); assert!(day_divider.is_day_divider()); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id).add_account_data(RoomAccountDataTestEvent::FullyRead), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; // Nothing should happen, the marker cannot be added at the end. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "body": "hello to you!", @@ -271,7 +271,7 @@ async fn test_read_marker() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -290,8 +290,8 @@ async fn test_sync_highlighted() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder // We need the member event and power levels locally so the push rules processor works. .add_joined_room( JoinedRoomBuilder::new(room_id) @@ -299,7 +299,7 @@ async fn test_sync_highlighted() { .add_state_event(StateTestEvent::PowerLevels), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -307,7 +307,7 @@ async fn test_sync_highlighted() { let timeline = room.timeline().await.unwrap(); let (_, mut timeline_stream) = timeline.subscribe().await; - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "body": "hello", @@ -320,7 +320,7 @@ async fn test_sync_highlighted() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -332,7 +332,7 @@ async fn test_sync_highlighted() { assert_let!(Some(VectorDiff::PushFront { value: day_divider }) = timeline_stream.next().await); assert!(day_divider.is_day_divider()); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "body": "This room has been replaced", @@ -346,7 +346,7 @@ async fn test_sync_highlighted() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs b/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs index 03774919102..203d2215bd8 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs @@ -64,10 +64,10 @@ async fn test_read_receipts_updates() { let second_event_id = event_id!("$e32037280er453l:localhost"); let third_event_id = event_id!("$Sg2037280074GZr34:localhost"); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -84,7 +84,7 @@ async fn test_read_receipts_updates() { let bob_receipt = timeline.latest_user_read_receipt(bob).await; assert_matches!(bob_receipt, None); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -123,7 +123,7 @@ async fn test_read_receipts_updates() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -158,7 +158,7 @@ async fn test_read_receipts_updates() { assert!(day_divider.is_day_divider()); // Read receipt on unknown event is ignored. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { "$unknowneventid": { @@ -173,7 +173,7 @@ async fn test_read_receipts_updates() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -181,7 +181,7 @@ async fn test_read_receipts_updates() { assert_eq!(alice_receipt_event_id, third_event.event_id().unwrap()); // Read receipt on older event is ignored. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { second_event_id: { @@ -200,7 +200,7 @@ async fn test_read_receipts_updates() { assert_eq!(alice_receipt_event_id, third_event_id); // Read receipt on same event is ignored. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { third_event_id: { @@ -219,7 +219,7 @@ async fn test_read_receipts_updates() { assert_eq!(alice_receipt_event_id, third_event_id); // New user with explicit threaded and unthreaded read receipts. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { second_event_id: { @@ -242,7 +242,7 @@ async fn test_read_receipts_updates() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -256,7 +256,7 @@ async fn test_read_receipts_updates() { assert_eq!(bob_receipt_event_id, third_event_id); // Private read receipt is updated. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { second_event_id: { @@ -271,7 +271,7 @@ async fn test_read_receipts_updates() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -292,10 +292,10 @@ async fn test_read_receipts_updates_on_filtered_events() { let event_b_id = event_id!("$e32037280er453l:localhost"); let event_c_id = event_id!("$Sg2037280074GZr34:localhost"); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -321,7 +321,7 @@ async fn test_read_receipts_updates_on_filtered_events() { timeline.latest_user_read_receipt_timeline_event_id(*BOB).await; assert_matches!(bob_receipt_timeline_event, None); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) // Event A .add_timeline_event(sync_timeline_event!({ @@ -358,7 +358,7 @@ async fn test_read_receipts_updates_on_filtered_events() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -401,7 +401,7 @@ async fn test_read_receipts_updates_on_filtered_events() { assert!(day_divider.is_day_divider()); // Read receipt on filtered event. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { event_b_id: { @@ -416,7 +416,7 @@ async fn test_read_receipts_updates_on_filtered_events() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -429,7 +429,7 @@ async fn test_read_receipts_updates_on_filtered_events() { assert_eq!(own_receipt_timeline_event, event_a.event_id().unwrap()); // Update with explicit read receipt. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { event_c_id: { @@ -444,7 +444,7 @@ async fn test_read_receipts_updates_on_filtered_events() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -464,7 +464,7 @@ async fn test_read_receipts_updates_on_filtered_events() { assert_eq!(bob_receipt_timeline_event, event_c_id); // Private read receipt is updated. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { event_c_id: { @@ -479,7 +479,7 @@ async fn test_read_receipts_updates_on_filtered_events() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -500,10 +500,10 @@ async fn test_send_single_receipt() { let own_user_id = client.user_id().unwrap(); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -565,7 +565,7 @@ async fn test_send_single_receipt() { server.reset().await; // Unchanged receipts are not sent. - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_ephemeral_event(EphemeralTestEvent::Custom(json!({ "content": { @@ -592,7 +592,7 @@ async fn test_send_single_receipt() { }))), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -679,7 +679,7 @@ async fn test_send_single_receipt() { // Newer receipts in the timeline are sent. let third_receipts_event_id = event_id!("$third_receipts_event_id"); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -726,7 +726,7 @@ async fn test_send_single_receipt() { }))), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -782,7 +782,7 @@ async fn test_send_single_receipt() { server.reset().await; // Older receipts in the timeline are not sent. - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_ephemeral_event(EphemeralTestEvent::Custom(json!({ "content": { @@ -809,7 +809,7 @@ async fn test_send_single_receipt() { }))), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -847,10 +847,10 @@ async fn test_mark_as_read() { let own_user_id = client.user_id().unwrap(); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -861,7 +861,7 @@ async fn test_mark_as_read() { let reaction_event_id = event_id!("$reaction_event_id"); // When I receive an event with a reaction on it, - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -900,7 +900,7 @@ async fn test_mark_as_read() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -950,10 +950,10 @@ async fn test_send_multiple_receipts() { let own_user_id = client.user_id().unwrap(); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -984,7 +984,7 @@ async fn test_send_multiple_receipts() { server.reset().await; // Unchanged receipts are not sent. - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_ephemeral_event(EphemeralTestEvent::Custom(json!({ "content": { @@ -1011,7 +1011,7 @@ async fn test_send_multiple_receipts() { }))), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -1048,7 +1048,7 @@ async fn test_send_multiple_receipts() { .public_read_receipt(Some(third_receipts_event_id.to_owned())) .private_read_receipt(Some(third_receipts_event_id.to_owned())); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -1095,7 +1095,7 @@ async fn test_send_multiple_receipts() { }))), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -1116,7 +1116,7 @@ async fn test_send_multiple_receipts() { server.reset().await; // Older receipts in the timeline are not sent. - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_ephemeral_event(EphemeralTestEvent::Custom(json!({ "content": { @@ -1143,7 +1143,7 @@ async fn test_send_multiple_receipts() { }))), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -1164,10 +1164,10 @@ async fn test_latest_user_read_receipt() { let event_d_id = event_id!("$event_d"); let event_e_id = event_id!("$event_e"); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -1181,7 +1181,7 @@ async fn test_latest_user_read_receipt() { assert_matches!(user_receipt, None); // Only private receipt. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { event_a_id: { @@ -1194,7 +1194,7 @@ async fn test_latest_user_read_receipt() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -1203,7 +1203,7 @@ async fn test_latest_user_read_receipt() { // Private and public receipts without timestamp should return private // receipt. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { event_b_id: { @@ -1216,7 +1216,7 @@ async fn test_latest_user_read_receipt() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -1224,7 +1224,7 @@ async fn test_latest_user_read_receipt() { assert_eq!(user_receipt_id, event_a_id); // Public receipt with bigger timestamp. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { event_c_id: { @@ -1246,7 +1246,7 @@ async fn test_latest_user_read_receipt() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -1254,7 +1254,7 @@ async fn test_latest_user_read_receipt() { assert_eq!(user_receipt_id, event_d_id); // Private receipt with bigger timestamp. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { event_e_id: { @@ -1269,7 +1269,7 @@ async fn test_latest_user_read_receipt() { })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs b/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs index 95524e9f3cb..3fdb23d2851 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs @@ -179,10 +179,10 @@ async fn test_transfer_in_reply_to_details_to_re_received_item() { let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -199,10 +199,10 @@ async fn test_transfer_in_reply_to_details_to_re_received_item() { }), }), ); - ev_builder + sync_builder .add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event(reply_event.clone())); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -240,9 +240,9 @@ async fn test_transfer_in_reply_to_details_to_re_received_item() { assert_matches!(in_reply_to.event, TimelineDetails::Ready(_)); // ... and then we re-receive the reply event - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event(reply_event)); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event(reply_event)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); // ... the replied-to event details should remain from when we fetched them diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs b/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs index 7f35333935e..7aaf9ac8bb8 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs @@ -92,10 +92,10 @@ async fn test_event_filter() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -104,7 +104,7 @@ async fn test_event_filter() { let (_, mut timeline_stream) = timeline.subscribe().await; let first_event_id = event_id!("$YTQwYl2ply"); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "body": "hello", @@ -117,7 +117,7 @@ async fn test_event_filter() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -134,7 +134,7 @@ async fn test_event_filter() { let second_event_id = event_id!("$Ga6Y2l0gKY"); let edit_event_id = event_id!("$7i9In0gEmB"); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -168,7 +168,7 @@ async fn test_event_filter() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -198,10 +198,10 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -217,7 +217,7 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { let second_event_id = event_id!("$YTQwYl2pl2"); let third_event_id = event_id!("$YTQwYl2pl3"); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -251,7 +251,7 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -275,7 +275,7 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { let fourth_event_id = event_id!("$YTQwYl2pl4"); let fiveth_event_id = event_id!("$YTQwYl2pl5"); - ev_builder.add_global_account_data_event(GlobalAccountDataTestEvent::Custom(json!({ + sync_builder.add_global_account_data_event(GlobalAccountDataTestEvent::Custom(json!({ "content": { "ignored_users": { bob: {} @@ -284,7 +284,7 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { "type": "m.ignored_user_list", }))); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -292,7 +292,7 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { assert_next_matches!(timeline_stream, VectorDiff::Clear); assert_pending!(timeline_stream); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -316,7 +316,7 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -342,10 +342,10 @@ async fn test_profile_updates() { let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -361,7 +361,7 @@ async fn test_profile_updates() { let event_1_id = event_id!("$YTQwYl2pl1"); let event_2_id = event_id!("$YTQwYl2pl2"); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -385,7 +385,7 @@ async fn test_profile_updates() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -410,7 +410,7 @@ async fn test_profile_updates() { let event_4_id = event_id!("$YTQwYl2pl4"); let event_5_id = event_id!("$YTQwYl2pl5"); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -446,7 +446,7 @@ async fn test_profile_updates() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -514,7 +514,7 @@ async fn test_profile_updates() { // Change name to be ambiguous. let event_6_id = event_id!("$YTQwYl2pl6"); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "displayname": "Member", @@ -528,7 +528,7 @@ async fn test_profile_updates() { }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk/tests/integration/room/common.rs b/crates/matrix-sdk/tests/integration/room/common.rs index 31e33e4455c..4131076bf39 100644 --- a/crates/matrix-sdk/tests/integration/room/common.rs +++ b/crates/matrix-sdk/tests/integration/room/common.rs @@ -23,7 +23,7 @@ use wiremock::{ use crate::{logged_in_client_with_server, mock_sync}; #[async_test] -async fn user_presence() { +async fn test_user_presence() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*test_json::SYNC, None).await; @@ -47,7 +47,7 @@ async fn user_presence() { } #[async_test] -async fn calculate_room_names_from_summary() { +async fn test_calculate_room_names_from_summary() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*test_json::DEFAULT_SYNC_SUMMARY, None).await; @@ -60,7 +60,7 @@ async fn calculate_room_names_from_summary() { } #[async_test] -async fn room_names() { +async fn test_room_names() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*test_json::SYNC, None).await; @@ -176,13 +176,13 @@ async fn test_state_event_getting() { } #[async_test] -async fn room_route() { +async fn test_room_route() { let (client, server) = logged_in_client_with_server().await; - let mut ev_builder = SyncResponseBuilder::new(); + let mut sync_builder = SyncResponseBuilder::new(); let room_id = &*DEFAULT_TEST_ROOM_ID; // Without eligible server - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_event(sync_timeline_event!({ "content": { @@ -207,7 +207,7 @@ async fn room_route() { })), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let sync_token = client.sync_once(SyncSettings::new()).await.unwrap().next_batch; let room = client.get_room(room_id).unwrap(); @@ -216,10 +216,10 @@ async fn room_route() { // With a single eligible server let mut batch = 0; - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( bulk_room_members(batch, 0..1, "localhost", &MembershipState::Join), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; let sync_token = client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap().next_batch; @@ -229,10 +229,10 @@ async fn room_route() { // With two eligible servers batch += 1; - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( bulk_room_members(batch, 0..15, "notarealhs", &MembershipState::Join), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; let sync_token = client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap().next_batch; @@ -243,10 +243,10 @@ async fn room_route() { // With three eligible servers batch += 1; - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( bulk_room_members(batch, 0..5, "mymatrix", &MembershipState::Join), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; let sync_token = client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap().next_batch; @@ -258,10 +258,10 @@ async fn room_route() { // With four eligible servers batch += 1; - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_state_bulk( bulk_room_members(batch, 0..10, "yourmatrix", &MembershipState::Join), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; let sync_token = client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap().next_batch; @@ -272,7 +272,7 @@ async fn room_route() { assert_eq!(route[2], "mymatrix"); // With power levels - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "users": { @@ -286,7 +286,7 @@ async fn room_route() { "type": "m.room.power_levels", }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; let sync_token = client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap().next_batch; @@ -297,7 +297,7 @@ async fn room_route() { assert_eq!(route[2], "yourmatrix"); // With higher power levels - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "users": { @@ -312,7 +312,7 @@ async fn room_route() { "type": "m.room.power_levels", }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; let sync_token = client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap().next_batch; @@ -323,7 +323,7 @@ async fn room_route() { assert_eq!(route[2], "yourmatrix"); // With server ACLs - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "allow": ["*"], @@ -337,7 +337,7 @@ async fn room_route() { "type": "m.room.server_acl", }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap(); let route = room.route().await.unwrap(); @@ -348,13 +348,13 @@ async fn room_route() { } #[async_test] -async fn room_permalink() { +async fn test_room_permalink() { let (client, server) = logged_in_client_with_server().await; - let mut ev_builder = SyncResponseBuilder::new(); + let mut sync_builder = SyncResponseBuilder::new(); let room_id = room_id!("!test_room:127.0.0.1"); // Without aliases - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_state_bulk(bulk_room_members( 0, @@ -369,7 +369,7 @@ async fn room_permalink() { &MembershipState::Join, )), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let sync_token = client.sync_once(SyncSettings::new()).await.unwrap().next_batch; let room = client.get_room(room_id).unwrap(); @@ -383,7 +383,7 @@ async fn room_permalink() { ); // With an alternative alias - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "alt_aliases": ["#alias:localhost"], @@ -395,7 +395,7 @@ async fn room_permalink() { "type": "m.room.canonical_alias", }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; let sync_token = client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap().next_batch; @@ -406,7 +406,7 @@ async fn room_permalink() { assert_eq!(room.matrix_permalink(false).await.unwrap().to_string(), "matrix:r/alias:localhost"); // With a canonical alias - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "alias": "#canonical:localhost", @@ -419,7 +419,7 @@ async fn room_permalink() { "type": "m.room.canonical_alias", }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap(); assert_eq!( @@ -437,14 +437,14 @@ async fn room_permalink() { } #[async_test] -async fn room_event_permalink() { +async fn test_room_event_permalink() { let (client, server) = logged_in_client_with_server().await; - let mut ev_builder = SyncResponseBuilder::new(); + let mut sync_builder = SyncResponseBuilder::new(); let room_id = room_id!("!test_room:127.0.0.1"); let event_id = event_id!("$15139375512JaHAW"); // Without aliases - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id) .add_timeline_state_bulk(bulk_room_members( 0, @@ -459,7 +459,7 @@ async fn room_event_permalink() { &MembershipState::Join, )), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let sync_token = client.sync_once(SyncSettings::new()).await.unwrap().next_batch; let room = client.get_room(room_id).unwrap(); @@ -473,7 +473,7 @@ async fn room_event_permalink() { ); // Adding an alias doesn't change anything - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_timeline_event( sync_timeline_event!({ "content": { "alias": "#canonical:localhost", @@ -486,7 +486,7 @@ async fn room_event_permalink() { "type": "m.room.canonical_alias", }), )); - mock_sync(&server, ev_builder.build_json_sync_response(), Some(sync_token.clone())).await; + mock_sync(&server, sync_builder.build_json_sync_response(), Some(sync_token.clone())).await; client.sync_once(SyncSettings::new().token(sync_token)).await.unwrap(); assert_eq!( @@ -500,14 +500,14 @@ async fn room_event_permalink() { } #[async_test] -async fn event() { +async fn test_event() { let event_id = event_id!("$foun39djjod0f"); let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder // We need the member event and power levels locally so the push rules processor works. .add_joined_room( JoinedRoomBuilder::new(&DEFAULT_TEST_ROOM_ID) @@ -515,7 +515,7 @@ async fn event() { .add_state_event(StateTestEvent::PowerLevels), ); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk/tests/integration/room/joined.rs b/crates/matrix-sdk/tests/integration/room/joined.rs index 8c753fcdb3a..dce805bb602 100644 --- a/crates/matrix-sdk/tests/integration/room/joined.rs +++ b/crates/matrix-sdk/tests/integration/room/joined.rs @@ -32,7 +32,7 @@ use wiremock::{ use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync, synced_client}; #[async_test] -async fn invite_user_by_id() { +async fn test_invite_user_by_id() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -55,7 +55,7 @@ async fn invite_user_by_id() { } #[async_test] -async fn invite_user_by_3pid() { +async fn test_invite_user_by_3pid() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -87,7 +87,7 @@ async fn invite_user_by_3pid() { } #[async_test] -async fn leave_room() -> Result<(), anyhow::Error> { +async fn test_leave_room() -> Result<(), anyhow::Error> { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -113,7 +113,7 @@ async fn leave_room() -> Result<(), anyhow::Error> { } #[async_test] -async fn ban_user() { +async fn test_ban_user() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -136,7 +136,7 @@ async fn ban_user() { } #[async_test] -async fn unban_user() { +async fn test_unban_user() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -185,7 +185,7 @@ async fn test_mark_as_unread() { } #[async_test] -async fn kick_user() { +async fn test_kick_user() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -208,7 +208,7 @@ async fn kick_user() { } #[async_test] -async fn send_single_receipt() { +async fn test_send_single_receipt() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -231,7 +231,7 @@ async fn send_single_receipt() { } #[async_test] -async fn send_multiple_receipts() { +async fn test_send_multiple_receipts() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("POST")) @@ -255,7 +255,7 @@ async fn send_multiple_receipts() { } #[async_test] -async fn typing_notice() { +async fn test_typing_notice() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("PUT")) @@ -277,7 +277,7 @@ async fn typing_notice() { } #[async_test] -async fn room_state_event_send() { +async fn test_room_state_event_send() { use ruma::events::room::member::{MembershipState, RoomMemberEventContent}; let (client, server) = logged_in_client_with_server().await; @@ -307,7 +307,7 @@ async fn room_state_event_send() { } #[async_test] -async fn room_message_send() { +async fn test_room_message_send() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("PUT")) @@ -334,7 +334,7 @@ async fn room_message_send() { } #[async_test] -async fn room_attachment_send() { +async fn test_room_attachment_send() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("PUT")) @@ -382,7 +382,7 @@ async fn room_attachment_send() { } #[async_test] -async fn room_attachment_send_info() { +async fn test_room_attachment_send_info() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("PUT")) @@ -436,7 +436,7 @@ async fn room_attachment_send_info() { } #[async_test] -async fn room_attachment_send_wrong_info() { +async fn test_room_attachment_send_wrong_info() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("PUT")) @@ -489,7 +489,7 @@ async fn room_attachment_send_wrong_info() { } #[async_test] -async fn room_attachment_send_info_thumbnail() { +async fn test_room_attachment_send_info_thumbnail() { let (client, server) = logged_in_client_with_server().await; Mock::given(method("PUT")) @@ -558,7 +558,7 @@ async fn room_attachment_send_info_thumbnail() { } #[async_test] -async fn room_redact() { +async fn test_room_redact() { let (client, server) = synced_client().await; Mock::given(method("PUT")) @@ -581,7 +581,7 @@ async fn room_redact() { #[cfg(not(target_arch = "wasm32"))] #[tokio::test(flavor = "multi_thread", worker_threads = 4)] -async fn fetch_members_deduplication() { +async fn test_fetch_members_deduplication() { let (client, server) = synced_client().await; // We don't need any members, we're just checking if we're correctly @@ -622,7 +622,7 @@ async fn fetch_members_deduplication() { } #[async_test] -async fn set_name() { +async fn test_set_name() { let (client, server) = synced_client().await; mock_sync(&server, &*test_json::SYNC, None).await; @@ -647,7 +647,7 @@ async fn set_name() { } #[async_test] -async fn report_content() { +async fn test_report_content() { let (client, server) = logged_in_client_with_server().await; let reason = "I am offended"; @@ -680,7 +680,7 @@ async fn report_content() { } #[async_test] -async fn subscribe_to_typing_notifications() { +async fn test_subscribe_to_typing_notifications() { let (client, server) = logged_in_client_with_server().await; let typing_sequences: Arc>>> = Arc::new(Mutex::new(Vec::new())); // The expected typing sequences that we will receive, note that the current @@ -688,11 +688,11 @@ async fn subscribe_to_typing_notifications() { let asserted_typing_sequences = vec![vec![user_id!("@alice:matrix.org"), user_id!("@bob:example.com")], vec![]]; let room_id = room_id!("!test:example.org"); - let mut ev_builder = SyncResponseBuilder::new(); + let mut sync_builder = SyncResponseBuilder::new(); // Initial sync with our test room. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -718,7 +718,7 @@ async fn subscribe_to_typing_notifications() { // Then send a typing notification with 3 users typing, including the current // user. - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { "user_ids": [ @@ -731,12 +731,12 @@ async fn subscribe_to_typing_notifications() { "type": "m.typing" })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; // Then send a typing notification with no user typing - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_ephemeral_event( EphemeralTestEvent::Custom(json!({ "content": { "user_ids": [] @@ -745,7 +745,7 @@ async fn subscribe_to_typing_notifications() { "type": "m.typing" })), )); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; @@ -754,7 +754,7 @@ async fn subscribe_to_typing_notifications() { } #[async_test] -async fn get_suggested_user_role() { +async fn test_get_suggested_user_role() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*test_json::DEFAULT_SYNC_SUMMARY, None).await; @@ -773,7 +773,7 @@ async fn get_suggested_user_role() { } #[async_test] -async fn get_power_level_for_user() { +async fn test_get_power_level_for_user() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*test_json::DEFAULT_SYNC_SUMMARY, None).await; @@ -793,7 +793,7 @@ async fn get_power_level_for_user() { } #[async_test] -async fn get_users_with_power_levels() { +async fn test_get_users_with_power_levels() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*test_json::sync::SYNC_ADMIN_AND_MOD, None).await; @@ -809,7 +809,7 @@ async fn get_users_with_power_levels() { } #[async_test] -async fn get_users_with_power_levels_is_empty_if_power_level_info_is_not_available() { +async fn test_get_users_with_power_levels_is_empty_if_power_level_info_is_not_available() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*test_json::INVITE_SYNC, None).await; @@ -823,7 +823,7 @@ async fn get_users_with_power_levels_is_empty_if_power_level_info_is_not_availab } #[async_test] -async fn reset_power_levels() { +async fn test_reset_power_levels() { let (client, server) = logged_in_client_with_server().await; mock_sync(&server, &*CUSTOM_ROOM_POWER_LEVELS, None).await; diff --git a/crates/matrix-sdk/tests/integration/room/notification_mode.rs b/crates/matrix-sdk/tests/integration/room/notification_mode.rs index 8f36a6f35e5..1e2a347a7e6 100644 --- a/crates/matrix-sdk/tests/integration/room/notification_mode.rs +++ b/crates/matrix-sdk/tests/integration/room/notification_mode.rs @@ -17,7 +17,7 @@ use wiremock::{ use crate::{logged_in_client_with_server, mock_sync}; #[async_test] -async fn get_notification_mode() { +async fn test_get_notification_mode() { let room_no_rules_id = room_id!("!jEsUZKDJdhlrceRyVU:localhost"); let room_not_joined_id = room_id!("!aBfUOMDJhmtucfVzGa:localhost"); let (client, server) = logged_in_client_with_server().await; @@ -25,13 +25,13 @@ async fn get_notification_mode() { let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); // Add the rooms for the tests - let mut ev_builder = SyncResponseBuilder::new(); - ev_builder.add_joined_room(JoinedRoomBuilder::new(&DEFAULT_TEST_ROOM_ID)); - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_no_rules_id)); - ev_builder.add_invited_room(InvitedRoomBuilder::new(room_not_joined_id)); - ev_builder.add_global_account_data_event(GlobalAccountDataTestEvent::PushRules); + let mut sync_builder = SyncResponseBuilder::new(); + sync_builder.add_joined_room(JoinedRoomBuilder::new(&DEFAULT_TEST_ROOM_ID)); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_no_rules_id)); + sync_builder.add_invited_room(InvitedRoomBuilder::new(room_not_joined_id)); + sync_builder.add_global_account_data_event(GlobalAccountDataTestEvent::PushRules); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; let _response = client.sync_once(sync_settings.clone()).await.unwrap(); server.reset().await; diff --git a/crates/matrix-sdk/tests/integration/room/tags.rs b/crates/matrix-sdk/tests/integration/room/tags.rs index 43b964d4ab5..dc48244d3da 100644 --- a/crates/matrix-sdk/tests/integration/room/tags.rs +++ b/crates/matrix-sdk/tests/integration/room/tags.rs @@ -44,7 +44,7 @@ async fn mock_tag_api( async fn mock_sync_with_tags( server: &MockServer, - ev_builder: &mut SyncResponseBuilder, + sync_builder: &mut SyncResponseBuilder, room_id: &RoomId, tags: Tags, ) { @@ -54,10 +54,10 @@ async fn mock_sync_with_tags( }, "type": "m.tag" }); - ev_builder.add_joined_room( + sync_builder.add_joined_room( JoinedRoomBuilder::new(room_id).add_account_data(RoomAccountDataTestEvent::Custom(json)), ); - mock_sync(server, ev_builder.build_json_sync_response(), None).await; + mock_sync(server, sync_builder.build_json_sync_response(), None).await; } async fn sync_once(client: &Client, server: &MockServer) { @@ -67,13 +67,13 @@ async fn sync_once(client: &Client, server: &MockServer) { } async fn synced_client_with_room( - ev_builder: &mut SyncResponseBuilder, + sync_builder: &mut SyncResponseBuilder, room_id: &RoomId, ) -> (Client, Room, MockServer) { let (client, server) = logged_in_client_with_server().await; - ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); + sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id)); - mock_sync(&server, ev_builder.build_json_sync_response(), None).await; + mock_sync(&server, sync_builder.build_json_sync_response(), None).await; sync_once(&client, &server).await; let room = client.get_room(room_id).unwrap(); @@ -83,8 +83,8 @@ async fn synced_client_with_room( #[async_test] async fn test_set_favourite() { let room_id = room_id!("!test:example.org"); - let mut ev_builder = SyncResponseBuilder::new(); - let (client, room, server) = synced_client_with_room(&mut ev_builder, room_id).await; + let mut sync_builder = SyncResponseBuilder::new(); + let (client, room, server) = synced_client_with_room(&mut sync_builder, room_id).await; // Not favourite. assert!(room.is_favourite().not()); @@ -96,7 +96,7 @@ async fn test_set_favourite() { // Mock the response from the server. let tags = BTreeMap::from([(TagName::Favorite, TagInfo::default())]); - mock_sync_with_tags(&server, &mut ev_builder, room_id, tags).await; + mock_sync_with_tags(&server, &mut sync_builder, room_id, tags).await; sync_once(&client, &server).await; // Favourite! @@ -108,12 +108,12 @@ async fn test_set_favourite() { #[async_test] async fn test_set_favourite_on_low_priority_room() { let room_id = room_id!("!test:example.org"); - let mut ev_builder = SyncResponseBuilder::new(); - let (client, room, server) = synced_client_with_room(&mut ev_builder, room_id).await; + let mut sync_builder = SyncResponseBuilder::new(); + let (client, room, server) = synced_client_with_room(&mut sync_builder, room_id).await; // Mock a response from the server setting the room as low priority. let tags = BTreeMap::from([(TagName::LowPriority, TagInfo::default())]); - mock_sync_with_tags(&server, &mut ev_builder, room_id, tags).await; + mock_sync_with_tags(&server, &mut sync_builder, room_id, tags).await; sync_once(&client, &server).await; // Not favourite, but low priority! @@ -129,7 +129,7 @@ async fn test_set_favourite_on_low_priority_room() { // Mock the response from the server. let tags = BTreeMap::from([(TagName::Favorite, TagInfo::default())]); - mock_sync_with_tags(&server, &mut ev_builder, room_id, tags).await; + mock_sync_with_tags(&server, &mut sync_builder, room_id, tags).await; sync_once(&client, &server).await; // Favourite, and not low priority! @@ -142,8 +142,8 @@ async fn test_set_favourite_on_low_priority_room() { #[async_test] async fn test_unset_favourite() { let room_id = room_id!("!test:example.org"); - let mut ev_builder = SyncResponseBuilder::new(); - let (_client, room, server) = synced_client_with_room(&mut ev_builder, room_id).await; + let mut sync_builder = SyncResponseBuilder::new(); + let (_client, room, server) = synced_client_with_room(&mut sync_builder, room_id).await; // Server will be called to unset the room as favourite. mock_tag_api(&server, TagName::Favorite, TagOperation::Remove, 1).await; @@ -156,8 +156,8 @@ async fn test_unset_favourite() { #[async_test] async fn test_set_low_priority() { let room_id = room_id!("!test:example.org"); - let mut ev_builder = SyncResponseBuilder::new(); - let (client, room, server) = synced_client_with_room(&mut ev_builder, room_id).await; + let mut sync_builder = SyncResponseBuilder::new(); + let (client, room, server) = synced_client_with_room(&mut sync_builder, room_id).await; // Not low prioriry. assert!(room.is_low_priority().not()); @@ -169,7 +169,7 @@ async fn test_set_low_priority() { // Mock the response from the server. let tags = BTreeMap::from([(TagName::LowPriority, TagInfo::default())]); - mock_sync_with_tags(&server, &mut ev_builder, room_id, tags).await; + mock_sync_with_tags(&server, &mut sync_builder, room_id, tags).await; sync_once(&client, &server).await; // Low priority! @@ -181,12 +181,12 @@ async fn test_set_low_priority() { #[async_test] async fn test_set_low_priority_on_favourite_room() { let room_id = room_id!("!test:example.org"); - let mut ev_builder = SyncResponseBuilder::new(); - let (client, room, server) = synced_client_with_room(&mut ev_builder, room_id).await; + let mut sync_builder = SyncResponseBuilder::new(); + let (client, room, server) = synced_client_with_room(&mut sync_builder, room_id).await; // Mock a response from the server setting the room as favourite. let tags = BTreeMap::from([(TagName::Favorite, TagInfo::default())]); - mock_sync_with_tags(&server, &mut ev_builder, room_id, tags).await; + mock_sync_with_tags(&server, &mut sync_builder, room_id, tags).await; sync_once(&client, &server).await; // Favourite, but not low priority! @@ -202,7 +202,7 @@ async fn test_set_low_priority_on_favourite_room() { // Mock the response from the server. let tags = BTreeMap::from([(TagName::LowPriority, TagInfo::default())]); - mock_sync_with_tags(&server, &mut ev_builder, room_id, tags).await; + mock_sync_with_tags(&server, &mut sync_builder, room_id, tags).await; sync_once(&client, &server).await; // Not favourite, and low priority! @@ -215,8 +215,8 @@ async fn test_set_low_priority_on_favourite_room() { #[async_test] async fn test_unset_low_priority() { let room_id = room_id!("!test:example.org"); - let mut ev_builder = SyncResponseBuilder::new(); - let (_client, room, server) = synced_client_with_room(&mut ev_builder, room_id).await; + let mut sync_builder = SyncResponseBuilder::new(); + let (_client, room, server) = synced_client_with_room(&mut sync_builder, room_id).await; // Server will be called to unset the room as favourite. mock_tag_api(&server, TagName::LowPriority, TagOperation::Remove, 1).await;