Skip to content

Use known, subscribed channels in more tests (prep for #1798) #1988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use known, subscribed channels in more tests (prep for #1798) #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
998913e
msglist test [nfc]: Fix some test descriptions
chrisbobbe Nov 13, 2025
8471376
msglist test: Switch some model tests to use subscribed channels
chrisbobbe Nov 13, 2025
ba79306
message test: Use known, subscribed channel in sendMessage smoke test
chrisbobbe Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions test/model/message_list_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void main() {
test('ignore [OutboxMessage]s outside narrow or with `hidden: true`', () => awaitFakeAsync((async) async {
final stream = eg.stream();
final otherStream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await store.setUserTopic(stream, 'muted', UserTopicVisibilityPolicy.muted);
await prepareOutboxMessagesTo([
StreamDestination(stream.streamId, eg.t('topic')),
Expand Down Expand Up @@ -731,7 +731,7 @@ void main() {
group('MessageEvent', () {
test('in narrow', () async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages:
List.generate(30, (i) => eg.streamMessage(stream: stream)));

Expand All @@ -743,7 +743,7 @@ void main() {

test('not in narrow', () async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages:
List.generate(30, (i) => eg.streamMessage(stream: stream)));

Expand All @@ -756,7 +756,7 @@ void main() {

test('while in mid-history', () async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId),
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream,
anchor: NumericAnchor(1000));
await prepareMessages(foundOldest: true, foundNewest: false, messages:
List.generate(30, (i) => eg.streamMessage(id: 1000 + i, stream: stream)));
Expand All @@ -769,15 +769,15 @@ void main() {

test('before fetch', () async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await store.addMessage(eg.streamMessage(stream: stream));
checkNotNotified();
check(model).fetched.isFalse();
});

test('when there are outbox messages', () => awaitFakeAsync((async) async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages:
List.generate(30, (i) => eg.streamMessage(stream: stream)));

Expand All @@ -797,7 +797,7 @@ void main() {

test('from another client (localMessageId present but unrecognized)', () => awaitFakeAsync((async) async {
final stream = eg.stream();
await prepare(narrow: eg.topicNarrow(stream.streamId, 'topic'));
await prepare(narrow: eg.topicNarrow(stream.streamId, 'topic'), stream: stream);
await prepareMessages(foundOldest: true, messages:
List.generate(30, (i) => eg.streamMessage(stream: stream, topic: 'topic')));

Expand All @@ -820,7 +820,7 @@ void main() {

test('for an OutboxMessage in the narrow', () => awaitFakeAsync((async) async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages:
List.generate(30, (i) => eg.streamMessage(stream: stream)));

Expand All @@ -846,7 +846,7 @@ void main() {

test('for an OutboxMessage outside the narrow', () => awaitFakeAsync((async) async {
final stream = eg.stream();
await prepare(narrow: eg.topicNarrow(stream.streamId, 'topic'));
await prepare(narrow: eg.topicNarrow(stream.streamId, 'topic'), stream: stream);
await prepareMessages(foundOldest: true, messages:
List.generate(30, (i) => eg.streamMessage(stream: stream, topic: 'topic')));

Expand Down Expand Up @@ -897,7 +897,7 @@ void main() {
}));

test('before fetch', () => awaitFakeAsync((async) async {
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareOutboxMessages(count: 5, stream: stream);
check(model)
..fetched.isFalse()
Expand Down Expand Up @@ -1337,8 +1337,8 @@ void main() {
final stream = eg.stream();
final messages = List.generate(30, (i) => eg.streamMessage(stream: stream));

test('in narrow', () async {
await prepare(narrow: ChannelNarrow(stream.streamId));
test('all deleted messages are in the msglist', () async {
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: messages);

check(model).messages.length.equals(30);
Expand All @@ -1347,8 +1347,8 @@ void main() {
check(model).messages.length.equals(20);
});

test('not all in narrow', () async {
await prepare(narrow: ChannelNarrow(stream.streamId));
test('some deleted messages are in the msglist, some not', () async {
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: messages.sublist(5));

check(model).messages.length.equals(25);
Expand All @@ -1357,8 +1357,8 @@ void main() {
check(model).messages.length.equals(20);
});

test('not in narrow', () async {
await prepare(narrow: ChannelNarrow(stream.streamId));
test('none of the deleted messages are in the msglist', () async {
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: messages.sublist(5));

check(model).messages.length.equals(25);
Expand All @@ -1367,8 +1367,8 @@ void main() {
check(model).messages.length.equals(25);
});

test('complete message deletion', () async {
await prepare(narrow: ChannelNarrow(stream.streamId));
test('deleted messages are exactly those in the msglist', () async {
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: messages.sublist(0, 25));

check(model).messages.length.equals(25);
Expand All @@ -1377,8 +1377,8 @@ void main() {
check(model).messages.length.equals(0);
});

test('non-consecutive message deletion', () async {
await prepare(narrow: ChannelNarrow(stream.streamId));
test('deleted messages are present non-consecutively in the msglist', () async {
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: messages);
final messagesToDelete = messages.sublist(2, 5) + messages.sublist(10, 15);

Expand Down Expand Up @@ -1502,7 +1502,7 @@ void main() {
test('message absent', () async {
final stream = eg.stream();
final narrow = ChannelNarrow(stream.streamId);
await prepare(narrow: narrow);
await prepare(narrow: narrow, stream: stream);

final messagesInNarrow = List<Message>.generate(10,
(i) => eg.streamMessage(id: 10 + i, stream: stream));
Expand Down Expand Up @@ -2214,7 +2214,7 @@ void main() {

test('reassemble', () async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages:
List.generate(30, (i) => eg.streamMessage(stream: stream)));
await store.addMessage(eg.streamMessage(stream: stream));
Expand Down Expand Up @@ -2721,7 +2721,7 @@ void main() {
group('handle content parsing into subclasses of ZulipMessageContent', () {
test('ZulipContent', () async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: []);

await store.addMessage(eg.streamMessage(stream: stream));
Expand All @@ -2735,7 +2735,7 @@ void main() {

test('PollContent', () async {
final stream = eg.stream();
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: []);

await store.addMessage(eg.streamMessage(
Expand All @@ -2759,7 +2759,7 @@ void main() {
final stream = eg.stream();
final message = eg.streamMessage(stream: stream, topic: 'topic',
timestamp: eg.utcTimestamp(clock.daysAgo(1)));
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: [message]);

// `findItemWithMessageId` uses binary search. Set up just enough
Expand All @@ -2782,7 +2782,7 @@ void main() {
final stream = eg.stream();
final message = eg.streamMessage(stream: stream, topic: 'topic',
timestamp: eg.utcTimestamp(clock.now()));
await prepare(narrow: ChannelNarrow(stream.streamId));
await prepare(narrow: ChannelNarrow(stream.streamId), stream: stream);
await prepareMessages(foundOldest: true, messages: [message]);

// `findItemWithMessageId` uses binary search. Set up just enough
Expand Down
5 changes: 4 additions & 1 deletion test/model/message_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,13 @@ void main() {

group('sendMessage', () {
test('smoke', () async {
final stream = eg.stream();
final subscription = eg.subscription(stream);
final store = eg.store(initialSnapshot: eg.initialSnapshot(
queueId: 'fb67bf8a-c031-47cc-84cf-ed80accacda8'));
await store.addStream(stream);
await store.addSubscription(subscription);
final connection = store.connection as FakeApiConnection;
final stream = eg.stream();
connection.prepare(json: SendMessageResult(id: 12345).toJson());
await store.sendMessage(
destination: StreamDestination(stream.streamId, eg.t('world')),
Expand Down