refactor: TT-353 Changing variable names and tests

Author: Andrés Soto

V2/source/daos/activities_json_dao.py

@@ -23,9 +23,9 @@ def get_by_id(self, id: str) -> ActivityDto:
         except Exception:
             return HTTPStatus.NOT_FOUND
 
-        activity = self.__create_activity_dto(activity)
+        activity_dto = self.__create_activity_dto(activity)
 
-        return activity
+        return activity_dto
 
     def get_all(self) -> list:
         activities = self.__get_activities_from_file()

V2/tests/daos/activities_json_dao_test.py

@@ -4,7 +4,10 @@
 import json
 
 
-def test__get_by_id__returns_an_activity_dto__when_find_activity_that_matches_its_id(
+OPEN_FILE = 'builtins.open'
+
+
+def test_get_by_id__return_activity_dto__when_find_activity_that_matches_its_id(
     mocker,
 ):
     activities_json_dao = ActivitiesJsonDao('non-important-path')
@@ -18,12 +21,10 @@ def test__get_by_id__returns_an_activity_dto__when_find_activity_that_matches_it
             "status": "test_status",
         }
     ]
-    activity_dto = ActivityDto(**activities[0])
+    read_data = json.dumps(activities)
+    activity_dto = ActivityDto(**activities.pop())
 
-    activities_dao_mock = mocker.patch.object(
-        activities_json_dao, '_ActivitiesJsonDao__get_activities_from_file'
-    )
-    activities_dao_mock.return_value = activities
+    mocker.patch(OPEN_FILE, mocker.mock_open(read_data=read_data))
     result = activities_json_dao.get_by_id(activity_dto.id)
 
     assert result == activity_dto
@@ -33,12 +34,10 @@ def test__get_by_id__return_httpstatus_not_found__when_no_activity_matches_its_i
     mocker,
 ):
     activities_json_dao = ActivitiesJsonDao('non-important-path')
-    activity = []
+    activities = []
+    read_data = json.dumps(activities)
 
-    activities_dao_mock = mocker.patch.object(
-        activities_json_dao, '_ActivitiesJsonDao__get_activities_from_file'
-    )
-    activities_dao_mock.return_value = activity
+    mocker.patch(OPEN_FILE, mocker.mock_open(read_data=read_data))
     result = activities_json_dao.get_by_id('non-important-id')
 
     assert result == HTTPStatus.NOT_FOUND
@@ -60,11 +59,9 @@ def test_get_all__return_list_of_activity_dto__when_find_one_or_more_activities(
     activity_dto = ActivityDto(**activity)
     list_activities_dto = [activity_dto] * number_of_activities
     activities = [activity] * number_of_activities
+    read_data = json.dumps(activities)
 
-    activities_dao_mock = mocker.patch.object(
-        activities_json_dao, '_ActivitiesJsonDao__get_activities_from_file'
-    )
-    activities_dao_mock.return_value = activities
+    mocker.patch(OPEN_FILE, mocker.mock_open(read_data=read_data))
     result = activities_json_dao.get_all()
 
     assert result == list_activities_dto
@@ -73,64 +70,9 @@ def test_get_all__return_list_of_activity_dto__when_find_one_or_more_activities(
 def test_get_all__return_empty_list__when_doesnt_found_any_activities(mocker):
     activities_json_dao = ActivitiesJsonDao('non-important-path')
     activities = []
-
-    activities_dao_mock = mocker.patch.object(
-        activities_json_dao, '_ActivitiesJsonDao__get_activities_from_file'
-    )
-    activities_dao_mock.return_value = activities
-    result = activities_json_dao.get_all()
-
-    assert result == activities
-
-
-def test__get_activities_from_file__returns_a_list_of_activities__when_find_activities_on_a_json_file(
-    mocker,
-):
-    activities_json_dao = ActivitiesJsonDao('non-important-path')
-    activities = [
-        {
-            "name": "test_name",
-            "description": "test_description",
-            "tenant_id": "test_tenant_id",
-            "id": "test_id",
-            "deleted": "test_deleted",
-            "status": "test_status",
-        }
-    ]
     read_data = json.dumps(activities)
 
-    mocker.patch('builtins.open', mocker.mock_open(read_data=read_data))
-    result = activities_json_dao._ActivitiesJsonDao__get_activities_from_file()
+    mocker.patch(OPEN_FILE, mocker.mock_open(read_data=read_data))
+    result = activities_json_dao.get_all()
 
     assert result == activities
-
-
-def test__get_activities_from_file__returns_an_empty_list__when_doesnt_find_any_file(
-    mocker,
-):
-    activities_json_dao = ActivitiesJsonDao('non-important-path')
-
-    result = activities_json_dao._ActivitiesJsonDao__get_activities_from_file()
-
-    assert result == []
-
-
-def test__create_activity_dto__returns_an_activity_dto__when_input_is_an_activity_dict(
-    mocker,
-):
-    activities_json_dao = ActivitiesJsonDao('non-important-path')
-    activity = {
-        "name": "test_name",
-        "description": "test_description",
-        "tenant_id": "test_tenant_id",
-        "id": "test_id",
-        "deleted": "test_deleted",
-        "status": "test_status",
-    }
-    activity_dto = ActivityDto(**activity)
-
-    result = activities_json_dao._ActivitiesJsonDao__create_activity_dto(
-        activity
-    )
-
-    assert result == activity_dto