Skip to content

Commit 26afd89

Browse files
committed
test(base): Use EventFactory instead of JSON hardcoded value.
This patch updates two tests to use the `EventFactory` to replace JSON hardcoded values to represent the events.
1 parent bfac815 commit 26afd89

File tree

1 file changed

+19
-39
lines changed

1 file changed

+19
-39
lines changed

crates/matrix-sdk-base/src/room/tombstone.rs

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,9 @@ mod tests {
116116

117117
use assert_matches::assert_matches;
118118
use matrix_sdk_test::{
119-
async_test, event_factory::EventFactory, JoinedRoomBuilder, StateTestEvent,
120-
SyncResponseBuilder,
119+
async_test, event_factory::EventFactory, JoinedRoomBuilder, SyncResponseBuilder,
121120
};
122-
use ruma::{event_id, room_id, user_id};
123-
use serde_json::json;
121+
use ruma::{event_id, room_id, user_id, RoomVersionId};
124122

125123
use crate::{test_utils::logged_in_base_client, RoomState};
126124

@@ -212,22 +210,15 @@ mod tests {
212210

213211
let mut sync_builder = SyncResponseBuilder::new();
214212
let response = sync_builder
215-
.add_joined_room(JoinedRoomBuilder::new(room_id).add_state_event(
216-
StateTestEvent::Custom(json!({
217-
"content": {
218-
"creator": sender,
219-
// no `predecessor` field!
220-
},
221-
"event_id": "$ev0",
222-
"origin_server_ts": 42,
223-
"sender": sender,
224-
"state_key": "",
225-
"type": "m.room.create",
226-
"unsigned": {
227-
"age": 43
228-
}
229-
})),
230-
))
213+
.add_joined_room(
214+
JoinedRoomBuilder::new(room_id).add_timeline_event(
215+
EventFactory::new()
216+
.create(sender, RoomVersionId::V11)
217+
// No `predecessor` field!
218+
.no_predecessor()
219+
.into_raw_sync(),
220+
),
221+
)
231222
.build_sync_response();
232223

233224
client.receive_sync_response(response).await.unwrap();
@@ -247,25 +238,14 @@ mod tests {
247238

248239
let mut sync_builder = SyncResponseBuilder::new();
249240
let response = sync_builder
250-
.add_joined_room(JoinedRoomBuilder::new(room_id).add_state_event(
251-
StateTestEvent::Custom(json!({
252-
"content": {
253-
"creator": sender,
254-
"predecessor": {
255-
"event_id": predecessor_last_event_id,
256-
"room_id": predecessor_room_id,
257-
},
258-
},
259-
"event_id": "$ev0",
260-
"origin_server_ts": 42,
261-
"sender": sender,
262-
"state_key": "",
263-
"type": "m.room.create",
264-
"unsigned": {
265-
"age": 43
266-
}
267-
})),
268-
))
241+
.add_joined_room(
242+
JoinedRoomBuilder::new(room_id).add_timeline_event(
243+
EventFactory::new()
244+
.create(sender, RoomVersionId::V11)
245+
.predecessor(predecessor_room_id, predecessor_last_event_id)
246+
.into_raw_sync(),
247+
),
248+
)
269249
.build_sync_response();
270250

271251
client.receive_sync_response(response).await.unwrap();

0 commit comments

Comments
 (0)