conftest/helper/views: Use canonical_topic() for unread_counts.

Tests amended.

Author: preetmishra

tests/conftest.py

@@ -800,8 +800,8 @@ def classified_unread_counts():
         'all_msg': 12,
         'all_pms': 8,
         'unread_topics': {
-            (1000, 'Some general unread topic'): 3,
-            (99, 'Some private unread topic'): 1
+            (1000, 'some general unread topic'): 3,
+            (99, 'some private unread topic'): 1
         },
         'unread_pms': {
             1: 2,

tests/helper/test_helper.py

@@ -189,16 +189,16 @@ def test_powerset(iterable, map_func, expected_powerset):
 
 
 @pytest.mark.parametrize('muted_streams, muted_topics, vary_in_unreads', [
-    ([99], [['Some general stream', 'Some general unread topic']], {
+    ([99], [['Some general stream', 'some general unread topic']], {
         'all_msg': 8,
         'streams': {99: 1},
-        'unread_topics': {(99, 'Some private unread topic'): 1},
+        'unread_topics': {(99, 'some private unread topic'): 1},
         'all_mentions': 0,
     }),
-    ([1000], [['Secret stream', 'Some private unread topic']], {
+    ([1000], [['Secret stream', 'some private unread topic']], {
         'all_msg': 8,
         'streams': {1000: 3},
-        'unread_topics': {(1000, 'Some general unread topic'): 3},
+        'unread_topics': {(1000, 'some general unread topic'): 3},
         'all_mentions': 0,
     }),
     ([1], [], {'all_mentions': 0})
@@ -214,7 +214,7 @@ def test_classify_unread_counts(mocker, initial_data, stream_dict,
     model.initial_data = initial_data
     model.is_muted_topic = mocker.Mock(side_effect=(
         lambda stream_id, topic:
-        [model.stream_dict[stream_id]['name'], topic] in muted_topics
+        [model.stream_dict[stream_id]['name'], topic.lower()] in muted_topics
     ))
     model.muted_streams = muted_streams
     assert classify_unread_counts(model) == dict(classified_unread_counts,

tests/ui/test_ui_tools.py

@@ -1144,8 +1144,8 @@ def mock_external_classes(self, mocker):
                 1000: 1,
             },
             'unread_topics': {
-                (205, 'TOPIC1'): 34,
-                (205, 'TOPIC2'): 100,
+                (205, 'topic1'): 34,
+                (205, 'topic2'): 100,
             },
             'all_mentions': 1,
         }
@@ -1200,7 +1200,7 @@ def test_topics_view(self, mocker, stream_button, width=40):
         topic_button = mocker.patch(VIEWS + '.TopicButton')
         topics_view = mocker.patch(VIEWS + '.TopicsView')
         line_box = mocker.patch(VIEWS + '.urwid.LineBox')
-        topic_list = ['TOPIC1', 'TOPIC2', 'TOPIC3']
+        topic_list = ['topic1', 'topic2', 'topic3']
         unread_count_list = [34, 100, 0]
         self.view.model.topics_in_stream = (
             mocker.Mock(return_value=topic_list)

zulipterminal/helper.py

@@ -93,7 +93,7 @@
     'all_msg': int,
     'all_pms': int,
     'all_mentions': int,
-    'unread_topics': Dict[Tuple[int, str], int],  # stream_id, topic
+    'unread_topics': Dict[Tuple[int, str], int],  # stream_id, canonical topic
     'unread_pms': Dict[int, int],  # sender_id
     'unread_huddles': Dict[FrozenSet[int], int],  # Group pms
     'streams': Dict[int, int],  # stream_id
@@ -139,8 +139,10 @@ def update_unreads(unreads: Dict[KeyT, int], key: KeyT) -> None:
     for message in changed_messages:
         if message['type'] == 'stream':
             stream_id = message['stream_id']
+            # Use lowercase topic names in unread_topics to backup the
+            # invariant in index.
             update_unreads(unread_counts['unread_topics'],
-                           (stream_id, message['subject']))
+                           (stream_id, canonicalize_topic(message['subject'])))
             update_unreads(unread_counts['streams'], stream_id)
         # self-pm has only one display_recipient
         # 1-1 pms have 2 display_recipient
@@ -201,7 +203,7 @@ def _set_count_in_view(controller: Any, new_count: int,
                 # If topic_view is open for incoming messages's stream,
                 # We update the respective TopicButton count accordingly.
                 for topic_button in topic_buttons_log:
-                    if topic_button.topic_name == msg_topic:
+                    if compare_lowercase(topic_button.topic_name, msg_topic):
                         topic_button.update_count(topic_button.count
                                                   + new_count)
         else:
@@ -459,8 +461,10 @@ def classify_unread_counts(model: Any) -> UnreadCounts:
             continue
         if model.is_muted_topic(stream_id, stream['topic']):
             continue
-        stream_topic = (stream_id, stream['topic'])
-        unread_counts['unread_topics'][stream_topic] = count
+        stream_topic = (stream_id, canonicalize_topic(stream['topic']))
+        unread_counts['unread_topics'][stream_topic] = (
+            count + unread_counts['unread_topics'].get(stream_topic, 0)
+        )
         if not unread_counts['streams'].get(stream_id):
             unread_counts['streams'][stream_id] = count
         else:

zulipterminal/ui_tools/views.py

@@ -11,7 +11,9 @@
 from zulipterminal.config.symbols import (
     CHECK_MARK, LIST_TITLE_BAR_LINE, PINNED_STREAMS_DIVIDER,
 )
-from zulipterminal.helper import Message, asynch, match_stream, match_user
+from zulipterminal.helper import (
+    Message, asynch, canonicalize_topic, match_stream, match_user,
+)
 from zulipterminal.ui_tools.boxes import PanelSearchBox
 from zulipterminal.ui_tools.buttons import (
     HomeButton, MentionedButton, MessageLinkButton, PMButton, StarredButton,
@@ -790,7 +792,7 @@ def topics_view(self, stream_button: Any) -> Any:
                 controller=self.controller,
                 width=self.width,
                 count=self.model.unread_counts['unread_topics'].
-                get((stream_id, topic), 0)
+                get((stream_id, canonicalize_topic(topic)), 0)
             )
             for topic in topics
         ]