Skip to content

Commit 86c94cb

Browse files
committed
example_data [nfc]: Move {newest,older}Result
Shared by a few tests, they fits better in example_data. Signed-off-by: Zixuan James Li <[email protected]>
1 parent cdce570 commit 86c94cb

File tree

6 files changed

+86
-89
lines changed

6 files changed

+86
-89
lines changed

integration_test/unreadmarker_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:zulip/widgets/message_list.dart';
99
import '../test/api/fake_api.dart';
1010
import '../test/example_data.dart' as eg;
1111
import '../test/model/binding.dart';
12-
import '../test/model/message_list_test.dart';
1312
import '../test/widgets/test_app.dart';
1413

1514
void main() {
@@ -29,7 +28,7 @@ void main() {
2928
final messages = List.generate(messageCount,
3029
(i) => eg.streamMessage(flags: [MessageFlag.read]));
3130
connection.prepare(json:
32-
newestResult(foundOldest: true, messages: messages).toJson());
31+
eg.newestResult(foundOldest: true, messages: messages).toJson());
3332

3433
await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,
3534
child: const MessageListPage(initNarrow: CombinedFeedNarrow())));

test/example_data.dart

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:zulip/api/model/events.dart';
55
import 'package:zulip/api/model/initial_snapshot.dart';
66
import 'package:zulip/api/model/model.dart';
77
import 'package:zulip/api/model/submessage.dart';
8+
import 'package:zulip/api/route/messages.dart';
89
import 'package:zulip/api/route/realm.dart';
910
import 'package:zulip/api/route/channels.dart';
1011
import 'package:zulip/model/narrow.dart';
@@ -451,6 +452,43 @@ DmMessage dmMessage({
451452
}) as Map<String, dynamic>);
452453
}
453454

455+
/// A GetMessagesResult the server might return on an `anchor=newest` request.
456+
GetMessagesResult newestResult({
457+
required bool foundOldest,
458+
bool historyLimited = false,
459+
required List<Message> messages,
460+
}) {
461+
return GetMessagesResult(
462+
// These anchor, foundAnchor, and foundNewest values are what the server
463+
// appears to always return when the request had `anchor=newest`.
464+
anchor: 10000000000000000, // that's 16 zeros
465+
foundAnchor: false,
466+
foundNewest: true,
467+
468+
foundOldest: foundOldest,
469+
historyLimited: historyLimited,
470+
messages: messages,
471+
);
472+
}
473+
474+
/// A GetMessagesResult the server might return when we request older messages.
475+
GetMessagesResult olderResult({
476+
required int anchor,
477+
bool foundAnchor = false, // the value if the server understood includeAnchor false
478+
required bool foundOldest,
479+
bool historyLimited = false,
480+
required List<Message> messages,
481+
}) {
482+
return GetMessagesResult(
483+
anchor: anchor,
484+
foundAnchor: foundAnchor,
485+
foundNewest: false, // empirically always this, even when anchor happens to be latest
486+
foundOldest: foundOldest,
487+
historyLimited: historyLimited,
488+
messages: messages,
489+
);
490+
}
491+
454492
PollWidgetData pollWidgetData({
455493
required String question,
456494
required List<String> options,

0 commit comments

Comments
 (0)