test: Change '1f642': 'smile' emoji to 'slight_smile' where it appears

Author: chrisbobbe

test/api/route/realm_test.dart

@@ -22,7 +22,7 @@ void main() {
     }
 
     final fakeResult = ServerEmojiData(codeToNames: {
-      '1f642': ['smile'],
+      '1f642': ['slight_smile'],
       '1f34a': ['orange', 'tangerine', 'mandarin'],
     });
 

test/example_data.dart

@@ -132,7 +132,7 @@ GetServerSettingsResult serverSettings({
 ServerEmojiData serverEmojiDataPopular = ServerEmojiData(codeToNames: {
   '1f44d': ['+1', 'thumbs_up', 'like'],
   '1f389': ['tada'],
-  '1f642': ['smile'],
+  '1f642': ['slight_smile'],
   '2764': ['heart', 'love', 'love_you'],
   '1f6e0': ['working_on_it', 'hammer_and_wrench', 'tools'],
   '1f419': ['octopus'],
@@ -151,15 +151,15 @@ ServerEmojiData serverEmojiDataPopularPlus(ServerEmojiData data) {
   return result;
 }
 
-/// Like [serverEmojiDataPopular], but with the modern '1f642': ['slight_smile']
-/// instead of '1f642': ['smile']; see zulip/zulip@9feba0f16f.
+/// Like [serverEmojiDataPopular], but with the legacy '1f642': ['smile']
+/// instead of '1f642': ['slight_smile']; see zulip/zulip@9feba0f16f.
 ///
 /// zulip/zulip@9feba0f16f is a Server 11 commit.
-// TODO(server-11) can drop legacy data
-ServerEmojiData serverEmojiDataPopularModern = ServerEmojiData(codeToNames: {
+// TODO(server-11) can drop this
+ServerEmojiData serverEmojiDataPopularLegacy = ServerEmojiData(codeToNames: {
   '1f44d': ['+1', 'thumbs_up', 'like'],
   '1f389': ['tada'],
-  '1f642': ['slight_smile'],
+  '1f642': ['smile'],
   '2764': ['heart', 'love', 'love_you'],
   '1f6e0': ['working_on_it', 'hammer_and_wrench', 'tools'],
   '1f419': ['octopus'],

test/model/emoji_test.dart

@@ -29,9 +29,9 @@ void main() {
   group('emojiDisplayFor', () {
     test('Unicode emoji', () {
       check(eg.store().emojiDisplayFor(emojiType: ReactionType.unicodeEmoji,
-        emojiCode: '1f642', emojiName: 'smile')
+        emojiCode: '1f642', emojiName: 'slight_smile')
       ).isA<UnicodeEmojiDisplay>()
-        ..emojiName.equals('smile')
+        ..emojiName.equals('slight_smile')
         ..emojiUnicode.equals('🙂');
     });
 
@@ -315,13 +315,13 @@ void main() {
       final candidates1 = store.popularEmojiCandidates();
       check(candidates1).isEmpty();
 
-      store.setServerEmojiData(eg.serverEmojiDataPopular);
+      store.setServerEmojiData(eg.serverEmojiDataPopularLegacy);
       final candidates2 = store.popularEmojiCandidates();
       check(candidates2)
         ..isNotEmpty()
         ..not((it) => it.identicalTo(candidates1));
 
-      store.setServerEmojiData(eg.serverEmojiDataPopularModern);
+      store.setServerEmojiData(eg.serverEmojiDataPopular);
       final candidates3 = store.popularEmojiCandidates();
       check(candidates3)
         ..isNotEmpty()
@@ -417,7 +417,7 @@ void main() {
       check(await resultsOf('')).deepEquals([
         isUnicodeResult(names: ['+1', 'thumbs_up', 'like']),
         isUnicodeResult(names: ['tada']),
-        isUnicodeResult(names: ['smile']),
+        isUnicodeResult(names: ['slight_smile']),
         isUnicodeResult(names: ['heart', 'love', 'love_you']),
         isUnicodeResult(names: ['working_on_it', 'hammer_and_wrench', 'tools']),
         isUnicodeResult(names: ['octopus']),
@@ -430,6 +430,7 @@ void main() {
         isUnicodeResult(names: ['tada']),
         isUnicodeResult(names: ['working_on_it', 'hammer_and_wrench', 'tools']),
         // other
+        isUnicodeResult(names: ['slight_smile']),
         isUnicodeResult(names: ['heart', 'love', 'love_you']),
         isUnicodeResult(names: ['octopus']),
       ]);
@@ -440,6 +441,7 @@ void main() {
         isUnicodeResult(names: ['working_on_it', 'hammer_and_wrench', 'tools']),
         // other
         isUnicodeResult(names: ['+1', 'thumbs_up', 'like']),
+        isUnicodeResult(names: ['slight_smile']),
       ]);
     });
 

test/model/store_test.dart

@@ -705,7 +705,7 @@ void main() {
 
     final emojiDataUrl = Uri.parse('https://cdn.example/emoji.json');
     final data = {
-      '1f642': ['smile'],
+      '1f642': ['slight_smile'],
       '1f34a': ['orange', 'tangerine', 'mandarin'],
     };
 

test/widgets/action_sheet_test.dart

@@ -74,8 +74,8 @@ Future<void> setupToMessageActionSheet(WidgetTester tester, {
   connection = store.connection as FakeApiConnection;
   if (shouldSetServerEmojiData) {
     store.setServerEmojiData(useLegacyServerEmojiData
-      ? eg.serverEmojiDataPopular
-      : eg.serverEmojiDataPopularModern);
+      ? eg.serverEmojiDataPopularLegacy
+      : eg.serverEmojiDataPopular);
   }
 
   connection.prepare(json: eg.newestGetMessagesResult(
@@ -830,8 +830,8 @@ void main() {
         final popularCandidates =
           (eg.store()..setServerEmojiData(
             useLegacy
-              ? eg.serverEmojiDataPopular
-              : eg.serverEmojiDataPopularModern))
+              ? eg.serverEmojiDataPopularLegacy
+              : eg.serverEmojiDataPopular))
             .popularEmojiCandidates();
         for (final emoji in popularCandidates) {
           final emojiDisplay = emoji.emojiDisplay as UnicodeEmojiDisplay;

test/widgets/emoji_reaction_test.dart

@@ -161,7 +161,7 @@ void main() {
             // Base JSON for various unicode emoji reactions. Just missing user_id.
             final u1 = {'emoji_name': '+1', 'emoji_code': '1f44d', 'reaction_type': 'unicode_emoji'};
             final u2 = {'emoji_name': 'family_man_man_girl_boy', 'emoji_code': '1f468-200d-1f468-200d-1f467-200d-1f466', 'reaction_type': 'unicode_emoji'};
-            final u3 = {'emoji_name': 'smile', 'emoji_code': '1f642', 'reaction_type': 'unicode_emoji'};
+            final u3 = {'emoji_name': 'slight_smile', 'emoji_code': '1f642', 'reaction_type': 'unicode_emoji'};
             final u4 = {'emoji_name': 'tada', 'emoji_code': '1f389', 'reaction_type': 'unicode_emoji'};
             final u5 = {'emoji_name': 'exploding_head', 'emoji_code': '1f92f', 'reaction_type': 'unicode_emoji'};
 
@@ -239,7 +239,7 @@ void main() {
     await setupChipsInBox(tester, reactions: [
       Reaction.fromJson({
         'user_id': eg.selfUser.userId,
-        'emoji_name': 'smile', 'emoji_code': '1f642', 'reaction_type': 'unicode_emoji'}),
+        'emoji_name': 'slight_smile', 'emoji_code': '1f642', 'reaction_type': 'unicode_emoji'}),
       Reaction.fromJson({
         'user_id': eg.otherUser.userId,
         'emoji_name': 'tada', 'emoji_code': '1f389', 'reaction_type': 'unicode_emoji'}),
@@ -251,7 +251,7 @@ void main() {
       return material.color;
     }
 
-    check(backgroundColor('smile')).isNotNull()
+    check(backgroundColor('slight_smile')).isNotNull()
       .isSameColorAs(EmojiReactionTheme.light.bgSelected);
     check(backgroundColor('tada')).isNotNull()
       .isSameColorAs(EmojiReactionTheme.light.bgUnselected);
@@ -261,13 +261,13 @@ void main() {
 
     await tester.pump(kThemeAnimationDuration * 0.4);
     final expectedLerped = EmojiReactionTheme.light.lerp(EmojiReactionTheme.dark, 0.4);
-    check(backgroundColor('smile')).isNotNull()
+    check(backgroundColor('slight_smile')).isNotNull()
       .isSameColorAs(expectedLerped.bgSelected);
     check(backgroundColor('tada')).isNotNull()
       .isSameColorAs(expectedLerped.bgUnselected);
 
     await tester.pump(kThemeAnimationDuration * 0.6);
-    check(backgroundColor('smile')).isNotNull()
+    check(backgroundColor('slight_smile')).isNotNull()
       .isSameColorAs(EmojiReactionTheme.dark.bgSelected);
     check(backgroundColor('tada')).isNotNull()
       .isSameColorAs(EmojiReactionTheme.dark.bgUnselected);