Skip to content

Commit f661e66

Browse files
committed
msglist test [nfc]: Unify setup functions
Each of the test cases calls setupStore and then uses the resulting store for just one thing, namely passing it to messageListViewWithMessages. So just subsume the former into the latter.
1 parent 50cb61b commit f661e66

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

test/model/message_list_test.dart

+5-17
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:zulip/api/model/model.dart';
55
import 'package:zulip/api/route/messages.dart';
66
import 'package:zulip/model/message_list.dart';
77
import 'package:zulip/model/narrow.dart';
8-
import 'package:zulip/model/store.dart';
98

109
import '../api/fake_api.dart';
1110
import '../api/model/model_checks.dart';
@@ -15,7 +14,7 @@ import '../model/test_store.dart';
1514

1615
const int userId = 1;
1716

18-
Future<PerAccountStore> setupStore(ZulipStream stream) async {
17+
Future<MessageListView> messageListViewWithMessages(List<Message> messages, ZulipStream stream, Narrow narrow) async {
1918
addTearDown(TestZulipBinding.instance.reset);
2019

2120
await TestZulipBinding.instance.globalStore.add(eg.selfAccount, eg.initialSnapshot());
@@ -24,10 +23,6 @@ Future<PerAccountStore> setupStore(ZulipStream stream) async {
2423
store.addUser(eg.user(userId: userId));
2524
store.addStream(stream);
2625

27-
return store;
28-
}
29-
30-
Future<MessageListView> messageListViewWithMessages(List<Message> messages, PerAccountStore store, Narrow narrow) async {
3126
final messageList = MessageListView.init(store: store, narrow: narrow);
3227

3328
final connection = store.connection as FakeApiConnection;
@@ -51,11 +46,10 @@ void main() async {
5146
final narrow = StreamNarrow(stream.streamId);
5247

5348
test('findMessageWithId', () async {
54-
final store = await setupStore(stream);
5549
final m1 = eg.streamMessage(id: 2, stream: stream);
5650
final m2 = eg.streamMessage(id: 4, stream: stream);
5751
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);
5953

6054
// Exercise the binary search before, at, and after each element of the list.
6155
check(messageList.findMessageWithId(1)).equals(-1);
@@ -69,13 +63,11 @@ void main() async {
6963

7064
group('maybeUpdateMessage', () {
7165
test('update a message', () async {
72-
final store = await setupStore(stream);
73-
7466
final originalMessage = eg.streamMessage(id: 243, stream: stream,
7567
content: "<p>Hello, world</p>",
7668
flags: [],
7769
);
78-
final messageList = await messageListViewWithMessages([originalMessage], store, narrow);
70+
final messageList = await messageListViewWithMessages([originalMessage], stream, narrow);
7971

8072
final updateEvent = UpdateMessageEvent(
8173
id: 1,
@@ -110,11 +102,9 @@ void main() async {
110102
});
111103

112104
test('ignore when message not present', () async {
113-
final store = await setupStore(stream);
114-
115105
final originalMessage = eg.streamMessage(id: 243, stream: stream,
116106
content: "<p>Hello, world</p>");
117-
final messageList = await messageListViewWithMessages([originalMessage], store, narrow);
107+
final messageList = await messageListViewWithMessages([originalMessage], stream, narrow);
118108

119109
final updateEvent = UpdateMessageEvent(
120110
id: 1,
@@ -139,12 +129,10 @@ void main() async {
139129

140130
// TODO(server-5): Cut legacy case for rendering-only message update
141131
Future<void> checkRenderingOnly({required bool legacy}) async {
142-
final store = await setupStore(stream);
143-
144132
final originalMessage = eg.streamMessage(id: 972, stream: stream,
145133
lastEditTimestamp: 78492,
146134
content: "<p>Hello, world</p>");
147-
final messageList = await messageListViewWithMessages([originalMessage], store, narrow);
135+
final messageList = await messageListViewWithMessages([originalMessage], stream, narrow);
148136

149137
final updateEvent = UpdateMessageEvent(
150138
id: 1,

0 commit comments

Comments
 (0)