@@ -189,16 +189,6 @@ void main() {
189189 });
190190 });
191191
192- UserTopicItem makeUserTopicItem (
193- ZulipStream stream, String topic, UserTopicVisibilityPolicy policy) {
194- return UserTopicItem (
195- streamId: stream.streamId,
196- topicName: topic,
197- lastUpdated: 1234567890 ,
198- visibilityPolicy: policy,
199- );
200- }
201-
202192 void compareTopicVisibility (PerAccountStore store, List <UserTopicItem > expected) {
203193 final expectedStore = eg.store (initialSnapshot: eg.initialSnapshot (
204194 userTopics: expected,
@@ -211,10 +201,10 @@ void main() {
211201 final store = eg.store (initialSnapshot: eg.initialSnapshot (
212202 streams: [stream1, stream2],
213203 userTopics: [
214- makeUserTopicItem (stream1, 'topic 1' , UserTopicVisibilityPolicy .muted),
215- makeUserTopicItem (stream1, 'topic 2' , UserTopicVisibilityPolicy .unmuted),
216- makeUserTopicItem (stream2, 'topic 3' , UserTopicVisibilityPolicy .unknown),
217- makeUserTopicItem (stream2, 'topic 4' , UserTopicVisibilityPolicy .followed),
204+ eg. userTopicItem (stream1, 'topic 1' , UserTopicVisibilityPolicy .muted),
205+ eg. userTopicItem (stream1, 'topic 2' , UserTopicVisibilityPolicy .unmuted),
206+ eg. userTopicItem (stream2, 'topic 3' , UserTopicVisibilityPolicy .unknown),
207+ eg. userTopicItem (stream2, 'topic 4' , UserTopicVisibilityPolicy .followed),
218208 ]));
219209 check (store.debugStreamStore.topicVisibility).deepEquals ({
220210 stream1.streamId: {
@@ -233,7 +223,7 @@ void main() {
233223 final store = eg.store ();
234224 await store.addUserTopic (stream1, 'topic' , UserTopicVisibilityPolicy .muted);
235225 compareTopicVisibility (store, [
236- makeUserTopicItem (stream1, 'topic' , UserTopicVisibilityPolicy .muted),
226+ eg. userTopicItem (stream1, 'topic' , UserTopicVisibilityPolicy .muted),
237227 ]);
238228 });
239229
@@ -242,8 +232,8 @@ void main() {
242232 await store.addUserTopic (stream1, 'topic' , UserTopicVisibilityPolicy .muted);
243233 await store.addUserTopic (stream1, 'other topic' , UserTopicVisibilityPolicy .unmuted);
244234 compareTopicVisibility (store, [
245- makeUserTopicItem (stream1, 'topic' , UserTopicVisibilityPolicy .muted),
246- makeUserTopicItem (stream1, 'other topic' , UserTopicVisibilityPolicy .unmuted),
235+ eg. userTopicItem (stream1, 'topic' , UserTopicVisibilityPolicy .muted),
236+ eg. userTopicItem (stream1, 'other topic' , UserTopicVisibilityPolicy .unmuted),
247237 ]);
248238 });
249239
@@ -252,7 +242,7 @@ void main() {
252242 await store.addUserTopic (stream1, 'topic' , UserTopicVisibilityPolicy .muted);
253243 await store.addUserTopic (stream1, 'topic' , UserTopicVisibilityPolicy .unmuted);
254244 compareTopicVisibility (store, [
255- makeUserTopicItem (stream1, 'topic' , UserTopicVisibilityPolicy .unmuted),
245+ eg. userTopicItem (stream1, 'topic' , UserTopicVisibilityPolicy .unmuted),
256246 ]);
257247 });
258248
@@ -262,7 +252,7 @@ void main() {
262252 await store.addUserTopic (stream1, 'other topic' , UserTopicVisibilityPolicy .unmuted);
263253 await store.addUserTopic (stream1, 'topic' , UserTopicVisibilityPolicy .none);
264254 compareTopicVisibility (store, [
265- makeUserTopicItem (stream1, 'other topic' , UserTopicVisibilityPolicy .unmuted),
255+ eg. userTopicItem (stream1, 'other topic' , UserTopicVisibilityPolicy .unmuted),
266256 ]);
267257 });
268258
@@ -288,9 +278,9 @@ void main() {
288278 final store = eg.store (initialSnapshot: eg.initialSnapshot (
289279 streams: [stream],
290280 userTopics: [
291- makeUserTopicItem (stream, 'topic 1' , UserTopicVisibilityPolicy .muted),
292- makeUserTopicItem (stream, 'topic 2' , UserTopicVisibilityPolicy .unmuted),
293- makeUserTopicItem (stream, 'topic 3' , UserTopicVisibilityPolicy .followed),
281+ eg. userTopicItem (stream, 'topic 1' , UserTopicVisibilityPolicy .muted),
282+ eg. userTopicItem (stream, 'topic 2' , UserTopicVisibilityPolicy .unmuted),
283+ eg. userTopicItem (stream, 'topic 3' , UserTopicVisibilityPolicy .followed),
294284 ]));
295285 check (store.topicVisibilityPolicy (stream.streamId, 'topic 1' ))
296286 .equals (UserTopicVisibilityPolicy .muted);
0 commit comments