Add tests for controller

BudjakovDmitry · BudjakovDmitry · commit fc98c77499a5 · 2025-03-11T18:33:55.000+03:00
diff --git a/homework_03/README.md b/homework_03/README.md
@@ -3,6 +3,7 @@
 ## Запуск
 
 ```shell
+cd homework_03
 python main.py
 ```
 
diff --git a/homework_03/main.py b/homework_03/main.py
@@ -1,4 +1,4 @@
-from controller import PhonebookController
+from src.controller import PhonebookController
 
 
 if __name__ == '__main__':
diff --git a/homework_03/src/__init__.py b/homework_03/src/__init__.py
diff --git a/homework_03/src/controller.py b/homework_03/src/controller.py
@@ -80,7 +80,7 @@ def _print_contacts(self):
         """Print all contacts."""
         for contact in self.phonebook.contacts():
             OutputView.contact_info(
-                contact_id=contact.id_,
+                contact_id=contact.id,
                 name=contact.name,
                 phone=contact.phone,
                 comment=contact.comment,
diff --git a/homework_03/tests/controller/test_controller.py b/homework_03/tests/controller/test_controller.py
@@ -1,16 +1,18 @@
 import os
 import random
 from unittest import TestCase
-from unittest.mock import call, patch
+from unittest.mock import call, patch, MagicMock
 
 from src.controller import PhonebookController, CommandNotFound, FieldRequired
-from src.model import JsonStorage
+from src.model import Contact, JsonStorage
 from src.view import Commands
 from tests.utils import (
     generate_random_id,
     generate_random_string,
+    generate_random_phone,
     generate_contact,
     generate_contacts,
+    generate_contacts_storage,
 )
 
 
@@ -180,14 +182,12 @@ def test_entered_integer_value(self):
             self.assertEqual(result, expected)
 
     def test_entered_not_integer_value(self):
-        with patch(
-            "src.view.InputView.ask_required_field",
-                return_value=generate_random_string()
-        ):
+        value = generate_random_string()
+        with patch("src.view.InputView.ask_required_field", return_value=value):
             self.assertRaises(
                 ValueError,
                 self.controller._get_required_integer_field,
-                generate_random_id(),
+                value,
             )
 
 
@@ -217,40 +217,220 @@ def test_get_contact_called(self, get_contact, update_fields):
             self.controller._edit_contact()
             get_contact.assert_called_with(contact_id)
 
-    # @patch("src.view.InputView.update_field")
+    @patch("src.view.InputView.update_field")
     @patch("src.model.PhonebookModel.get")
     @patch("src.controller.PhonebookController._get_required_integer_field")
-    def test_new_name_asked(self, ask_id, get_contact):
-        with patch("src.view.InputView.update_field") as ask_new_values:
-            self.controller._edit_contact()
-            calls = [call("name"), call("phone"), call("comment")]
-            ask_new_values.assert_has_calls(calls, any_order=True)
-            self.assertEqual(3, ask_new_values.call_count)
+    def test_new_values_asked(self, ask_id, get_contact, ask_new_values):
+        self.controller._edit_contact()
+        calls = [call("name"), call("phone"), call("comment")]
+        ask_new_values.assert_has_calls(calls, any_order=True)
+        self.assertEqual(len(calls), ask_new_values.call_count)
 
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_update_name_called(self, ask_id):
+        contact = generate_contact()
+        contact.update_name = MagicMock()
 
-    def test_update_name_called(self):
-        pass
+        new_name = generate_random_string()
+        with patch("src.view.InputView.update_field", side_effect=[new_name, "", ""]):
+            with patch("src.model.PhonebookModel.get", return_value=contact):
+                self.controller._edit_contact()
+                contact.update_name.assert_called_with(new_name)
 
-    def test_try_clear_name(self):
-        pass
+    @patch("src.view.InputView.update_field", side_effect=["<", "", ""])
+    @patch("src.model.PhonebookModel.get")
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_try_clear_name(self, ask_id, get_contact, ask_new_values):
+        self.assertRaises(ValueError, self.controller._edit_contact)
 
-    def test_new_phone_asked(self):
-        pass
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_update_phone_called(self, ask_id):
+        contact = generate_contact()
+        contact.update_phone = MagicMock()
 
-    def test_update_phone_called(self):
-        pass
+        new_phone = generate_random_phone()
+        with patch("src.view.InputView.update_field", side_effect=["", new_phone, ""]):
+            with patch("src.model.PhonebookModel.get", return_value=contact):
+                self.controller._edit_contact()
+                contact.update_phone.assert_called_with(new_phone)
 
-    def test_try_clear_phone(self):
-        pass
+    @patch("src.view.InputView.update_field", side_effect=["", "<", ""])
+    @patch("src.model.PhonebookModel.get")
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_try_clear_phone(self, ask_id, get_contact, ask_new_values):
+        self.assertRaises(ValueError, self.controller._edit_contact)
 
-    def test_new_comment_asked(self):
-        pass
+    @patch("src.view.InputView.update_field", side_effect=["", "", "<"])
+    @patch("src.model.PhonebookModel.get")
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_clear_comment_called(self, ask_id, get_contact, ask_new_values):
+        contact = generate_contact()
+        contact.clear_comment = MagicMock()
 
-    def test_clear_comment_called(self):
-        pass
+        with patch("src.view.InputView.update_field", side_effect=["", "", "<"]):
+            with patch("src.model.PhonebookModel.get", return_value=contact):
+                self.controller._edit_contact()
+                contact.clear_comment.assert_called()
 
-    def test_update_comment_called(self):
-        pass
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_update_comment_called(self, ask_id):
+        contact = generate_contact()
+        contact.update_comment = MagicMock()
+
+        new_comment = generate_random_phone()
+        with patch(
+            "src.view.InputView.update_field", side_effect=["", "", new_comment]
+        ):
+            with patch("src.model.PhonebookModel.get", return_value=contact):
+                self.controller._edit_contact()
+                contact.update_comment.assert_called_with(new_comment)
 
-    def test_return_contact(self):
-        pass
+    @patch("src.view.InputView.update_field", side_effect=["", "", ""])
+    @patch("src.model.PhonebookModel.get")
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_return_contact(self, ask_id, get_contact, ask_new_values):
+        contact = generate_contact()
+        with patch("src.model.PhonebookModel.get", return_value=contact):
+            result = self.controller._edit_contact()
+            self.assertIsInstance(result, Contact)
+
+
+class TestDeleteContact(TestCase):
+    def setUp(self):
+        self.controller = PhonebookController()
+
+    def tearDown(self):
+        if os.path.isfile(JsonStorage.STORAGE):
+            os.remove(JsonStorage.STORAGE)
+
+    @patch("src.controller.PhonebookController._get_required_integer_field")
+    def test_id_asked(self, ask_id):
+        self.controller._delete_contact()
+        ask_id.assert_called_with("Contact ID")
+
+    @patch("src.model.PhonebookModel.delete_contact")
+    def test_delete_contact_called(self, delete_contact):
+        id_ = generate_random_id()
+        with patch(
+            "src.controller.PhonebookController._get_required_integer_field",
+            return_value=id_,
+        ):
+            self.controller._delete_contact()
+            delete_contact.assert_called_with(id_)
+
+
+class TestShowStorage(TestCase):
+    def setUp(self):
+        self.controller = PhonebookController()
+
+    def tearDown(self):
+        if os.path.isfile(JsonStorage.STORAGE):
+            os.remove(JsonStorage.STORAGE)
+
+    @patch("src.view.OutputView.print_raw")
+    @patch("src.model.PhonebookModel.raw_storage")
+    def test_raw_storage_asked(self, raw_storage, output):
+        self.controller._show_storage()
+        raw_storage.assert_called()
+
+    @patch("src.view.OutputView.print_raw")
+    def test_storage_showed_in_view(self, output_view):
+        storage = generate_contacts_storage()
+        with patch("src.model.PhonebookModel.raw_storage", return_value=storage):
+            self.controller._show_storage()
+            output_view.assert_called_with(storage)
+
+
+class TestPrintContacts(TestCase):
+    def setUp(self):
+        self.controller = PhonebookController()
+
+    def tearDown(self):
+        if os.path.isfile(JsonStorage.STORAGE):
+            os.remove(JsonStorage.STORAGE)
+
+    @patch("src.view.OutputView.contact_info")
+    def test_print_all_contacts(self, contact_info):
+        contacts = list(generate_contacts())
+        calls = [
+            call(contact_id=c.id, name=c.name, phone=c.phone, comment=c.comment)
+            for c in contacts
+        ]
+        with patch(
+            "src.model.PhonebookModel.contacts", return_value=iter(contacts)
+        ) as mock_contacts:
+            self.controller._print_contacts()
+            contact_info.assert_has_calls(calls)
+
+
+class TestRun(TestCase):
+    def setUp(self):
+        self.controller = PhonebookController()
+
+    def tearDown(self):
+        if os.path.isfile(JsonStorage.STORAGE):
+            os.remove(JsonStorage.STORAGE)
+
+    @patch(
+        "src.controller.PhonebookController._get_command_or_raise", return_value="exit"
+    )
+    def test_ask_command(self, ask_command):
+        self.controller.run()
+        ask_command.asserc_called_once()
+
+    @patch("src.view.ErrorView.unknown_command")
+    def test_unknown_command(self, view_mock):
+        command = generate_random_string(length=100)
+        error_message = f"Command {command} not found"
+        with patch(
+            "src.controller.PhonebookController._get_command_or_raise",
+            side_effect=[CommandNotFound(error_message), "exit"],
+        ):
+            self.controller.run()
+            view_mock.assert_called_with(error_message)
+
+    @patch("src.controller.PhonebookController._add_contact")
+    def test_add_command(self, add_contact):
+        with patch(
+            "src.controller.PhonebookController._get_command_or_raise",
+            side_effect=["add", "exit"],
+        ):
+            self.controller.run()
+            add_contact.assert_called_once()
+
+    @patch("src.view.ErrorView.required_field")
+    def test_add_command_error(self, view):
+        field_name = generate_random_string()
+        with patch(
+            "src.controller.PhonebookController._add_contact",
+            side_effect=FieldRequired(field_name),
+        ):
+            with patch(
+                "src.controller.PhonebookController._get_command_or_raise",
+                side_effect=["add", "exit"],
+            ):
+                self.controller.run()
+                view.assert_called_with(field_name)
+
+    @patch("src.controller.PhonebookController._find_contact")
+    def test_find_contact(self, find_contact):
+        with patch(
+            "src.controller.PhonebookController._get_command_or_raise",
+            side_effect=["find", "exit"],
+        ):
+            self.controller.run()
+            find_contact.assert_called_once()
+
+    @patch("src.view.ErrorView.required_field")
+    def test_find_contact_error(self, view):
+        field_name = generate_random_string()
+        with patch(
+            "src.controller.PhonebookController._find_contact",
+            side_effect=FieldRequired(field_name),
+        ):
+            with patch(
+                "src.controller.PhonebookController._get_command_or_raise",
+                side_effect=["find", "exit"],
+            ):
+                self.controller.run()
+                view.assert_called_with(field_name)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from controller import PhonebookController`
	`1`	`+from src.controller import PhonebookController`
`2`	`2`
`3`	`3`
`4`	`4`	`if __name__ == '__main__':`