Skip to content

Commit 35faeea

Browse files
HywanHywan
committed
test(sdk): Use EventFactory to simplify the test cases.
1 parent be2e20d commit 35faeea

File tree

2 files changed

+61
-90
lines changed

2 files changed

+61
-90
lines changed

‎crates/matrix-sdk/src/event_cache/deduplicator.rs

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -136,30 +136,28 @@ pub enum Decoration<I> {
136136
mod tests {
137137
use assert_matches2::assert_let;
138138
use matrix_sdk_base::deserialized_responses::SyncTimelineEvent;
139-
use matrix_sdk_test::{EventBuilder, ALICE};
140-
use ruma::{events::room::message::RoomMessageEventContent, owned_event_id, EventId};
139+
use ruma::{owned_event_id, user_id, EventId};
141140

142141
use super::*;
143-
144-
fn sync_timeline_event(event_builder: &EventBuilder, event_id: &EventId) -> SyncTimelineEvent {
145-
SyncTimelineEvent::new(event_builder.make_sync_message_event_with_id(
146-
*ALICE,
147-
event_id,
148-
RoomMessageEventContent::text_plain("foo"),
149-
))
142+
use crate::test_utils::events::EventFactory;
143+
144+
fn sync_timeline_event(event_id: &EventId) -> SyncTimelineEvent {
145+
EventFactory::new()
146+
.text_msg("")
147+
.sender(user_id!("@mnt_io:matrix.org"))
148+
.event_id(event_id)
149+
.into_sync()
150150
}
151151

152152
#[test]
153153
fn test_filter_no_duplicate() {
154-
let event_builder = EventBuilder::new();
155-
156154
let event_id_0 = owned_event_id!("$ev0");
157155
let event_id_1 = owned_event_id!("$ev1");
158156
let event_id_2 = owned_event_id!("$ev2");
159157

160-
let event_0 = sync_timeline_event(&event_builder, &event_id_0);
161-
let event_1 = sync_timeline_event(&event_builder, &event_id_1);
162-
let event_2 = sync_timeline_event(&event_builder, &event_id_2);
158+
let event_0 = sync_timeline_event(&event_id_0);
159+
let event_1 = sync_timeline_event(&event_id_1);
160+
let event_2 = sync_timeline_event(&event_id_2);
163161

164162
let deduplicator = Deduplicator::new();
165163
let existing_events = RoomEvents::new();
@@ -181,13 +179,11 @@ mod tests {
181179

182180
#[test]
183181
fn test_filter_duplicates_in_new_events() {
184-
let event_builder = EventBuilder::new();
185-
186182
let event_id_0 = owned_event_id!("$ev0");
187183
let event_id_1 = owned_event_id!("$ev1");
188184

189-
let event_0 = sync_timeline_event(&event_builder, &event_id_0);
190-
let event_1 = sync_timeline_event(&event_builder, &event_id_1);
185+
let event_0 = sync_timeline_event(&event_id_0);
186+
let event_1 = sync_timeline_event(&event_id_1);
191187

192188
let deduplicator = Deduplicator::new();
193189
let existing_events = RoomEvents::new();
@@ -216,15 +212,13 @@ mod tests {
216212

217213
#[test]
218214
fn test_filter_duplicates_with_existing_events() {
219-
let event_builder = EventBuilder::new();
220-
221215
let event_id_0 = owned_event_id!("$ev0");
222216
let event_id_1 = owned_event_id!("$ev1");
223217
let event_id_2 = owned_event_id!("$ev2");
224218

225-
let event_0 = sync_timeline_event(&event_builder, &event_id_0);
226-
let event_1 = sync_timeline_event(&event_builder, &event_id_1);
227-
let event_2 = sync_timeline_event(&event_builder, &event_id_2);
219+
let event_0 = sync_timeline_event(&event_id_0);
220+
let event_1 = sync_timeline_event(&event_id_1);
221+
let event_2 = sync_timeline_event(&event_id_2);
228222

229223
let deduplicator = Deduplicator::new();
230224
let mut existing_events = RoomEvents::new();

‎crates/matrix-sdk/src/event_cache/room/events.rs

Lines changed: 44 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ impl RoomEvents {
314314
#[cfg(test)]
315315
mod tests {
316316
use assert_matches2::assert_let;
317-
use matrix_sdk_test::{EventBuilder, ALICE};
318-
use ruma::{events::room::message::RoomMessageEventContent, EventId, OwnedEventId};
317+
use ruma::{user_id, EventId, OwnedEventId};
319318

320319
use super::*;
320+
use crate::test_utils::events::EventFactory;
321321

322322
macro_rules! assert_events_eq {
323323
( $events_iterator:expr, [ $( ( $event_id:ident at ( $chunk_identifier:literal, $index:literal ) ) ),* $(,)? ] ) => {
@@ -336,14 +336,13 @@ mod tests {
336336
};
337337
}
338338

339-
fn new_event(event_builder: &EventBuilder, event_id: &str) -> (OwnedEventId, Event) {
339+
fn new_event(event_id: &str) -> (OwnedEventId, Event) {
340340
let event_id = EventId::parse(event_id).unwrap();
341-
342-
let event = SyncTimelineEvent::new(event_builder.make_sync_message_event_with_id(
343-
*ALICE,
344-
&event_id,
345-
RoomMessageEventContent::text_plain("foo"),
346-
));
341+
let event = EventFactory::new()
342+
.text_msg("")
343+
.sender(user_id!("@mnt_io:matrix.org"))
344+
.event_id(&event_id)
345+
.into_sync();
347346

348347
(event_id, event)
349348
}
@@ -357,11 +356,9 @@ mod tests {
357356

358357
#[test]
359358
fn test_push_events() {
360-
let event_builder = EventBuilder::new();
361-
362-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
363-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
364-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
359+
let (event_id_0, event_0) = new_event("$ev0");
360+
let (event_id_1, event_1) = new_event("$ev1");
361+
let (event_id_2, event_2) = new_event("$ev2");
365362

366363
let mut room_events = RoomEvents::new();
367364

@@ -380,10 +377,8 @@ mod tests {
380377

381378
#[test]
382379
fn test_push_events_with_duplicates() {
383-
let event_builder = EventBuilder::new();
384-
385-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
386-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
380+
let (event_id_0, event_0) = new_event("$ev0");
381+
let (event_id_1, event_1) = new_event("$ev1");
387382

388383
let mut room_events = RoomEvents::new();
389384

@@ -412,10 +407,8 @@ mod tests {
412407

413408
#[test]
414409
fn test_push_gap() {
415-
let event_builder = EventBuilder::new();
416-
417-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
418-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
410+
let (event_id_0, event_0) = new_event("$ev0");
411+
let (event_id_1, event_1) = new_event("$ev1");
419412

420413
let mut room_events = RoomEvents::new();
421414

@@ -449,11 +442,9 @@ mod tests {
449442

450443
#[test]
451444
fn test_insert_events_at() {
452-
let event_builder = EventBuilder::new();
453-
454-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
455-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
456-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
445+
let (event_id_0, event_0) = new_event("$ev0");
446+
let (event_id_1, event_1) = new_event("$ev1");
447+
let (event_id_2, event_2) = new_event("$ev2");
457448

458449
let mut room_events = RoomEvents::new();
459450

@@ -480,12 +471,10 @@ mod tests {
480471

481472
#[test]
482473
fn test_insert_events_at_with_duplicates() {
483-
let event_builder = EventBuilder::new();
484-
485-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
486-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
487-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
488-
let (event_id_3, event_3) = new_event(&event_builder, "$ev3");
474+
let (event_id_0, event_0) = new_event("$ev0");
475+
let (event_id_1, event_1) = new_event("$ev1");
476+
let (event_id_2, event_2) = new_event("$ev2");
477+
let (event_id_3, event_3) = new_event("$ev3");
489478

490479
let mut room_events = RoomEvents::new();
491480

@@ -524,10 +513,8 @@ mod tests {
524513

525514
#[test]
526515
fn test_insert_gap_at() {
527-
let event_builder = EventBuilder::new();
528-
529-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
530-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
516+
let (event_id_0, event_0) = new_event("$ev0");
517+
let (event_id_1, event_1) = new_event("$ev1");
531518

532519
let mut room_events = RoomEvents::new();
533520

@@ -570,11 +557,9 @@ mod tests {
570557

571558
#[test]
572559
fn test_replace_gap_at() {
573-
let event_builder = EventBuilder::new();
574-
575-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
576-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
577-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
560+
let (event_id_0, event_0) = new_event("$ev0");
561+
let (event_id_1, event_1) = new_event("$ev1");
562+
let (event_id_2, event_2) = new_event("$ev2");
578563

579564
let mut room_events = RoomEvents::new();
580565

@@ -613,11 +598,9 @@ mod tests {
613598

614599
#[test]
615600
fn test_replace_gap_at_with_duplicates() {
616-
let event_builder = EventBuilder::new();
617-
618-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
619-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
620-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
601+
let (event_id_0, event_0) = new_event("$ev0");
602+
let (event_id_1, event_1) = new_event("$ev1");
603+
let (event_id_2, event_2) = new_event("$ev2");
621604

622605
let mut room_events = RoomEvents::new();
623606

@@ -666,12 +649,10 @@ mod tests {
666649

667650
#[test]
668651
fn test_remove_events() {
669-
let event_builder = EventBuilder::new();
670-
671-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
672-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
673-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
674-
let (event_id_3, event_3) = new_event(&event_builder, "$ev3");
652+
let (event_id_0, event_0) = new_event("$ev0");
653+
let (event_id_1, event_1) = new_event("$ev1");
654+
let (event_id_2, event_2) = new_event("$ev2");
655+
let (event_id_3, event_3) = new_event("$ev3");
675656

676657
// Push some events.
677658
let mut room_events = RoomEvents::new();
@@ -701,9 +682,7 @@ mod tests {
701682

702683
#[test]
703684
fn test_remove_events_unknown_event() {
704-
let event_builder = EventBuilder::new();
705-
706-
let (event_id_0, _event_0) = new_event(&event_builder, "$ev0");
685+
let (event_id_0, _event_0) = new_event("$ev0");
707686

708687
// Push ZERO event.
709688
let mut room_events = RoomEvents::new();
@@ -722,17 +701,15 @@ mod tests {
722701

723702
#[test]
724703
fn test_remove_events_and_update_insert_position() {
725-
let event_builder = EventBuilder::new();
726-
727-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
728-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
729-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
730-
let (event_id_3, event_3) = new_event(&event_builder, "$ev3");
731-
let (event_id_4, event_4) = new_event(&event_builder, "$ev4");
732-
let (event_id_5, event_5) = new_event(&event_builder, "$ev5");
733-
let (event_id_6, event_6) = new_event(&event_builder, "$ev6");
734-
let (event_id_7, event_7) = new_event(&event_builder, "$ev7");
735-
let (event_id_8, event_8) = new_event(&event_builder, "$ev8");
704+
let (event_id_0, event_0) = new_event("$ev0");
705+
let (event_id_1, event_1) = new_event("$ev1");
706+
let (event_id_2, event_2) = new_event("$ev2");
707+
let (event_id_3, event_3) = new_event("$ev3");
708+
let (event_id_4, event_4) = new_event("$ev4");
709+
let (event_id_5, event_5) = new_event("$ev5");
710+
let (event_id_6, event_6) = new_event("$ev6");
711+
let (event_id_7, event_7) = new_event("$ev7");
712+
let (event_id_8, event_8) = new_event("$ev8");
736713

737714
// Push some events.
738715
let mut room_events = RoomEvents::new();

0 commit comments

Comments
 (0)