refactor: Reduce the direct usage of stream dict in tests.

This commit removes the direct use of stream dicts in most
of the tests and if necessary, patches the stream accessor
methods created in a previous commit.

Author: theViz343

tests/core/test_core.py

@@ -134,10 +134,9 @@ 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 = {
-            stream_id: general_stream,
-        }
-        controller.model.stream_dict[stream_id]["name"] = stream_name
+        mocker.patch(MODEL + ".stream_name_from_id", return_value=stream_name)
+        mocker.patch(MODEL + ".stream_id_from_name", return_value=stream_id)
+        mocker.patch(MODEL + ".is_user_subscribed_to_stream", return_value=True)
         controller.model.muted_streams = set()
         mocker.patch(MODEL + ".is_muted_topic", return_value=False)
 
@@ -186,10 +185,9 @@ 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 = {
-            stream_id: general_stream,
-        }
-        controller.model.stream_dict[stream_id]["name"] = stream_name
+        mocker.patch(MODEL + ".stream_name_from_id", return_value=stream_name)
+        mocker.patch(MODEL + ".stream_id_from_name", return_value=stream_id)
+        mocker.patch(MODEL + ".is_user_subscribed_to_stream", return_value=True)
         controller.model.muted_streams = set()
         mocker.patch(MODEL + ".is_muted_topic", return_value=False)
 
@@ -263,9 +261,7 @@ 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 = {
-            stream_id: general_stream,
-        }
+        mocker.patch(MODEL + ".is_user_subscribed_to_stream", return_value=True)
         controller.model.muted_streams = set()
         mocker.patch(MODEL + ".is_muted_topic", return_value=False)
 
@@ -315,9 +311,7 @@ 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 = {
-            stream_id: general_stream,
-        }
+        mocker.patch(MODEL + ".is_user_subscribed_to_stream", return_value=True)
         controller.view.message_view = mocker.patch("urwid.ListBox")
 
         controller.narrow_to_all_starred()  # FIXME: Add id narrowing test
@@ -345,9 +339,7 @@ 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 = {
-            stream_id: general_stream,
-        }
+        mocker.patch(MODEL + ".is_user_subscribed_to_stream", return_value=True)
         controller.view.message_view = mocker.patch("urwid.ListBox")
 
         controller.narrow_to_all_mentions()  # FIXME: Add id narrowing test

tests/ui/test_ui_tools.py

@@ -695,7 +695,6 @@ def test_update_topics_list(
     ):
         mocker.patch(SUBDIR + ".buttons.TopButton.__init__", return_value=None)
         set_focus_valign = mocker.patch(VIEWS + ".urwid.ListBox.set_focus_valign")
-        topic_view.view.controller.model.stream_dict = {86: {"name": "PTEST"}}
         topic_view.view.controller.model.is_muted_topic = mocker.Mock(
             return_value=False
         )

tests/ui_tools/test_buttons.py

@@ -434,11 +434,6 @@ def test_init_calls_top_button(
         is_resolved: bool,
     ) -> None:
         controller = mocker.Mock()
-        controller.model.stream_dict = {
-            205: {"name": "PTEST"},
-            86: {"name": "Django"},
-            14: {"name": "GSoC"},
-        }
         controller.model.is_muted_topic = mocker.Mock(return_value=False)
         view = mocker.Mock()
         top_button = mocker.patch(MODULE + ".TopButton.__init__")
@@ -488,7 +483,6 @@ def test_init_calls_mark_muted(
         controller.model.is_muted_topic = mocker.Mock(
             return_value=is_muted_topic_return_value
         )
-        controller.model.stream_dict = {205: {"name": stream_name}}
         view = mocker.Mock()
         TopicButton(
             stream_id=205,
@@ -899,14 +893,12 @@ def test__parse_narrow_link(
     )
     def test__validate_narrow_link(
         self,
-        stream_dict: Dict[int, Any],
         parsed_link: ParsedNarrowLink,
         is_user_subscribed_to_stream: Optional[bool],
         is_valid_stream: Optional[bool],
         topics_in_stream: Optional[List[str]],
         expected_error: str,
     ) -> None:
-        self.controller.model.stream_dict = stream_dict
         self.controller.model.is_user_subscribed_to_stream.return_value = (
             is_user_subscribed_to_stream
         )

tests/ui_tools/test_messages.py

@@ -746,11 +746,6 @@ def test_soup2markup(self, content, expected_markup, mocker):
         ],
     )
     def test_main_view(self, mocker, message, last_message):
-        self.model.stream_dict = {
-            5: {
-                "color": "#bd6",
-            },
-        }
         MessageBox(message, self.model, last_message)
 
     @pytest.mark.parametrize(
@@ -825,11 +820,6 @@ def test_main_view_renders_slash_me(self, mocker, message, content, is_me_messag
     def test_main_view_generates_stream_header(
         self, mocker, message, to_vary_in_last_message
     ):
-        self.model.stream_dict = {
-            5: {
-                "color": "#bd6",
-            },
-        }
         last_message = dict(message, **to_vary_in_last_message)
         msg_box = MessageBox(message, self.model, last_message)
         view_components = msg_box.main_view()