@@ -234,35 +234,38 @@ void main() {
234
234
..messages.length.equals (200 );
235
235
});
236
236
237
- test ('maybeAddMessage ' , () async {
237
+ test ('handleMessageEvent ' , () async {
238
238
final stream = eg.stream ();
239
239
await prepare (narrow: StreamNarrow (stream.streamId));
240
240
await prepareMessages (foundOldest: true , messages:
241
241
List .generate (30 , (i) => eg.streamMessage (stream: stream)));
242
242
243
243
check (model).messages.length.equals (30 );
244
- model.maybeAddMessage (eg.streamMessage (stream: stream));
244
+ model.handleMessageEvent (MessageEvent (id: 0 ,
245
+ message: eg.streamMessage (stream: stream)));
245
246
checkNotifiedOnce ();
246
247
check (model).messages.length.equals (31 );
247
248
});
248
249
249
- test ('maybeAddMessage , not in narrow' , () async {
250
+ test ('handleMessageEvent , not in narrow' , () async {
250
251
final stream = eg.stream (streamId: 123 );
251
252
await prepare (narrow: StreamNarrow (stream.streamId));
252
253
await prepareMessages (foundOldest: true , messages:
253
254
List .generate (30 , (i) => eg.streamMessage (stream: stream)));
254
255
255
256
check (model).messages.length.equals (30 );
256
257
final otherStream = eg.stream (streamId: 234 );
257
- model.maybeAddMessage (eg.streamMessage (stream: otherStream));
258
+ model.handleMessageEvent (MessageEvent (id: 0 ,
259
+ message: eg.streamMessage (stream: otherStream)));
258
260
checkNotNotified ();
259
261
check (model).messages.length.equals (30 );
260
262
});
261
263
262
- test ('maybeAddMessage , before fetch' , () async {
264
+ test ('handleMessageEvent , before fetch' , () async {
263
265
final stream = eg.stream ();
264
266
await prepare (narrow: StreamNarrow (stream.streamId));
265
- model.maybeAddMessage (eg.streamMessage (stream: stream));
267
+ model.handleMessageEvent (MessageEvent (id: 0 ,
268
+ message: eg.streamMessage (stream: stream)));
266
269
checkNotNotified ();
267
270
check (model).fetched.isFalse ();
268
271
checkInvariants (model);
@@ -537,7 +540,8 @@ void main() {
537
540
await prepare (narrow: StreamNarrow (stream.streamId));
538
541
await prepareMessages (foundOldest: true , messages:
539
542
List .generate (30 , (i) => eg.streamMessage (stream: stream)));
540
- model.maybeAddMessage (eg.streamMessage (stream: stream));
543
+ model.handleMessageEvent (MessageEvent (id: 0 ,
544
+ message: eg.streamMessage (stream: stream)));
541
545
checkNotifiedOnce ();
542
546
check (model).messages.length.equals (31 );
543
547
@@ -592,24 +596,29 @@ void main() {
592
596
check (model.messages.map ((m) => m.id))
593
597
.deepEquals (expected..insertAll (0 , [101 , 103 , 105 ]));
594
598
595
- // … and on maybeAddMessage.
596
- model.maybeAddMessage (eg.streamMessage (id: 301 , stream: stream1, topic: 'A' ));
599
+ // … and on handleMessageEvent.
600
+ model.handleMessageEvent (MessageEvent (id: 0 ,
601
+ message: eg.streamMessage (id: 301 , stream: stream1, topic: 'A' )));
597
602
checkNotifiedOnce ();
598
603
check (model.messages.map ((m) => m.id)).deepEquals (expected..add (301 ));
599
604
600
- model.maybeAddMessage (eg.streamMessage (id: 302 , stream: stream1, topic: 'B' ));
605
+ model.handleMessageEvent (MessageEvent (id: 0 ,
606
+ message: eg.streamMessage (id: 302 , stream: stream1, topic: 'B' )));
601
607
checkNotNotified ();
602
608
check (model.messages.map ((m) => m.id)).deepEquals (expected);
603
609
604
- model.maybeAddMessage (eg.streamMessage (id: 303 , stream: stream2, topic: 'C' ));
610
+ model.handleMessageEvent (MessageEvent (id: 0 ,
611
+ message: eg.streamMessage (id: 303 , stream: stream2, topic: 'C' )));
605
612
checkNotifiedOnce ();
606
613
check (model.messages.map ((m) => m.id)).deepEquals (expected..add (303 ));
607
614
608
- model.maybeAddMessage (eg.streamMessage (id: 304 , stream: stream2, topic: 'D' ));
615
+ model.handleMessageEvent (MessageEvent (id: 0 ,
616
+ message: eg.streamMessage (id: 304 , stream: stream2, topic: 'D' )));
609
617
checkNotNotified ();
610
618
check (model.messages.map ((m) => m.id)).deepEquals (expected);
611
619
612
- model.maybeAddMessage (eg.dmMessage (id: 305 , from: eg.otherUser, to: [eg.selfUser]));
620
+ model.handleMessageEvent (MessageEvent (id: 0 ,
621
+ message: eg.dmMessage (id: 305 , from: eg.otherUser, to: [eg.selfUser])));
613
622
checkNotifiedOnce ();
614
623
check (model.messages.map ((m) => m.id)).deepEquals (expected..add (305 ));
615
624
});
@@ -644,16 +653,19 @@ void main() {
644
653
check (model.messages.map ((m) => m.id))
645
654
.deepEquals (expected..insertAll (0 , [101 , 102 ]));
646
655
647
- // … and on maybeAddMessage.
648
- model.maybeAddMessage (eg.streamMessage (id: 301 , stream: stream, topic: 'A' ));
656
+ // … and on handleMessageEvent.
657
+ model.handleMessageEvent (MessageEvent (id: 0 ,
658
+ message: eg.streamMessage (id: 301 , stream: stream, topic: 'A' )));
649
659
checkNotifiedOnce ();
650
660
check (model.messages.map ((m) => m.id)).deepEquals (expected..add (301 ));
651
661
652
- model.maybeAddMessage (eg.streamMessage (id: 302 , stream: stream, topic: 'B' ));
662
+ model.handleMessageEvent (MessageEvent (id: 0 ,
663
+ message: eg.streamMessage (id: 302 , stream: stream, topic: 'B' )));
653
664
checkNotifiedOnce ();
654
665
check (model.messages.map ((m) => m.id)).deepEquals (expected..add (302 ));
655
666
656
- model.maybeAddMessage (eg.streamMessage (id: 303 , stream: stream, topic: 'C' ));
667
+ model.handleMessageEvent (MessageEvent (id: 0 ,
668
+ message: eg.streamMessage (id: 303 , stream: stream, topic: 'C' )));
657
669
checkNotNotified ();
658
670
check (model.messages.map ((m) => m.id)).deepEquals (expected);
659
671
});
@@ -683,8 +695,9 @@ void main() {
683
695
check (model.messages.map ((m) => m.id))
684
696
.deepEquals (expected..insertAll (0 , [101 ]));
685
697
686
- // … and on maybeAddMessage.
687
- model.maybeAddMessage (eg.streamMessage (id: 301 , stream: stream, topic: 'A' ));
698
+ // … and on handleMessageEvent.
699
+ model.handleMessageEvent (MessageEvent (id: 0 ,
700
+ message: eg.streamMessage (id: 301 , stream: stream, topic: 'A' )));
688
701
checkNotifiedOnce ();
689
702
check (model.messages.map ((m) => m.id)).deepEquals (expected..add (301 ));
690
703
});
@@ -737,12 +750,12 @@ void main() {
737
750
await model.fetchOlder ();
738
751
checkNotified (count: 2 );
739
752
740
- // Then test maybeAddMessage , where a new header is needed…
741
- model.maybeAddMessage ( streamMessage (13 ));
753
+ // Then test handleMessageEvent , where a new header is needed…
754
+ model.handleMessageEvent ( MessageEvent (id : 0 , message : streamMessage (13 ) ));
742
755
checkNotifiedOnce ();
743
756
744
757
// … and where it's not.
745
- model.maybeAddMessage ( streamMessage (14 ));
758
+ model.handleMessageEvent ( MessageEvent (id : 0 , message : streamMessage (14 ) ));
746
759
checkNotifiedOnce ();
747
760
748
761
// Then test maybeUpdateMessage, where a header is and remains needed…
@@ -781,7 +794,7 @@ void main() {
781
794
// Until then, we always compute this sequentially from oldest to newest.
782
795
// So we just need to exercise the different cases of the logic for
783
796
// whether the sender should be shown, but the difference between
784
- // fetchInitial and maybeAddMessage etc. doesn't matter.
797
+ // fetchInitial and handleMessageEvent etc. doesn't matter.
785
798
786
799
const t1 = 1693602618 ;
787
800
const t2 = t1 + 86400 ;
0 commit comments