Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: rename ev_builder to sync_builder + add test_ prefix to test functions #3371

Merged
merged 1 commit into from
May 2, 2024
Merged

tests: rename ev_builder to sync_builder + add test_ prefix to test functions #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions crates/matrix-sdk-base/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions crates/matrix-sdk-ui/tests/integration/notification_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
32 changes: 16 additions & 16 deletions crates/matrix-sdk-ui/tests/integration/timeline/echo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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!",
Expand All @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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!",
Expand All @@ -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 =
Expand All @@ -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;

Expand Down
14 changes: 7 additions & 7 deletions crates/matrix-sdk-ui/tests/integration/timeline/edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -67,15 +67,15 @@ 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,
RoomMessageEventContent::text_plain("hello"),
),
));

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;

Expand All @@ -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,
Expand All @@ -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;

Expand Down
Loading