Skip to content

Commit 7caf6f9

Browse files
committed
Update tests to get resampled streams for correct namespaces
... because we now have tests that compose formulas from different namespaces, from the logical meter and the battery pool. Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 3a88db8 commit 7caf6f9

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

tests/timeseries/_formula_engine/test_formula_composition.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ async def test_formula_composition( # pylint: disable=too-many-locals
3030
logical_meter = microgrid.logical_meter()
3131
battery_pool = microgrid.battery_pool()
3232
main_meter_recv = get_resampled_stream(
33+
logical_meter._namespace, # pylint: disable=protected-access
3334
4,
3435
ComponentMetricId.ACTIVE_POWER,
3536
)

tests/timeseries/_formula_engine/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919

2020
def get_resampled_stream( # pylint: disable=too-many-arguments
21+
namespace: str,
2122
comp_id: int,
2223
metric_id: ComponentMetricId,
2324
) -> Receiver[Sample]:
@@ -27,7 +28,7 @@ def get_resampled_stream( # pylint: disable=too-many-arguments
2728

2829
# pylint: disable=protected-access
2930
builder = ResampledFormulaBuilder(
30-
_data_pipeline._get().logical_meter()._namespace,
31+
namespace,
3132
"",
3233
_data_pipeline._get()._channel_registry,
3334
_data_pipeline._get()._resampling_request_sender(),

tests/timeseries/test_ev_charger_pool.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ async def test_ev_power( # pylint: disable=too-many-locals
9393
ev_pool = microgrid.ev_charger_pool()
9494

9595
main_meter_recv = get_resampled_stream(
96+
logical_meter._namespace, # pylint: disable=protected-access
9697
mockgrid.main_meter_id,
9798
ComponentMetricId.ACTIVE_POWER,
9899
)

tests/timeseries/test_logical_meter.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ async def test_grid_power_1(self, mocker: MockerFixture) -> None:
3434
grid_power_recv = logical_meter.grid_power.new_receiver()
3535

3636
main_meter_recv = get_resampled_stream(
37+
logical_meter._namespace, # pylint: disable=protected-access
3738
mockgrid.main_meter_id,
3839
ComponentMetricId.ACTIVE_POWER,
3940
)
@@ -67,6 +68,7 @@ async def test_grid_power_2(
6768

6869
meter_receivers = [
6970
get_resampled_stream(
71+
logical_meter._namespace, # pylint: disable=protected-access
7072
meter_id,
7173
ComponentMetricId.ACTIVE_POWER,
7274
)
@@ -111,6 +113,7 @@ async def test_battery_and_pv_power( # pylint: disable=too-many-locals
111113

112114
bat_inv_receivers = [
113115
get_resampled_stream(
116+
battery_pool._namespace, # pylint: disable=protected-access
114117
meter_id,
115118
ComponentMetricId.ACTIVE_POWER,
116119
)
@@ -119,6 +122,7 @@ async def test_battery_and_pv_power( # pylint: disable=too-many-locals
119122

120123
pv_inv_receivers = [
121124
get_resampled_stream(
125+
logical_meter._namespace, # pylint: disable=protected-access
122126
meter_id,
123127
ComponentMetricId.ACTIVE_POWER,
124128
)

0 commit comments

Comments
 (0)