Add further tests and split existing tests

Signed-off-by: Jack <[email protected]>

Author: jack-herrmann

RELEASE_NOTES.md

@@ -15,6 +15,8 @@
 
 <!-- Here goes the main new features and examples or instructions on how to use them -->
 
+- Classes Bounds and SystemBounds now work with the `in` operator
+
 ## Bug Fixes
 
 - Fixed a typing issue that occurs in some cases when composing formulas with constants.

tests/timeseries/test_base_types.py

@@ -11,64 +11,82 @@
 
 
 def test_bounds_contains() -> None:
-    """Test the `__contains__` method of the `Bounds` class.
-
-    This method checks if a value is within the defined bounds.
-    """
+    """Tests with complete bounds."""
     bounds = Bounds(lower=Power.from_watts(10), upper=Power.from_watts(100))
+    assert Power.from_watts(50) in bounds  # within
+    assert Power.from_watts(10) in bounds  # at lower
+    assert Power.from_watts(100) in bounds  # at upper
+    assert Power.from_watts(9) not in bounds  # below lower
+    assert Power.from_watts(101) not in bounds  # above upper
 
-    assert Power.from_watts(50) in bounds  # within bounds
-    assert Power.from_watts(10) in bounds  # at lower bound
-    assert Power.from_watts(100) in bounds  # at upper bound
-    assert Power.from_watts(9) not in bounds  # below lower bound
-    assert Power.from_watts(101) not in bounds  # above upper bound
 
+def test_bounds_contains_no_lower() -> None:
+    """Tests without lower bound."""
     bounds_no_lower = Bounds(lower=None, upper=Power.from_watts(100))
-    assert Power.from_watts(50) in bounds_no_lower  # within upper bound
-    assert Power.from_watts(100) in bounds_no_lower  # at upper bound
-    assert Power.from_watts(101) not in bounds_no_lower  # above upper bound
+    assert Power.from_watts(50) in bounds_no_lower  # within upper
+    assert Power.from_watts(100) in bounds_no_lower  # at upper
+    assert Power.from_watts(101) not in bounds_no_lower  # above upper
+
 
+def test_bounds_contains_no_upper() -> None:
+    """Tests without upper bound."""
     bounds_no_upper = Bounds(lower=Power.from_watts(10), upper=None)
-    assert Power.from_watts(50) in bounds_no_upper  # within lower bound
-    assert Power.from_watts(10) in bounds_no_upper  # at lower bound
-    assert Power.from_watts(9) not in bounds_no_upper  # below lower bound
+    assert Power.from_watts(50) in bounds_no_upper  # within lower
+    assert Power.from_watts(10) in bounds_no_upper  # at lower
+    assert Power.from_watts(9) not in bounds_no_upper  # below lower
 
 
-def test_system_bounds_contains() -> None:
-    """
-    Test the `__contains__` method of the `SystemBounds` class.
+def test_bounds_contains_no_bounds() -> None:
+    """Tests with no bounds."""
+    bounds_no_bounds: Bounds[Power | None] = Bounds(lower=None, upper=None)
+    assert Power.from_watts(50) in bounds_no_bounds  # any value within bounds
+
 
-    Checks if value is within inclusion bounds and not exclusion bounds.
-    """
-    inclusion_bounds = Bounds(lower=Power.from_watts(10), upper=Power.from_watts(100))
-    exclusion_bounds = Bounds(lower=Power.from_watts(40), upper=Power.from_watts(50))
+INCLUSION_BOUND = Bounds(lower=Power.from_watts(10), upper=Power.from_watts(100))
+EXCLUSION_BOUND = Bounds(lower=Power.from_watts(40), upper=Power.from_watts(50))
+
+
+def test_system_bounds_contains() -> None:
+    """Tests with complete system bounds."""
     system_bounds = SystemBounds(
         timestamp=datetime.now(),
-        inclusion_bounds=inclusion_bounds,
-        exclusion_bounds=exclusion_bounds,
+        inclusion_bounds=INCLUSION_BOUND,
+        exclusion_bounds=EXCLUSION_BOUND,
     )
 
     assert Power.from_watts(30) in system_bounds  # within inclusion, not in exclusion
-    assert (
-        Power.from_watts(45) not in system_bounds
-    )  # within inclusion, also in exclusion
-    assert Power.from_watts(110) not in system_bounds  # outside inclusion bounds
+    assert Power.from_watts(45) not in system_bounds  # within inclusion and exclusion
+    assert Power.from_watts(110) not in system_bounds  # outside inclusion
+
 
+def test_system_bounds_contains_no_exclusion() -> None:
+    """Tests with no exclusion bounds."""
     system_bounds_no_exclusion = SystemBounds(
         timestamp=datetime.now(),
-        inclusion_bounds=inclusion_bounds,
+        inclusion_bounds=INCLUSION_BOUND,
         exclusion_bounds=None,
     )
-    assert Power.from_watts(30) in system_bounds_no_exclusion  # within inclusion bounds
-    assert (
-        Power.from_watts(110) not in system_bounds_no_exclusion
-    )  # outside inclusion bounds
+    assert Power.from_watts(30) in system_bounds_no_exclusion  # within inclusion
+    assert Power.from_watts(110) not in system_bounds_no_exclusion  # outside inclusion
 
+
+def test_system_bounds_contains_no_inclusion() -> None:
+    """Tests with no inclusion bounds."""
     system_bounds_no_inclusion = SystemBounds(
         timestamp=datetime.now(),
         inclusion_bounds=None,
-        exclusion_bounds=exclusion_bounds,
+        exclusion_bounds=EXCLUSION_BOUND,
+    )
+    assert Power.from_watts(30) not in system_bounds_no_inclusion  # outside exclusion
+    assert Power.from_watts(45) not in system_bounds_no_inclusion  # within exclusion
+
+
+def test_system_bounds_contains_no_bounds() -> None:
+    """Tests with no bounds."""
+    system_bounds_no_bounds = SystemBounds(
+        timestamp=datetime.now(),
+        inclusion_bounds=None,
+        exclusion_bounds=None,
     )
-    assert (
-        Power.from_watts(30) not in system_bounds_no_inclusion
-    )  # not in inclusion bounds
+    assert Power.from_watts(30) not in system_bounds_no_bounds  # any value outside
+    assert Power.from_watts(110) not in system_bounds_no_bounds  # any value outside