rename fixture sensors

Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
FlexMeasures · Jan 31, 2024 · f9656a0 · f9656a0
1 parent 6eeda77
commit f9656a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/flexmeasures/cli/tests/conftest.py b/flexmeasures/cli/tests/conftest.py
@@ -162,13 +162,13 @@ def storage_schedule_sensors(
 
     beliefs = []
     # generic power sensor to store power limit
-    power_sensor = Sensor(
+    power_capacity = Sensor(
         "power",
         generic_asset=data_storage,
         event_resolution=timedelta(hours=1),
         unit="MW",
     )
-    db.session.add(power_sensor)
+    db.session.add(power_capacity)
 
     source = DataSource("source1")
 
@@ -178,27 +178,27 @@ def storage_schedule_sensors(
                 event_start=start + timedelta(hours=h),
                 belief_time=start,
                 event_value=0.6,
-                sensor=power_sensor,
+                sensor=power_capacity,
                 source=source,
             )
         )
 
     # efficiency sensor
-    efficiency = Sensor(
-        "efficiency",
+    storage_efficiency = Sensor(
+        "storage_efficiency",
         generic_asset=data_storage,
         event_resolution=timedelta(hours=1),
         unit="%",
     )
-    db.session.add(efficiency)
+    db.session.add(storage_efficiency)
 
     for h in range(24):
         beliefs.append(
             TimedBelief(
                 event_start=start + timedelta(hours=h),
                 belief_time=start,
                 event_value=90,
-                sensor=efficiency,
+                sensor=storage_efficiency,
                 source=source,
             )
         )
@@ -208,4 +208,4 @@ def storage_schedule_sensors(
 
     db.session.commit()
 
-    yield power_sensor.id, efficiency.id
+    yield power_capacity.id, storage_efficiency.id
diff --git a/flexmeasures/cli/tests/test_data_add.py b/flexmeasures/cli/tests/test_data_add.py
@@ -478,7 +478,7 @@ def test_add_storage_scheduler(
     5. Verifies that the command executes successfully (exit code 0) and that the correct number of scheduled
        values (48 for a 12-hour period with 15-minute resolution) are created for the power sensor.
     """
-    power_limit_sensor, efficiency = storage_schedule_sensors
+    power_capacity_sensor, storage_efficiency_sensor = storage_schedule_sensors
 
     from flexmeasures.cli.data_add import add_schedule_for_storage, add_toy_account
 
@@ -503,18 +503,20 @@ def test_add_storage_scheduler(
         if storage_power_capacity == "sensor":
             cli_input_params[
                 "storage-consumption-capacity"
-            ] = f"sensor:{power_limit_sensor}"
+            ] = f"sensor:{power_capacity_sensor}"
             cli_input_params[
                 "storage-production-capacity"
-            ] = f"sensor:{power_limit_sensor}"
+            ] = f"sensor:{power_capacity_sensor}"
         else:
 
             cli_input_params["storage-consumption-capacity"] = "700kW"
             cli_input_params["storage-production-capacity"] = "700kW"
 
     if storage_efficiency is not None:
         if storage_efficiency == "sensor":
-            cli_input_params["storage-efficiency"] = f"sensor:{efficiency}"
+            cli_input_params[
+                "storage-efficiency"
+            ] = f"sensor:{storage_efficiency_sensor}"
         else:
 
             cli_input_params["storage-efficiency"] = "90%"