Fixup test connection

Author: llucax

tests/component/test_connection.py

@@ -3,9 +3,9 @@
 
 """Tests for ComponentConnection class and related functionality."""
 
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timezone
 from typing import Any
-from unittest.mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, patch
 
 import pytest
 from frequenz.api.common.v1.microgrid import lifetime_pb2
@@ -19,12 +19,8 @@
 )
 
 
-def test_component_connection_construction() -> None:
-    """Test basic ComponentConnection construction and validation.
-
-    Raises:
-        AssertionError: If any of the assertions fail.
-    """
+def test_creation() -> None:
+    """Test basic ComponentConnection creation and validation."""
     now = datetime.now(timezone.utc)
     lifetime = Lifetime(start=now)
     connection = ComponentConnection(
@@ -38,7 +34,7 @@ def test_component_connection_construction() -> None:
     assert connection.operational_lifetime == lifetime
 
 
-def test_component_connection_validation() -> None:
+def test_validation() -> None:
     """Test validation of source and destination components."""
     with pytest.raises(
         ValueError, match="Source and destination components must be different"
@@ -49,19 +45,30 @@ def test_component_connection_validation() -> None:
         )
 
 
+@pytest.mark.parametrize("lifetime_active", [True, False])
+def test_active_at(lifetime_active: bool) -> None:
+    """Test active_at behavior with lifetime.active values."""
+    mock_lifetime = Mock(spec=Lifetime)
+    mock_lifetime.active_at.return_value = lifetime_active
+
+    connection = ComponentConnection(
+        source=ComponentId(1),
+        destination=ComponentId(2),
+        operational_lifetime=mock_lifetime,
+    )
+
+    test_time = datetime.now(timezone.utc)
+
+    assert connection.active_at(test_time) == lifetime_active
+    mock_lifetime.active_at.assert_called_once_with(test_time)
+
+
 @pytest.mark.parametrize(
     "lifetime_active",
     [True, False],
 )
-def test_component_connection_active_property(lifetime_active: bool) -> None:
-    """Test the active property of ComponentConnection.
-
-    Args:
-        lifetime_active: Whether the lifetime should be active or not.
-
-    Raises:
-        AssertionError: If any of the assertions fail.
-    """
+def test_active(lifetime_active: bool) -> None:
+    """Test the active property of ComponentConnection."""
     mock_lifetime = Mock(spec=Lifetime)
     mock_lifetime.active_at.return_value = lifetime_active
 
@@ -81,12 +88,8 @@ def test_component_connection_active_property(lifetime_active: bool) -> None:
         assert connection.active is lifetime_active
 
 
-def test_component_connection_string_representation() -> None:
-    """Test string representation of ComponentConnection.
-
-    Raises:
-        AssertionError: If the string representation is incorrect.
-    """
+def test_str() -> None:
+    """Test string representation of ComponentConnection."""
     connection = ComponentConnection(
         source=ComponentId(1),
         destination=ComponentId(2),
@@ -115,19 +118,11 @@ def test_component_connection_string_representation() -> None:
         ),
     ],
 )
-def test_component_connection_from_proto(
+def test_from_proto(
     proto_data: dict[str, Any],
     caplog: pytest.LogCaptureFixture,
 ) -> None:
-    """Test conversion from protobuf message to ComponentConnection.
-
-    Args:
-        proto_data: Test case parameters
-        caplog: Fixture to capture log messages
-
-    Raises:
-        AssertionError: If any of the assertions fail.
-    """
+    """Test conversion from protobuf message to ComponentConnection."""
     caplog.set_level("DEBUG")  # Ensure we capture DEBUG level messages
 
     proto = components_pb2.ComponentConnection(
@@ -152,7 +147,7 @@ def test_component_connection_from_proto(
         assert "missing operational lifetime" in caplog.text.lower()
 
 
-def test_component_connection_from_proto_same_ids() -> None:
+def test_from_proto_same_ids() -> None:
     """Test proto conversion with same source and destination IDs."""
     proto = components_pb2.ComponentConnection(
         source_component_id=1,
@@ -166,19 +161,11 @@ def test_component_connection_from_proto_same_ids() -> None:
 
 
 @patch("frequenz.client.microgrid.component._connection_proto.lifetime_from_proto")
-def test_component_connection_from_proto_invalid_lifetime(
+def test_from_proto_invalid_lifetime(
     mock_lifetime_from_proto: Mock,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
-    """Test proto conversion with invalid lifetime data.
-
-    Args:
-        mock_lifetime_from_proto: Mock for lifetime conversion
-        caplog: Fixture to capture log messages
-
-    Raises:
-        AssertionError: If any of the assertions fail.
-    """
+    """Test proto conversion with invalid lifetime data."""
     mock_lifetime_from_proto.side_effect = ValueError("Invalid lifetime")
 
     proto = components_pb2.ComponentConnection(
@@ -198,49 +185,3 @@ def test_component_connection_from_proto_invalid_lifetime(
     assert connection.destination == ComponentId(2)
     assert "invalid operational lifetime" in caplog.text.lower()
     mock_lifetime_from_proto.assert_called_once_with(proto.operational_lifetime)
-
-
-@pytest.mark.parametrize(
-    "case",
-    [
-        pytest.param(
-            {"test_time": "past", "expected": True},
-            id="past timestamp",
-        ),
-        pytest.param(
-            {"test_time": "now", "expected": True},
-            id="current timestamp",
-        ),
-        pytest.param(
-            {"test_time": "future", "expected": True},
-            id="future timestamp",
-        ),
-    ],
-)
-def test_component_connection_active_at(case: dict[str, Any]) -> None:
-    """Test checking activity at specific timestamps.
-
-    Args:
-        case: Test case parameters
-
-    Raises:
-        AssertionError: If any of the assertions fail.
-    """
-    mock_lifetime = Mock(spec=Lifetime)
-    mock_lifetime.active_at = Mock(return_value=case["expected"])
-
-    connection = ComponentConnection(
-        source=ComponentId(1),
-        destination=ComponentId(2),
-        operational_lifetime=mock_lifetime,
-    )
-
-    now = datetime.now(timezone.utc)
-    test_time = {
-        "past": now - timedelta(hours=1),
-        "now": now,
-        "future": now + timedelta(hours=1),
-    }[case["test_time"]]
-
-    assert connection.active_at(test_time) == case["expected"]
-    mock_lifetime.active_at.assert_called_once_with(test_time)