Skip to content

Commit 3fc3f0a

Browse files
HywanHywan
committed
test(sdk): Use EventFactory to simplify the test cases.
1 parent fbf3c0e commit 3fc3f0a

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
@@ -130,30 +130,28 @@ pub enum Decoration<I> {
130130
mod tests {
131131
use assert_matches2::assert_let;
132132
use matrix_sdk_base::deserialized_responses::SyncTimelineEvent;
133-
use matrix_sdk_test::{EventBuilder, ALICE};
134-
use ruma::{events::room::message::RoomMessageEventContent, owned_event_id, EventId};
133+
use ruma::{owned_event_id, user_id, EventId};
135134

136135
use super::*;
137-
138-
fn sync_timeline_event(event_builder: &EventBuilder, event_id: &EventId) -> SyncTimelineEvent {
139-
SyncTimelineEvent::new(event_builder.make_sync_message_event_with_id(
140-
*ALICE,
141-
event_id,
142-
RoomMessageEventContent::text_plain("foo"),
143-
))
136+
use crate::test_utils::events::EventFactory;
137+
138+
fn sync_timeline_event(event_id: &EventId) -> SyncTimelineEvent {
139+
EventFactory::new()
140+
.text_msg("")
141+
.sender(user_id!("@mnt_io:matrix.org"))
142+
.event_id(event_id)
143+
.into_sync()
144144
}
145145

146146
#[test]
147147
fn test_filter_no_duplicate() {
148-
let event_builder = EventBuilder::new();
149-
150148
let event_id_0 = owned_event_id!("$ev0");
151149
let event_id_1 = owned_event_id!("$ev1");
152150
let event_id_2 = owned_event_id!("$ev2");
153151

154-
let event_0 = sync_timeline_event(&event_builder, &event_id_0);
155-
let event_1 = sync_timeline_event(&event_builder, &event_id_1);
156-
let event_2 = sync_timeline_event(&event_builder, &event_id_2);
152+
let event_0 = sync_timeline_event(&event_id_0);
153+
let event_1 = sync_timeline_event(&event_id_1);
154+
let event_2 = sync_timeline_event(&event_id_2);
157155

158156
let deduplicator = Deduplicator::new();
159157
let existing_events = RoomEvents::new();
@@ -175,13 +173,11 @@ mod tests {
175173

176174
#[test]
177175
fn test_filter_duplicates_in_new_events() {
178-
let event_builder = EventBuilder::new();
179-
180176
let event_id_0 = owned_event_id!("$ev0");
181177
let event_id_1 = owned_event_id!("$ev1");
182178

183-
let event_0 = sync_timeline_event(&event_builder, &event_id_0);
184-
let event_1 = sync_timeline_event(&event_builder, &event_id_1);
179+
let event_0 = sync_timeline_event(&event_id_0);
180+
let event_1 = sync_timeline_event(&event_id_1);
185181

186182
let deduplicator = Deduplicator::new();
187183
let existing_events = RoomEvents::new();
@@ -210,15 +206,13 @@ mod tests {
210206

211207
#[test]
212208
fn test_filter_duplicates_with_existing_events() {
213-
let event_builder = EventBuilder::new();
214-
215209
let event_id_0 = owned_event_id!("$ev0");
216210
let event_id_1 = owned_event_id!("$ev1");
217211
let event_id_2 = owned_event_id!("$ev2");
218212

219-
let event_0 = sync_timeline_event(&event_builder, &event_id_0);
220-
let event_1 = sync_timeline_event(&event_builder, &event_id_1);
221-
let event_2 = sync_timeline_event(&event_builder, &event_id_2);
213+
let event_0 = sync_timeline_event(&event_id_0);
214+
let event_1 = sync_timeline_event(&event_id_1);
215+
let event_2 = sync_timeline_event(&event_id_2);
222216

223217
let deduplicator = Deduplicator::new();
224218
let mut existing_events = RoomEvents::new();

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

Lines changed: 44 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ impl fmt::Debug for RoomEvents {
319319
#[cfg(test)]
320320
mod tests {
321321
use assert_matches2::assert_let;
322-
use matrix_sdk_test::{EventBuilder, ALICE};
323-
use ruma::{events::room::message::RoomMessageEventContent, EventId, OwnedEventId};
322+
use ruma::{user_id, EventId, OwnedEventId};
324323

325324
use super::*;
325+
use crate::test_utils::events::EventFactory;
326326

327327
macro_rules! assert_events_eq {
328328
( $events_iterator:expr, [ $( ( $event_id:ident at ( $chunk_identifier:literal, $index:literal ) ) ),* $(,)? ] ) => {
@@ -341,14 +341,13 @@ mod tests {
341341
};
342342
}
343343

344-
fn new_event(event_builder: &EventBuilder, event_id: &str) -> (OwnedEventId, Event) {
344+
fn new_event(event_id: &str) -> (OwnedEventId, Event) {
345345
let event_id = EventId::parse(event_id).unwrap();
346-
347-
let event = SyncTimelineEvent::new(event_builder.make_sync_message_event_with_id(
348-
*ALICE,
349-
&event_id,
350-
RoomMessageEventContent::text_plain("foo"),
351-
));
346+
let event = EventFactory::new()
347+
.text_msg("")
348+
.sender(user_id!("@mnt_io:matrix.org"))
349+
.event_id(&event_id)
350+
.into_sync();
352351

353352
(event_id, event)
354353
}
@@ -362,11 +361,9 @@ mod tests {
362361

363362
#[test]
364363
fn test_push_events() {
365-
let event_builder = EventBuilder::new();
366-
367-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
368-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
369-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
364+
let (event_id_0, event_0) = new_event("$ev0");
365+
let (event_id_1, event_1) = new_event("$ev1");
366+
let (event_id_2, event_2) = new_event("$ev2");
370367

371368
let mut room_events = RoomEvents::new();
372369

@@ -385,10 +382,8 @@ mod tests {
385382

386383
#[test]
387384
fn test_push_events_with_duplicates() {
388-
let event_builder = EventBuilder::new();
389-
390-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
391-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
385+
let (event_id_0, event_0) = new_event("$ev0");
386+
let (event_id_1, event_1) = new_event("$ev1");
392387

393388
let mut room_events = RoomEvents::new();
394389

@@ -417,10 +412,8 @@ mod tests {
417412

418413
#[test]
419414
fn test_push_gap() {
420-
let event_builder = EventBuilder::new();
421-
422-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
423-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
415+
let (event_id_0, event_0) = new_event("$ev0");
416+
let (event_id_1, event_1) = new_event("$ev1");
424417

425418
let mut room_events = RoomEvents::new();
426419

@@ -454,11 +447,9 @@ mod tests {
454447

455448
#[test]
456449
fn test_insert_events_at() {
457-
let event_builder = EventBuilder::new();
458-
459-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
460-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
461-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
450+
let (event_id_0, event_0) = new_event("$ev0");
451+
let (event_id_1, event_1) = new_event("$ev1");
452+
let (event_id_2, event_2) = new_event("$ev2");
462453

463454
let mut room_events = RoomEvents::new();
464455

@@ -485,12 +476,10 @@ mod tests {
485476

486477
#[test]
487478
fn test_insert_events_at_with_duplicates() {
488-
let event_builder = EventBuilder::new();
489-
490-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
491-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
492-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
493-
let (event_id_3, event_3) = new_event(&event_builder, "$ev3");
479+
let (event_id_0, event_0) = new_event("$ev0");
480+
let (event_id_1, event_1) = new_event("$ev1");
481+
let (event_id_2, event_2) = new_event("$ev2");
482+
let (event_id_3, event_3) = new_event("$ev3");
494483

495484
let mut room_events = RoomEvents::new();
496485

@@ -529,10 +518,8 @@ mod tests {
529518

530519
#[test]
531520
fn test_insert_gap_at() {
532-
let event_builder = EventBuilder::new();
533-
534-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
535-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
521+
let (event_id_0, event_0) = new_event("$ev0");
522+
let (event_id_1, event_1) = new_event("$ev1");
536523

537524
let mut room_events = RoomEvents::new();
538525

@@ -575,11 +562,9 @@ mod tests {
575562

576563
#[test]
577564
fn test_replace_gap_at() {
578-
let event_builder = EventBuilder::new();
579-
580-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
581-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
582-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
565+
let (event_id_0, event_0) = new_event("$ev0");
566+
let (event_id_1, event_1) = new_event("$ev1");
567+
let (event_id_2, event_2) = new_event("$ev2");
583568

584569
let mut room_events = RoomEvents::new();
585570

@@ -618,11 +603,9 @@ mod tests {
618603

619604
#[test]
620605
fn test_replace_gap_at_with_duplicates() {
621-
let event_builder = EventBuilder::new();
622-
623-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
624-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
625-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
606+
let (event_id_0, event_0) = new_event("$ev0");
607+
let (event_id_1, event_1) = new_event("$ev1");
608+
let (event_id_2, event_2) = new_event("$ev2");
626609

627610
let mut room_events = RoomEvents::new();
628611

@@ -671,12 +654,10 @@ mod tests {
671654

672655
#[test]
673656
fn test_remove_events() {
674-
let event_builder = EventBuilder::new();
675-
676-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
677-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
678-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
679-
let (event_id_3, event_3) = new_event(&event_builder, "$ev3");
657+
let (event_id_0, event_0) = new_event("$ev0");
658+
let (event_id_1, event_1) = new_event("$ev1");
659+
let (event_id_2, event_2) = new_event("$ev2");
660+
let (event_id_3, event_3) = new_event("$ev3");
680661

681662
// Push some events.
682663
let mut room_events = RoomEvents::new();
@@ -706,9 +687,7 @@ mod tests {
706687

707688
#[test]
708689
fn test_remove_events_unknown_event() {
709-
let event_builder = EventBuilder::new();
710-
711-
let (event_id_0, _event_0) = new_event(&event_builder, "$ev0");
690+
let (event_id_0, _event_0) = new_event("$ev0");
712691

713692
// Push ZERO event.
714693
let mut room_events = RoomEvents::new();
@@ -727,17 +706,15 @@ mod tests {
727706

728707
#[test]
729708
fn test_remove_events_and_update_insert_position() {
730-
let event_builder = EventBuilder::new();
731-
732-
let (event_id_0, event_0) = new_event(&event_builder, "$ev0");
733-
let (event_id_1, event_1) = new_event(&event_builder, "$ev1");
734-
let (event_id_2, event_2) = new_event(&event_builder, "$ev2");
735-
let (event_id_3, event_3) = new_event(&event_builder, "$ev3");
736-
let (event_id_4, event_4) = new_event(&event_builder, "$ev4");
737-
let (event_id_5, event_5) = new_event(&event_builder, "$ev5");
738-
let (event_id_6, event_6) = new_event(&event_builder, "$ev6");
739-
let (event_id_7, event_7) = new_event(&event_builder, "$ev7");
740-
let (event_id_8, event_8) = new_event(&event_builder, "$ev8");
709+
let (event_id_0, event_0) = new_event("$ev0");
710+
let (event_id_1, event_1) = new_event("$ev1");
711+
let (event_id_2, event_2) = new_event("$ev2");
712+
let (event_id_3, event_3) = new_event("$ev3");
713+
let (event_id_4, event_4) = new_event("$ev4");
714+
let (event_id_5, event_5) = new_event("$ev5");
715+
let (event_id_6, event_6) = new_event("$ev6");
716+
let (event_id_7, event_7) = new_event("$ev7");
717+
let (event_id_8, event_8) = new_event("$ev8");
741718

742719
// Push some events.
743720
let mut room_events = RoomEvents::new();

0 commit comments

Comments
 (0)