Skip to content

Commit b7df0b9

Browse files
gnpricesm-sayedi
authored andcommitted
recent_senders test [nfc]: Cut unneeded IDs; make names look more different
Most of these tests don't use the specific stream IDs, user IDs, or message IDs, so cut them out to reduce the number of details for the reader to read. Then also rename the streams, topics, and users so that they're a bit more visually distinct from each other. That helps in seeing what's going on in the tests that are all about which bits of data are the same as, or different from, which other ones.
1 parent a6cde1e commit b7df0b9

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

test/model/recent_senders_test.dart

+25-25
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ void main() {
5757

5858
group('RecentSenders.handleMessages', () {
5959
late RecentSenders model;
60-
final stream1 = eg.stream(streamId: 1);
61-
final stream2 = eg.stream(streamId: 2);
62-
final user10 = eg.user(userId: 10);
63-
final user20 = eg.user(userId: 20);
60+
final streamA = eg.stream();
61+
final streamB = eg.stream();
62+
final userX = eg.user();
63+
final userY = eg.user();
6464

6565
void setupModel(List<Message> messages) {
6666
model = RecentSenders();
@@ -81,10 +81,10 @@ void main() {
8181
void checkHandleMessagesSingle(List<int> oldIds, List<int> newIds) {
8282
checkHandleMessages([
8383
for (final id in oldIds)
84-
eg.streamMessage(stream: stream1, topic: 'a', sender: user10, id: id),
84+
eg.streamMessage(stream: streamA, topic: 'a', sender: userX, id: id),
8585
], [
8686
for (final id in newIds)
87-
eg.streamMessage(stream: stream1, topic: 'a', sender: user10, id: id),
87+
eg.streamMessage(stream: streamA, topic: 'a', sender: userX, id: id),
8888
]);
8989
}
9090

@@ -107,51 +107,51 @@ void main() {
107107

108108
test('batch with both DM and stream messages -> ignores DM, processes stream messages', () {
109109
checkHandleMessages([], [
110-
eg.streamMessage(stream: stream1, topic: 'a', sender: user10),
110+
eg.streamMessage(stream: streamA, topic: 'thing', sender: userX),
111111
eg.dmMessage(from: eg.otherUser, to: [eg.selfUser]),
112-
eg.streamMessage(stream: stream1, topic: 'a', sender: user10),
112+
eg.streamMessage(stream: streamA, topic: 'thing', sender: userX),
113113
]);
114114
});
115115

116116
test('add new sender', () {
117117
checkHandleMessages(
118-
[eg.streamMessage(stream: stream1, topic: 'a', sender: user10)],
119-
[eg.streamMessage(stream: stream1, topic: 'a', sender: user20)]);
118+
[eg.streamMessage(stream: streamA, topic: 'thing', sender: userX)],
119+
[eg.streamMessage(stream: streamA, topic: 'thing', sender: userY)]);
120120
});
121121

122122
test('add new topic', () {
123123
checkHandleMessages(
124-
[eg.streamMessage(stream: stream1, topic: 'a', sender: user10)],
125-
[eg.streamMessage(stream: stream1, topic: 'b', sender: user10)]);
124+
[eg.streamMessage(stream: streamA, topic: 'thing', sender: userX)],
125+
[eg.streamMessage(stream: streamA, topic: 'other', sender: userX)]);
126126
});
127127

128128
test('add new stream', () {
129129
checkHandleMessages(
130-
[eg.streamMessage(stream: stream1, topic: 'a', sender: user10)],
131-
[eg.streamMessage(stream: stream2, topic: 'a', sender: user10)]);
130+
[eg.streamMessage(stream: streamA, topic: 'thing', sender: userX)],
131+
[eg.streamMessage(stream: streamB, topic: 'thing', sender: userX)]);
132132
});
133133

134134
test('multiple conversations and senders interspersed', () {
135135
checkHandleMessages([], [
136-
eg.streamMessage(stream: stream1, topic: 'a', sender: user10),
137-
eg.streamMessage(stream: stream1, topic: 'b', sender: user10),
138-
eg.streamMessage(stream: stream2, topic: 'a', sender: user10),
139-
eg.streamMessage(stream: stream1, topic: 'a', sender: user20),
140-
eg.streamMessage(stream: stream1, topic: 'a', sender: user10),
136+
eg.streamMessage(stream: streamA, topic: 'thing', sender: userX),
137+
eg.streamMessage(stream: streamA, topic: 'other', sender: userX),
138+
eg.streamMessage(stream: streamB, topic: 'thing', sender: userX),
139+
eg.streamMessage(stream: streamA, topic: 'thing', sender: userY),
140+
eg.streamMessage(stream: streamA, topic: 'thing', sender: userX),
141141
]);
142142
});
143143
});
144144

145145
test('RecentSenders.handleDeleteMessageEvent', () {
146146
final model = RecentSenders();
147-
final stream1 = eg.stream(streamId: 1);
148-
final user1 = eg.user(userId: 1);
149-
final user2 = eg.user(userId: 2);
147+
final stream = eg.stream();
148+
final userX = eg.user();
149+
final userY = eg.user();
150150

151151
final messages = [
152-
eg.streamMessage(stream: stream1, topic: 'a', sender: user1, id: 100),
153-
eg.streamMessage(stream: stream1, topic: 'b', sender: user1, id: 200),
154-
eg.streamMessage(stream: stream1, topic: 'a', sender: user2, id: 300),
152+
eg.streamMessage(stream: stream, topic: 'thing', sender: userX),
153+
eg.streamMessage(stream: stream, topic: 'other', sender: userX),
154+
eg.streamMessage(stream: stream, topic: 'thing', sender: userY),
155155
];
156156

157157
model.handleMessages(messages);

0 commit comments

Comments
 (0)