test [nfc]: Explicitly convert various other topics to TopicName

Author: gnprice

test/api/model/events_test.dart

@@ -116,8 +116,8 @@ void main() {
         'orig_subject': 'foo',
         'subject': 'bar',
       }) as UpdateMessageEvent)
-        ..origTopic.equals('foo')
-        ..newTopic.equals('bar');
+        ..origTopic.equals(const TopicName('foo'))
+        ..newTopic.equals(const TopicName('bar'));
     });
   });
 

test/api/model/initial_snapshot_test.dart

@@ -1,6 +1,7 @@
 import 'package:checks/checks.dart';
 import 'package:test/scaffolding.dart';
 import 'package:zulip/api/model/initial_snapshot.dart';
+import 'package:zulip/api/model/model.dart';
 
 import '../../stdlib_checks.dart';
 
@@ -20,7 +21,7 @@ void main() {
 
     check(snapshot.channels).single.jsonEquals(
       UnreadChannelSnapshot(
-        topic: 'topic name', streamId: 1,
+        topic: const TopicName('topic name'), streamId: 1,
         unreadMessageIds: [1, 2]));
   });
 

test/api/route/channels_test.dart

@@ -12,7 +12,7 @@ void main() {
     return FakeApiConnection.with_((connection) async {
       connection.prepare(json: {});
       await updateUserTopic(connection,
-        streamId: 1, topic: 'topic',
+        streamId: 1, topic: const TopicName('topic'),
         visibilityPolicy: UserTopicVisibilityPolicy.followed);
       check(connection.takeRequests()).single.isA<http.Request>()
         ..method.equals('POST')
@@ -28,7 +28,7 @@ void main() {
   test('updateUserTopic only accepts valid visibility policy', () {
     return FakeApiConnection.with_((connection) async {
       check(() => updateUserTopic(connection,
-        streamId: 1, topic: 'topic',
+        streamId: 1, topic: const TopicName('topic'),
         visibilityPolicy: UserTopicVisibilityPolicy.unknown),
       ).throws<AssertionError>();
     });
@@ -38,7 +38,7 @@ void main() {
     return FakeApiConnection.with_((connection) async {
       connection.prepare(json: {});
       await updateUserTopicCompat(connection,
-        streamId: 1, topic: 'topic',
+        streamId: 1, topic: const TopicName('topic'),
         visibilityPolicy: UserTopicVisibilityPolicy.followed);
       check(connection.takeRequests()).single.isA<http.Request>()
         ..method.equals('POST')
@@ -55,7 +55,7 @@ void main() {
     test('updateUserTopic throws AssertionError when FL < 170', () {
       return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {
         check(() => updateUserTopic(connection,
-          streamId: 1, topic: 'topic',
+          streamId: 1, topic: const TopicName('topic'),
           visibilityPolicy: UserTopicVisibilityPolicy.muted),
         ).throws<AssertionError>();
       });
@@ -64,7 +64,7 @@ void main() {
     test('updateUserTopicCompat throws UnsupportedError on unsupported policy', () {
       return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {
         check(() => updateUserTopicCompat(connection,
-          streamId: 1, topic: 'topic',
+          streamId: 1, topic: const TopicName('topic'),
           visibilityPolicy: UserTopicVisibilityPolicy.followed),
         ).throws<UnsupportedError>();
       });
@@ -74,7 +74,7 @@ void main() {
       return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {
         connection.prepare(json: {});
         await updateUserTopicCompat(connection,
-          streamId: 1, topic: 'topic',
+          streamId: 1, topic: const TopicName('topic'),
           visibilityPolicy: UserTopicVisibilityPolicy.none);
         check(connection.takeRequests()).single.isA<http.Request>()
           ..method.equals('PATCH')
@@ -91,7 +91,7 @@ void main() {
       return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {
         connection.prepare(json: {});
         await updateUserTopicCompat(connection,
-          streamId: 1, topic: 'topic',
+          streamId: 1, topic: const TopicName('topic'),
           visibilityPolicy: UserTopicVisibilityPolicy.muted);
         check(connection.takeRequests()).single.isA<http.Request>()
           ..method.equals('PATCH')

test/api/route/typing_test.dart

@@ -4,6 +4,7 @@ import 'package:http/http.dart' as http;
 import 'package:checks/checks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:zulip/api/model/events.dart';
+import 'package:zulip/api/model/model.dart';
 import 'package:zulip/api/route/messages.dart';
 import 'package:zulip/api/route/typing.dart';
 
@@ -31,7 +32,7 @@ void main() {
   Future<void> checkSetTypingStatusForTopic(TypingOp op, String expectedOp) {
     return FakeApiConnection.with_((connection) {
       return checkSetTypingStatus(connection, op,
-        destination: const StreamDestination(streamId, topic),
+        destination: const StreamDestination(streamId, TopicName(topic)),
         expectedBodyFields: {
           'op': expectedOp,
           'type': 'channel',
@@ -64,7 +65,7 @@ void main() {
   test('legacy: use "stream" instead of "channel"', () {
     return FakeApiConnection.with_(zulipFeatureLevel: 247, (connection) {
       return checkSetTypingStatus(connection, TypingOp.start,
-        destination: const StreamDestination(streamId, topic),
+        destination: const StreamDestination(streamId, TopicName(topic)),
         expectedBodyFields: {
           'op': 'start',
           'type': 'stream',
@@ -77,7 +78,7 @@ void main() {
   test('legacy: use to=[streamId] instead of stream_id=streamId', () {
     return FakeApiConnection.with_(zulipFeatureLevel: 214, (connection) {
       return checkSetTypingStatus(connection, TypingOp.start,
-        destination: const StreamDestination(streamId, topic),
+        destination: const StreamDestination(streamId, TopicName(topic)),
         expectedBodyFields: {
           'op': 'start',
           'type': 'stream',

test/example_data.dart

@@ -241,7 +241,8 @@ const _stream = stream;
 
 GetStreamTopicsEntry getStreamTopicsEntry({int? maxId, String? name}) {
   maxId ??= 123;
-  return GetStreamTopicsEntry(maxId: maxId, name: name ?? 'Test Topic #$maxId');
+  return GetStreamTopicsEntry(maxId: maxId,
+    name: TopicName(name ?? 'Test Topic #$maxId'));
 }
 
 /// Construct an example subscription from a stream.
@@ -296,7 +297,7 @@ UserTopicItem userTopicItem(
     ZulipStream stream, String topic, UserTopicVisibilityPolicy policy) {
   return UserTopicItem(
     streamId: stream.streamId,
-    topicName: topic,
+    topicName: TopicName(topic),
     lastUpdated: 1234567890,
     visibilityPolicy: policy,
   );
@@ -534,7 +535,7 @@ UnreadChannelSnapshot unreadChannelMsgs({
   required List<int> unreadMessageIds,
 }) {
   return UnreadChannelSnapshot(
-    topic: topic,
+    topic: TopicName(topic),
     streamId: streamId,
     unreadMessageIds: unreadMessageIds,
   );
@@ -568,7 +569,7 @@ UserTopicEvent userTopicEvent(
   return UserTopicEvent(
     id: 1,
     streamId: streamId,
-    topicName: topic,
+    topicName: TopicName(topic),
     lastUpdated: 1234567890,
     visibilityPolicy: visibilityPolicy,
   );

test/model/autocomplete_test.dart

@@ -481,10 +481,11 @@ void main() {
       }
 
       int compareAB({required String? topic}) {
+        final realTopic = topic == null ? null : TopicName(topic);
         final resultAB = MentionAutocompleteView.compareByRecency(userA, userB,
-          streamId: stream.streamId, topic: topic, store: store);
+          streamId: stream.streamId, topic: realTopic, store: store);
         final resultBA = MentionAutocompleteView.compareByRecency(userB, userA,
-          streamId: stream.streamId, topic: topic, store: store);
+          streamId: stream.streamId, topic: realTopic, store: store);
         switch (resultAB) {
           case <0: check(resultBA).isGreaterThan(0);
           case >0: check(resultBA).isLessThan(0);