Skip to content

Commit 65922be

Browse files
rajveermalviyachrisbobbe
authored andcommitted
msglist test [nfc]: Refactor forcedShowSender evaluation in checkInvariants
To include the "senders don't match" case, and rename it to `showSender`.
1 parent 0d4665d commit 65922be

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

test/model/message_list_test.dart

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3227,17 +3227,20 @@ void checkInvariants(MessageListView model) {
32273227

32283228
int i = 0;
32293229
for (int j = 0; j < allMessages.length; j++) {
3230-
bool forcedShowSender = false;
3230+
final bool showSender;
32313231
if (j == 0
32323232
|| model.oneMessagePerBlock
32333233
|| !haveSameRecipient(allMessages[j-1], allMessages[j])) {
32343234
check(model.items[i++]).isA<MessageListRecipientHeaderItem>()
32353235
.message.identicalTo(allMessages[j]);
3236-
forcedShowSender = true;
3236+
showSender = true;
32373237
} else if (!messagesSameDay(allMessages[j-1], allMessages[j])) {
32383238
check(model.items[i++]).isA<MessageListDateSeparatorItem>()
32393239
.message.identicalTo(allMessages[j]);
3240-
forcedShowSender = true;
3240+
showSender = true;
3241+
} else {
3242+
// TODO(#1825) adjust to reflect messagesCloseInTime
3243+
showSender = allMessages[j].senderId != allMessages[j-1].senderId;
32413244
}
32423245
if (j < model.messages.length) {
32433246
check(model.items[i]).isA<MessageListMessageItem>()
@@ -3248,8 +3251,7 @@ void checkInvariants(MessageListView model) {
32483251
.message.identicalTo(model.outboxMessages[j-model.messages.length]);
32493252
}
32503253
check(model.items[i++]).isA<MessageListMessageBaseItem>()
3251-
..showSender.equals( // TODO(#1825) adjust to reflect messagesCloseInTime
3252-
forcedShowSender || allMessages[j].senderId != allMessages[j-1].senderId)
3254+
..showSender.equals(showSender)
32533255
..isLastInBlock.equals(
32543256
i == model.items.length || switch (model.items[i]) {
32553257
MessageListMessageItem()

0 commit comments

Comments
 (0)