Replace old Components with specific classes in tests

Many tests build mock components, so now this components need to be
created as concrete subclasses of `Component`.

Some test also has some minor readability improvements.

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

tests/microgrid/test_data_sourcing.py

@@ -12,16 +12,21 @@
 import pytest
 import pytest_mock
 from frequenz.channels import Broadcast
+from frequenz.client.common.microgrid import MicrogridId
 from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryComponentState,
     BatteryRelayState,
-    Component,
-    ComponentCategory,
     EVChargerCableState,
     EVChargerComponentState,
     InverterComponentState,
 )
+from frequenz.client.microgrid.component import (
+    BatteryInverter,
+    DcEvCharger,
+    LiIonBattery,
+    Meter,
+)
 from frequenz.client.microgrid.metrics import Metric
 from frequenz.quantities import Quantity
 
@@ -41,6 +46,8 @@
 
 T = TypeVar("T", bound=ComponentData)
 
+_MICROGRID_ID = MicrogridId(1)
+
 
 @pytest.fixture
 def mock_connection_manager(mocker: pytest_mock.MockFixture) -> mock.Mock:
@@ -49,12 +56,10 @@ def mock_connection_manager(mocker: pytest_mock.MockFixture) -> mock.Mock:
     mock_client.list_components = mock.AsyncMock(
         name="list_components()",
         return_value=[
-            Component(component_id=ComponentId(4), category=ComponentCategory.METER),
-            Component(component_id=ComponentId(6), category=ComponentCategory.INVERTER),
-            Component(component_id=ComponentId(9), category=ComponentCategory.BATTERY),
-            Component(
-                component_id=ComponentId(12), category=ComponentCategory.EV_CHARGER
-            ),
+            Meter(id=ComponentId(4), microgrid_id=_MICROGRID_ID),
+            BatteryInverter(id=ComponentId(6), microgrid_id=_MICROGRID_ID),
+            LiIonBattery(id=ComponentId(9), microgrid_id=_MICROGRID_ID),
+            DcEvCharger(id=ComponentId(12), microgrid_id=_MICROGRID_ID),
         ],
     )
 

tests/microgrid/test_datapipeline.py

@@ -9,14 +9,13 @@
 import async_solipsism
 import pytest
 import time_machine
+from frequenz.client.common.microgrid import MicrogridId
 from frequenz.client.common.microgrid.components import ComponentId
-from frequenz.client.microgrid import (
-    Component,
-    ComponentCategory,
-    InverterType,
-)
 from frequenz.client.microgrid.component import (
+    BatteryInverter,
     ComponentConnection,
+    GridConnectionPoint,
+    LiIonBattery,
 )
 from pytest_mock import MockerFixture
 
@@ -32,6 +31,9 @@ def event_loop_policy() -> async_solipsism.EventLoopPolicy:
     return async_solipsism.EventLoopPolicy()
 
 
+_MICROGRID_ID = MicrogridId(1)
+
+
 # loop time is advanced but not the system time
 async def test_actors_started(
     fake_time: time_machine.Coordinates, mocker: MockerFixture
@@ -61,15 +63,16 @@ async def test_actors_started(
 
     assert datapipeline._battery_power_wrapper._power_distributing_actor is None
 
+    grid_1 = GridConnectionPoint(
+        id=ComponentId(1), microgrid_id=_MICROGRID_ID, rated_fuse_current=10_000
+    )
+    bat_inverter_4 = BatteryInverter(id=ComponentId(4), microgrid_id=_MICROGRID_ID)
+    battery_15 = LiIonBattery(id=ComponentId(15), microgrid_id=_MICROGRID_ID)
     mock_client = MockMicrogridClient(
-        {
-            Component(ComponentId(1), ComponentCategory.GRID),
-            Component(ComponentId(4), ComponentCategory.INVERTER, InverterType.BATTERY),
-            Component(ComponentId(15), ComponentCategory.BATTERY),
-        },
+        components={grid_1, bat_inverter_4, battery_15},
         connections={
-            ComponentConnection(source=ComponentId(1), destination=ComponentId(4)),
-            ComponentConnection(source=ComponentId(4), destination=ComponentId(15)),
+            ComponentConnection(source=grid_1.id, destination=bat_inverter_4.id),
+            ComponentConnection(source=bat_inverter_4.id, destination=battery_15.id),
         },
     )
     mock_client.initialize(mocker)