From 2568d527309f76e3b919356d5dc67840f772385d Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Fri, 16 Sep 2022 12:28:47 +0530 Subject: [PATCH] UT: Use AgentEventSerializerRegistry in place of EventSerializerRegistry --- .../event_serializers/test_event_serializer_registry.py | 4 ++-- .../cc/repository/test_mongo_event_repository.py | 6 +++--- .../unit_tests/monkey_island/cc/resources/test_events.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/monkey/tests/unit_tests/common/event_serializers/test_event_serializer_registry.py b/monkey/tests/unit_tests/common/event_serializers/test_event_serializer_registry.py index f918ede23..9e500f419 100644 --- a/monkey/tests/unit_tests/common/event_serializers/test_event_serializer_registry.py +++ b/monkey/tests/unit_tests/common/event_serializers/test_event_serializer_registry.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock import pytest from pydantic import Field -from common.event_serializers import EventSerializerRegistry, IAgentEventSerializer +from common.event_serializers import AgentEventSerializerRegistry, IAgentEventSerializer from common.events import AbstractAgentEvent @@ -25,7 +25,7 @@ OTHER_SERIALIZER = MagicMock(spec=IAgentEventSerializer) @pytest.fixture def event_serializer_registry(): - event_serializer_registry = EventSerializerRegistry() + event_serializer_registry = AgentEventSerializerRegistry() event_serializer_registry[SomeEvent] = SOME_SERIALIZER event_serializer_registry[OtherEvent] = OTHER_SERIALIZER diff --git a/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py b/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py index 64de7edc8..1da6366e2 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py +++ b/monkey/tests/unit_tests/monkey_island/cc/repository/test_mongo_event_repository.py @@ -6,7 +6,7 @@ import mongomock import pytest from pydantic import Field -from common.event_serializers import EventSerializerRegistry, PydanticEventSerializer +from common.event_serializers import AgentEventSerializerRegistry, PydanticEventSerializer from common.events import AbstractAgentEvent from monkey_island.cc.repository import ( IEventRepository, @@ -34,8 +34,8 @@ EVENTS: List[AbstractAgentEvent] = [ @pytest.fixture -def event_serializer_registry() -> EventSerializerRegistry: - registry = EventSerializerRegistry() +def event_serializer_registry() -> AgentEventSerializerRegistry: + registry = AgentEventSerializerRegistry() registry[FakeAgentEvent] = PydanticEventSerializer(FakeAgentEvent) registry[FakeAgentItemEvent] = PydanticEventSerializer(FakeAgentItemEvent) return registry diff --git a/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py b/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py index 5d8db24f5..0a9ea7777 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py +++ b/monkey/tests/unit_tests/monkey_island/cc/resources/test_events.py @@ -6,7 +6,7 @@ import pytest from tests.common import StubDIContainer from common.event_queue import IAgentEventQueue -from common.event_serializers import EventSerializerRegistry, PydanticEventSerializer +from common.event_serializers import AgentEventSerializerRegistry, PydanticEventSerializer from common.events import AbstractAgentEvent from monkey_island.cc.resources import Events @@ -88,8 +88,8 @@ def mock_agent_event_queue(): @pytest.fixture -def event_serializer_registry() -> EventSerializerRegistry: - event_serializer_registry = EventSerializerRegistry() +def event_serializer_registry() -> AgentEventSerializerRegistry: + event_serializer_registry = AgentEventSerializerRegistry() event_serializer_registry[SomeAgentEvent] = PydanticEventSerializer(SomeAgentEvent) event_serializer_registry[OtherAgentEvent] = PydanticEventSerializer(OtherAgentEvent) event_serializer_registry[DifferentAgentEvent] = PydanticEventSerializer(DifferentAgentEvent) @@ -102,7 +102,7 @@ def flask_client(build_flask_client, mock_agent_event_queue, event_serializer_re container = StubDIContainer() container.register_instance(IAgentEventQueue, mock_agent_event_queue) - container.register_instance(EventSerializerRegistry, event_serializer_registry) + container.register_instance(AgentEventSerializerRegistry, event_serializer_registry) with build_flask_client(container) as flask_client: yield flask_client