Remove hardcoded component graph and fixtures

These are now unused because tests have migrated to use dynamic
component graphs provided by MockMicrogrid.

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

tests/actor/test_battery_pool_status.py

@@ -5,7 +5,6 @@
 import asyncio
 from typing import Set
 
-import pytest
 from frequenz.channels import Broadcast
 from pytest_mock import MockerFixture
 
@@ -16,29 +15,13 @@
 from frequenz.sdk.microgrid.component import ComponentCategory
 from tests.timeseries.mock_microgrid import MockMicrogrid
 
-from ..utils.mock_microgrid_client import MockMicrogridClient
-from .test_battery_status import battery_data, component_graph, inverter_data
+from .test_battery_status import battery_data, inverter_data
 
 
 # pylint: disable=protected-access
 class TestBatteryPoolStatus:
     """Tests for BatteryPoolStatus"""
 
-    @pytest.fixture
-    async def mock_microgrid(self, mocker: MockerFixture) -> MockMicrogridClient:
-        """Create and initialize mock microgrid
-
-        Args:
-            mocker: pytest mocker
-
-        Returns:
-            MockMicrogridClient
-        """
-        components, connections = component_graph()
-        microgrid = MockMicrogridClient(components, connections)
-        microgrid.initialize(mocker)
-        return microgrid
-
     async def test_batteries_status(self, mocker: MockerFixture) -> None:
         """Basic tests for BatteryPoolStatus.
 

tests/actor/test_battery_status.py

@@ -6,9 +6,8 @@
 import math
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
-from typing import Generic, Iterable, List, Optional, Set, Tuple, TypeVar
+from typing import Generic, Iterable, List, Optional, TypeVar
 
-import pytest
 import time_machine
 from frequenz.api.microgrid.battery_pb2 import ComponentState as BatteryState
 from frequenz.api.microgrid.battery_pb2 import Error as BatteryError
@@ -26,17 +25,10 @@
     SetPowerResult,
     Status,
 )
-from frequenz.sdk.microgrid.client import Connection
-from frequenz.sdk.microgrid.component import (
-    BatteryData,
-    Component,
-    ComponentCategory,
-    InverterData,
-)
+from frequenz.sdk.microgrid.component import BatteryData, InverterData
 from tests.timeseries.mock_microgrid import MockMicrogrid
 
 from ..utils.component_data_wrapper import BatteryDataWrapper, InverterDataWrapper
-from ..utils.mock_microgrid_client import MockMicrogridClient
 
 
 def battery_data(  # pylint: disable=too-many-arguments
@@ -109,42 +101,6 @@ def inverter_data(
     )
 
 
-def component_graph() -> Tuple[Set[Component], Set[Connection]]:
-    """Creates components and connections for the microgrid component graph.
-
-    Returns:
-        Tuple with set of components and set of connections.
-    """
-    components = {
-        Component(1, ComponentCategory.GRID),
-        Component(2, ComponentCategory.METER),
-        Component(104, ComponentCategory.METER),
-        Component(105, ComponentCategory.INVERTER),
-        Component(106, ComponentCategory.BATTERY),
-        Component(204, ComponentCategory.METER),
-        Component(205, ComponentCategory.INVERTER),
-        Component(206, ComponentCategory.BATTERY),
-        Component(304, ComponentCategory.METER),
-        Component(305, ComponentCategory.INVERTER),
-        Component(306, ComponentCategory.BATTERY),
-    }
-
-    connections = {
-        Connection(1, 2),
-        Connection(2, 104),
-        Connection(104, 105),
-        Connection(105, 106),
-        Connection(2, 204),
-        Connection(204, 205),
-        Connection(205, 206),
-        Connection(2, 304),
-        Connection(304, 305),
-        Connection(305, 306),
-    }
-
-    return components, connections
-
-
 T = TypeVar("T")
 
 
@@ -163,21 +119,6 @@ class Message(Generic[T]):
 class TestBatteryStatus:
     """Tests BatteryStatusTracker."""
 
-    @pytest.fixture
-    async def mock_microgrid(self, mocker: MockerFixture) -> MockMicrogridClient:
-        """Create and initialize mock microgrid
-
-        Args:
-            mocker: pytest mocker
-
-        Returns:
-            MockMicrogridClient
-        """
-        components, connections = component_graph()
-        microgrid = MockMicrogridClient(components, connections)
-        microgrid.initialize(mocker)
-        return microgrid
-
     @time_machine.travel("2022-01-01 00:00 UTC", tick=False)
     async def test_sync_update_status_with_messages(
         self, mocker: MockerFixture

tests/actor/test_power_distributing.py

@@ -29,8 +29,7 @@
     Result,
     Success,
 )
-from frequenz.sdk.microgrid.client import Connection
-from frequenz.sdk.microgrid.component import Component, ComponentCategory
+from frequenz.sdk.microgrid.component import ComponentCategory
 from tests.timeseries.mock_microgrid import MockMicrogrid
 
 from ..conftest import SAFETY_TIMEOUT
@@ -45,41 +44,6 @@ class TestPowerDistributingActor:
 
     _namespace = "power_distributor"
 
-    def component_graph(self) -> tuple[set[Component], set[Connection]]:
-        """Create graph components
-
-        Returns:
-            Tuple where first element is set of components and second element is
-                set of connections.
-        """
-        components = {
-            Component(1, ComponentCategory.GRID),
-            Component(2, ComponentCategory.METER),
-            Component(104, ComponentCategory.METER),
-            Component(105, ComponentCategory.INVERTER),
-            Component(106, ComponentCategory.BATTERY),
-            Component(204, ComponentCategory.METER),
-            Component(205, ComponentCategory.INVERTER),
-            Component(206, ComponentCategory.BATTERY),
-            Component(304, ComponentCategory.METER),
-            Component(305, ComponentCategory.INVERTER),
-            Component(306, ComponentCategory.BATTERY),
-        }
-
-        connections = {
-            Connection(1, 2),
-            Connection(2, 104),
-            Connection(104, 105),
-            Connection(105, 106),
-            Connection(2, 204),
-            Connection(204, 205),
-            Connection(205, 206),
-            Connection(2, 304),
-            Connection(304, 305),
-            Connection(305, 306),
-        }
-        return components, connections
-
     async def test_constructor(self, mocker: MockerFixture) -> None:
         """Test if gets all necessary data."""
         mockgrid = MockMicrogrid(grid_side_meter=True)