@@ -5,7 +5,6 @@ import 'package:zulip/api/model/model.dart';
5
5
import 'package:zulip/api/route/messages.dart' ;
6
6
import 'package:zulip/model/message_list.dart' ;
7
7
import 'package:zulip/model/narrow.dart' ;
8
- import 'package:zulip/model/store.dart' ;
9
8
10
9
import '../api/fake_api.dart' ;
11
10
import '../api/model/model_checks.dart' ;
@@ -15,7 +14,7 @@ import '../model/test_store.dart';
15
14
16
15
const int userId = 1 ;
17
16
18
- Future <PerAccountStore > setupStore ( ZulipStream stream) async {
17
+ Future <MessageListView > messageListViewWithMessages ( List < Message > messages, ZulipStream stream, Narrow narrow ) async {
19
18
addTearDown (TestZulipBinding .instance.reset);
20
19
21
20
await TestZulipBinding .instance.globalStore.add (eg.selfAccount, eg.initialSnapshot ());
@@ -24,10 +23,6 @@ Future<PerAccountStore> setupStore(ZulipStream stream) async {
24
23
store.addUser (eg.user (userId: userId));
25
24
store.addStream (stream);
26
25
27
- return store;
28
- }
29
-
30
- Future <MessageListView > messageListViewWithMessages (List <Message > messages, PerAccountStore store, Narrow narrow) async {
31
26
final messageList = MessageListView .init (store: store, narrow: narrow);
32
27
33
28
final connection = store.connection as FakeApiConnection ;
@@ -51,11 +46,10 @@ void main() async {
51
46
final narrow = StreamNarrow (stream.streamId);
52
47
53
48
test ('findMessageWithId' , () async {
54
- final store = await setupStore (stream);
55
49
final m1 = eg.streamMessage (id: 2 , stream: stream);
56
50
final m2 = eg.streamMessage (id: 4 , stream: stream);
57
51
final m3 = eg.streamMessage (id: 6 , stream: stream);
58
- final messageList = await messageListViewWithMessages ([m1, m2, m3], store , narrow);
52
+ final messageList = await messageListViewWithMessages ([m1, m2, m3], stream , narrow);
59
53
60
54
// Exercise the binary search before, at, and after each element of the list.
61
55
check (messageList.findMessageWithId (1 )).equals (- 1 );
@@ -69,13 +63,11 @@ void main() async {
69
63
70
64
group ('maybeUpdateMessage' , () {
71
65
test ('update a message' , () async {
72
- final store = await setupStore (stream);
73
-
74
66
final originalMessage = eg.streamMessage (id: 243 , stream: stream,
75
67
content: "<p>Hello, world</p>" ,
76
68
flags: [],
77
69
);
78
- final messageList = await messageListViewWithMessages ([originalMessage], store , narrow);
70
+ final messageList = await messageListViewWithMessages ([originalMessage], stream , narrow);
79
71
80
72
final updateEvent = UpdateMessageEvent (
81
73
id: 1 ,
@@ -110,11 +102,9 @@ void main() async {
110
102
});
111
103
112
104
test ('ignore when message not present' , () async {
113
- final store = await setupStore (stream);
114
-
115
105
final originalMessage = eg.streamMessage (id: 243 , stream: stream,
116
106
content: "<p>Hello, world</p>" );
117
- final messageList = await messageListViewWithMessages ([originalMessage], store , narrow);
107
+ final messageList = await messageListViewWithMessages ([originalMessage], stream , narrow);
118
108
119
109
final updateEvent = UpdateMessageEvent (
120
110
id: 1 ,
@@ -139,12 +129,10 @@ void main() async {
139
129
140
130
// TODO(server-5): Cut legacy case for rendering-only message update
141
131
Future <void > checkRenderingOnly ({required bool legacy}) async {
142
- final store = await setupStore (stream);
143
-
144
132
final originalMessage = eg.streamMessage (id: 972 , stream: stream,
145
133
lastEditTimestamp: 78492 ,
146
134
content: "<p>Hello, world</p>" );
147
- final messageList = await messageListViewWithMessages ([originalMessage], store , narrow);
135
+ final messageList = await messageListViewWithMessages ([originalMessage], stream , narrow);
148
136
149
137
final updateEvent = UpdateMessageEvent (
150
138
id: 1 ,
0 commit comments