refactor: model: Rename stream_dict to _subscribed_streams.

This commit renames stream_dict to _subscribed_streams. This change is
necessary due to the introduction of _unsubscribed_streams and
never_subscribed streams in the model.

Tests updated.

Author: theViz343

tests/conftest.py

@@ -299,12 +299,12 @@ def web_public_stream() -> Subscription:
 @pytest.fixture
 def get_stream_from_id_fixture(
     stream_id: int,
-    stream_dict: Dict[int, Subscription],
+    _subscribed_streams: Dict[int, Subscription],
     unsubscribed_streams_fixture: Dict[int, Subscription],
     never_subscribed_streams_fixture: Dict[int, Stream],
 ) -> Union[Subscription, Stream]:
-    if stream_id in stream_dict:
-        return stream_dict[stream_id]
+    if stream_id in _subscribed_streams:
+        return _subscribed_streams[stream_id]
     elif stream_id in unsubscribed_streams_fixture:
         return unsubscribed_streams_fixture[stream_id]
     else:
@@ -1278,7 +1278,7 @@ def never_subscribed_streams_fixture() -> Dict[int, Stream]:
 
 
 @pytest.fixture
-def stream_dict(streams_fixture: List[Subscription]) -> Dict[int, Subscription]:
+def _subscribed_streams(streams_fixture: List[Subscription]) -> Dict[int, Subscription]:
     return {stream["stream_id"]: stream for stream in streams_fixture}
 
 

tests/core/test_core.py

@@ -132,10 +132,10 @@ def test_narrow_to_stream(
         controller.model.narrow = []
         controller.model.index = index_stream
         controller.view.message_view = mocker.patch("urwid.ListBox")
-        controller.model.stream_dict = {
+        controller.model._subscribed_streams = {
             stream_id: general_stream,
         }
-        controller.model.stream_dict[stream_id].update(
+        controller.model._subscribed_streams[stream_id].update(
             {
                 "color": "#ffffff",
                 "name": stream_name,
@@ -191,10 +191,10 @@ def test_narrow_to_topic(
         controller.model.index = index_multiple_topic_msg
         controller.model.stream_id = initial_stream_id
         controller.view.message_view = mocker.patch("urwid.ListBox")
-        controller.model.stream_dict = {
+        controller.model._subscribed_streams = {
             stream_id: general_stream,
         }
-        controller.model.stream_dict[stream_id].update(
+        controller.model._subscribed_streams[stream_id].update(
             {
                 "color": "#ffffff",
                 "name": stream_name,
@@ -267,10 +267,10 @@ def test_narrow_to_all_messages(
         controller.view.message_view = mocker.patch("urwid.ListBox")
         controller.model.user_email = "some@email"
         controller.model.user_id = 1
-        controller.model.stream_dict = {
+        controller.model._subscribed_streams = {
             205: general_stream,
         }
-        controller.model.stream_dict[205].update(
+        controller.model._subscribed_streams[205].update(
             {
                 "color": "#ffffff",
             }
@@ -323,10 +323,10 @@ def test_narrow_to_all_starred(
         # FIXME: Expand upon is_muted_topic().
         mocker.patch(MODEL + ".is_muted_topic", return_value=False)
         controller.model.user_email = "some@email"
-        controller.model.stream_dict = {
+        controller.model._subscribed_streams = {
             205: general_stream,
         }
-        controller.model.stream_dict[205].update(
+        controller.model._subscribed_streams[205].update(
             {
                 "color": "#ffffff",
             }
@@ -357,10 +357,10 @@ def test_narrow_to_all_mentions(
         mocker.patch(MODEL + ".is_muted_topic", return_value=False)
         controller.model.user_email = "some@email"
         controller.model.user_id = 1
-        controller.model.stream_dict = {
+        controller.model._subscribed_streams = {
             205: general_stream,
         }
-        controller.model.stream_dict[205].update(
+        controller.model._subscribed_streams[205].update(
             {
                 "color": "#ffffff",
             }

tests/helper/test_helper.py

@@ -278,18 +278,21 @@ def test_powerset(
 def test_classify_unread_counts(
     mocker: MockerFixture,
     initial_data: Dict[str, Any],
-    stream_dict: Dict[int, Subscription],
+    _subscribed_streams: Dict[int, Subscription],
     classified_unread_counts: Dict[str, Any],
     muted_topics: List[List[str]],
     muted_streams: Set[int],
     vary_in_unreads: Dict[str, Any],
 ) -> None:
     model = mocker.Mock()
-    model.stream_dict = stream_dict
+    model._subscribed_streams = _subscribed_streams
     model.initial_data = initial_data
     model.is_muted_topic = mocker.Mock(
         side_effect=(
-            lambda stream_id, topic: [model.stream_dict[stream_id]["name"], topic]
+            lambda stream_id, topic: [
+                model._subscribed_streams[stream_id]["name"],
+                topic,
+            ]
             in muted_topics
         )
     )