From 856261cef8104aba90cd2e38835df40985bfaf49 Mon Sep 17 00:00:00 2001 From: Adam Kadlec Date: Tue, 22 Mar 2022 00:18:27 +0100 Subject: [PATCH] Fixing tests --- src/Constants.php | 54 +++++++++---------- .../Subscribers/EntitiesSubscriberTest.phpt | 6 +-- .../repositories/test_channels_controls.py | 2 +- .../repositories/test_channels_properties.py | 2 +- .../repositories/test_connectors_controls.py | 2 +- .../repositories/test_devices_controls.py | 2 +- .../repositories/test_devices_properties.py | 2 +- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Constants.php b/src/Constants.php index bd2e4f8c..9188bfdc 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -68,39 +68,39 @@ final class Constants * Message bus routing keys mapping */ public const MESSAGE_BUS_CREATED_ENTITIES_ROUTING_KEYS_MAPPING = [ - DevicesModuleEntities\Devices\Device::class => Metadata\Constants::MESSAGE_BUS_DEVICES_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Devices\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_DEVICES_PROPERTIES_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Devices\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_DEVICES_CONTROLS_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Channel::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_PROPERTIES_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_CONTROLS_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Connector::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_PROPERTIES_CREATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_CONTROLS_CREATED_ENTITY_ROUTING_KEY, + DevicesModuleEntities\Devices\Device::class => Metadata\Constants::MESSAGE_BUS_DEVICE_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Devices\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_DEVICE_PROPERTY_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Devices\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_DEVICE_CONTROL_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Channels\Channel::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Channels\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_PROPERTY_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Channels\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_CONTROL_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Connector::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_PROPERTY_ENTITY_CREATED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_CONTROL_ENTITY_CREATED_ROUTING_KEY, ]; public const MESSAGE_BUS_UPDATED_ENTITIES_ROUTING_KEYS_MAPPING = [ - DevicesModuleEntities\Devices\Device::class => Metadata\Constants::MESSAGE_BUS_DEVICES_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Devices\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_DEVICES_PROPERTIES_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Devices\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_DEVICES_CONTROLS_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Channel::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_PROPERTIES_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_CONTROLS_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Connector::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_PROPERTIES_UPDATED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_CONTROLS_UPDATED_ENTITY_ROUTING_KEY, + DevicesModuleEntities\Devices\Device::class => Metadata\Constants::MESSAGE_BUS_DEVICE_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Devices\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_DEVICE_PROPERTY_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Devices\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_DEVICE_CONTROL_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Channels\Channel::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Channels\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_PROPERTY_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Channels\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_CONTROL_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Connector::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_PROPERTY_ENTITY_UPDATED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_CONTROL_ENTITY_UPDATED_ROUTING_KEY, ]; public const MESSAGE_BUS_DELETED_ENTITIES_ROUTING_KEYS_MAPPING = [ - DevicesModuleEntities\Devices\Device::class => Metadata\Constants::MESSAGE_BUS_DEVICES_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Devices\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_DEVICES_PROPERTIES_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Devices\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_DEVICES_CONTROLS_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Channel::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_PROPERTIES_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Channels\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CHANNELS_CONTROLS_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Connector::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_PROPERTIES_DELETED_ENTITY_ROUTING_KEY, - DevicesModuleEntities\Connectors\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CONNECTORS_CONTROLS_DELETED_ENTITY_ROUTING_KEY, + DevicesModuleEntities\Devices\Device::class => Metadata\Constants::MESSAGE_BUS_DEVICE_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Devices\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_DEVICE_PROPERTY_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Devices\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_DEVICE_CONTROL_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Channels\Channel::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Channels\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_PROPERTY_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Channels\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CHANNEL_CONTROL_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Connector::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Properties\Property::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_PROPERTY_ENTITY_DELETED_ROUTING_KEY, + DevicesModuleEntities\Connectors\Controls\Control::class => Metadata\Constants::MESSAGE_BUS_CONNECTOR_CONTROL_ENTITY_DELETED_ROUTING_KEY, ]; } diff --git a/tests/cases/Unit/Subscribers/EntitiesSubscriberTest.phpt b/tests/cases/Unit/Subscribers/EntitiesSubscriberTest.phpt index 30c1bcc1..1c3c285e 100644 --- a/tests/cases/Unit/Subscribers/EntitiesSubscriberTest.phpt +++ b/tests/cases/Unit/Subscribers/EntitiesSubscriberTest.phpt @@ -69,7 +69,7 @@ final class EntitiesSubscriberTest extends BaseMockeryTestCase unset($data['id']); Assert::same(Metadata\Constants::MODULE_DEVICES_SOURCE, $source); - Assert::same(Metadata\Constants::MESSAGE_BUS_DEVICES_CREATED_ENTITY_ROUTING_KEY, $key); + Assert::same(Metadata\Constants::MESSAGE_BUS_DEVICE_ENTITY_CREATED_ROUTING_KEY, $key); Assert::equal(Utils\ArrayHash::from([ 'identifier' => 'device-name', 'type' => 'virtual', @@ -140,7 +140,7 @@ final class EntitiesSubscriberTest extends BaseMockeryTestCase unset($data['id']); Assert::same(Metadata\Constants::MODULE_DEVICES_SOURCE, $source); - Assert::same(Metadata\Constants::MESSAGE_BUS_DEVICES_UPDATED_ENTITY_ROUTING_KEY, $key); + Assert::same(Metadata\Constants::MESSAGE_BUS_DEVICE_ENTITY_UPDATED_ROUTING_KEY, $key); Assert::equal(Utils\ArrayHash::from([ 'identifier' => 'device-name', 'type' => 'virtual', @@ -210,7 +210,7 @@ final class EntitiesSubscriberTest extends BaseMockeryTestCase unset($data['id']); Assert::same(Metadata\Constants::MODULE_DEVICES_SOURCE, $source); - Assert::same(Metadata\Constants::MESSAGE_BUS_DEVICES_DELETED_ENTITY_ROUTING_KEY, $key); + Assert::same(Metadata\Constants::MESSAGE_BUS_DEVICE_ENTITY_DELETED_ROUTING_KEY, $key); Assert::equal(Utils\ArrayHash::from([ 'identifier' => 'device-name', 'type' => 'virtual', diff --git a/tests/pytests/repositories/test_channels_controls.py b/tests/pytests/repositories/test_channels_controls.py index a8cadcd2..d3f43ef0 100644 --- a/tests/pytests/repositories/test_channels_controls.py +++ b/tests/pytests/repositories/test_channels_controls.py @@ -61,7 +61,7 @@ def test_transform_to_dict(self, control_repository: ChannelControlsRepository) ) self.assertIsInstance( self.validate_exchange_data( - routing_key=RoutingKey.CHANNELS_CONTROL_ENTITY_REPORTED, + routing_key=RoutingKey.CHANNEL_CONTROL_ENTITY_REPORTED, data=entity.to_dict(), ), dict, diff --git a/tests/pytests/repositories/test_channels_properties.py b/tests/pytests/repositories/test_channels_properties.py index bc6f6db4..3df661c2 100644 --- a/tests/pytests/repositories/test_channels_properties.py +++ b/tests/pytests/repositories/test_channels_properties.py @@ -71,7 +71,7 @@ def test_transform_to_dict(self, property_repository: ChannelPropertiesRepositor ) self.assertIsInstance( self.validate_exchange_data( - routing_key=RoutingKey.CHANNELS_PROPERTY_ENTITY_REPORTED, + routing_key=RoutingKey.CHANNEL_PROPERTY_ENTITY_REPORTED, data=entity.to_dict(), ), dict, diff --git a/tests/pytests/repositories/test_connectors_controls.py b/tests/pytests/repositories/test_connectors_controls.py index af5f01c8..8274d388 100644 --- a/tests/pytests/repositories/test_connectors_controls.py +++ b/tests/pytests/repositories/test_connectors_controls.py @@ -61,7 +61,7 @@ def test_transform_to_dict(self, control_repository: ConnectorControlsRepository ) self.assertIsInstance( self.validate_exchange_data( - routing_key=RoutingKey.CONNECTORS_CONTROL_ENTITY_REPORTED, + routing_key=RoutingKey.CONNECTOR_CONTROL_ENTITY_REPORTED, data=entity.to_dict(), ), dict, diff --git a/tests/pytests/repositories/test_devices_controls.py b/tests/pytests/repositories/test_devices_controls.py index d23f4922..6643f815 100644 --- a/tests/pytests/repositories/test_devices_controls.py +++ b/tests/pytests/repositories/test_devices_controls.py @@ -61,7 +61,7 @@ def test_transform_to_dict(self, control_repository: DeviceControlsRepository) - ) self.assertIsInstance( self.validate_exchange_data( - routing_key=RoutingKey.DEVICES_CONTROL_ENTITY_REPORTED, + routing_key=RoutingKey.DEVICE_CONTROL_ENTITY_REPORTED, data=entity.to_dict(), ), dict, diff --git a/tests/pytests/repositories/test_devices_properties.py b/tests/pytests/repositories/test_devices_properties.py index bbef1ab8..c1c54c35 100644 --- a/tests/pytests/repositories/test_devices_properties.py +++ b/tests/pytests/repositories/test_devices_properties.py @@ -73,7 +73,7 @@ def test_transform_to_dict(self, property_repository: DevicePropertiesRepository ) self.assertIsInstance( self.validate_exchange_data( - routing_key=RoutingKey.DEVICES_PROPERTY_ENTITY_REPORTED, + routing_key=RoutingKey.DEVICE_PROPERTY_ENTITY_REPORTED, data=entity.to_dict(), ), dict,