Skip to content

Commit 9b90b66

Browse files
committed
Fix Unit tests
Signed-off-by: furqan463 <[email protected]>
1 parent 9952520 commit 9b90b66

File tree

2 files changed

+26
-17
lines changed

2 files changed

+26
-17
lines changed

tests/unit/converters/test_pandapower_converter_input.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
initialize_array,
2323
)
2424

25-
from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter
25+
from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter, pp_curr_version, pp_ref_version
2626

2727
from ...utils import MockDf, MockFn, assert_struct_array_equal
2828

@@ -689,12 +689,19 @@ def test_create_pgm_input_sym_loads(mock_init_array: MagicMock, two_pp_objs, con
689689
converter._get_pp_attr.assert_any_call("load", "bus", expected_type="u4")
690690
converter._get_pp_attr.assert_any_call("load", "p_mw", expected_type="f8", default=0.0)
691691
converter._get_pp_attr.assert_any_call("load", "q_mvar", expected_type="f8", default=0.0)
692-
converter._get_pp_attr.assert_any_call("load", "const_z_percent", expected_type="f8", default=0)
693-
converter._get_pp_attr.assert_any_call("load", "const_i_percent", expected_type="f8", default=0)
694692
converter._get_pp_attr.assert_any_call("load", "scaling", expected_type="f8", default=1)
695693
converter._get_pp_attr.assert_any_call("load", "in_service", expected_type="bool", default=True)
696694
converter._get_pp_attr.assert_any_call("load", "type", expected_type="O", default=None)
697-
assert len(converter._get_pp_attr.call_args_list) == 8
695+
if pp_curr_version <= pp_ref_version:
696+
converter._get_pp_attr.assert_any_call("load", "const_z_percent", expected_type="f8", default=0)
697+
converter._get_pp_attr.assert_any_call("load", "const_i_percent", expected_type="f8", default=0)
698+
assert len(converter._get_pp_attr.call_args_list) == 8
699+
else:
700+
converter._get_pp_attr.assert_any_call("load", "const_z_p_percent", expected_type="f8", default=0)
701+
converter._get_pp_attr.assert_any_call("load", "const_z_q_percent", expected_type="f8", default=0)
702+
converter._get_pp_attr.assert_any_call("load", "const_i_p_percent", expected_type="f8", default=0)
703+
converter._get_pp_attr.assert_any_call("load", "const_i_q_percent", expected_type="f8", default=0)
704+
assert len(converter._get_pp_attr.call_args_list) == 10
698705

699706
# assignment:
700707
for attr in pgm_attr:

tests/unit/converters/test_pandapower_converter_output.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import pytest
1111
from power_grid_model import ComponentType, DatasetType, initialize_array
1212

13-
from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter
13+
from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter, get_loss_params_3ph
1414
from tests.utils import MockDf
1515

1616

@@ -895,6 +895,7 @@ def test_output_line_3ph(converter):
895895
mock_pgm_array.__getitem__.assert_any_call("i_to")
896896

897897
# assignment
898+
loss_params = get_loss_params_3ph()
898899
mock_pp_df.return_value.__setitem__.assert_any_call("p_a_from_mw", ANY)
899900
mock_pp_df.return_value.__setitem__.assert_any_call("q_a_from_mvar", ANY)
900901
mock_pp_df.return_value.__setitem__.assert_any_call("p_a_to_mw", ANY)
@@ -907,12 +908,12 @@ def test_output_line_3ph(converter):
907908
mock_pp_df.return_value.__setitem__.assert_any_call("q_c_from_mvar", ANY)
908909
mock_pp_df.return_value.__setitem__.assert_any_call("p_c_to_mw", ANY)
909910
mock_pp_df.return_value.__setitem__.assert_any_call("q_c_to_mvar", ANY)
910-
mock_pp_df.return_value.__setitem__.assert_any_call("p_a_l_mw", ANY)
911-
mock_pp_df.return_value.__setitem__.assert_any_call("p_b_l_mw", ANY)
912-
mock_pp_df.return_value.__setitem__.assert_any_call("p_c_l_mw", ANY)
913-
mock_pp_df.return_value.__setitem__.assert_any_call("q_a_l_mvar", ANY)
914-
mock_pp_df.return_value.__setitem__.assert_any_call("q_b_l_mvar", ANY)
915-
mock_pp_df.return_value.__setitem__.assert_any_call("q_c_l_mvar", ANY)
911+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[0], ANY)
912+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[2], ANY)
913+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[4], ANY)
914+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[1], ANY)
915+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[3], ANY)
916+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[5], ANY)
916917
mock_pp_df.return_value.__setitem__.assert_any_call("i_a_from_ka", ANY)
917918
mock_pp_df.return_value.__setitem__.assert_any_call("i_b_from_ka", ANY)
918919
mock_pp_df.return_value.__setitem__.assert_any_call("i_c_from_ka", ANY)
@@ -1017,6 +1018,7 @@ def test_output_trafos_3ph__current(converter):
10171018
mock_pgm_array.__getitem__.assert_any_call("i_to")
10181019

10191020
# assignment
1021+
loss_params = get_loss_params_3ph()
10201022
mock_pp_df.return_value.__setitem__.assert_any_call("p_a_hv_mw", ANY)
10211023
mock_pp_df.return_value.__setitem__.assert_any_call("q_a_hv_mvar", ANY)
10221024
mock_pp_df.return_value.__setitem__.assert_any_call("p_a_lv_mw", ANY)
@@ -1029,12 +1031,12 @@ def test_output_trafos_3ph__current(converter):
10291031
mock_pp_df.return_value.__setitem__.assert_any_call("q_c_hv_mvar", ANY)
10301032
mock_pp_df.return_value.__setitem__.assert_any_call("p_c_lv_mw", ANY)
10311033
mock_pp_df.return_value.__setitem__.assert_any_call("q_c_lv_mvar", ANY)
1032-
mock_pp_df.return_value.__setitem__.assert_any_call("p_a_l_mw", ANY)
1033-
mock_pp_df.return_value.__setitem__.assert_any_call("p_b_l_mw", ANY)
1034-
mock_pp_df.return_value.__setitem__.assert_any_call("p_c_l_mw", ANY)
1035-
mock_pp_df.return_value.__setitem__.assert_any_call("q_a_l_mvar", ANY)
1036-
mock_pp_df.return_value.__setitem__.assert_any_call("q_b_l_mvar", ANY)
1037-
mock_pp_df.return_value.__setitem__.assert_any_call("q_c_l_mvar", ANY)
1034+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[0], ANY)
1035+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[2], ANY)
1036+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[4], ANY)
1037+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[1], ANY)
1038+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[3], ANY)
1039+
mock_pp_df.return_value.__setitem__.assert_any_call(loss_params[5], ANY)
10381040
mock_pp_df.return_value.__setitem__.assert_any_call("i_a_hv_ka", ANY)
10391041
mock_pp_df.return_value.__setitem__.assert_any_call("i_b_hv_ka", ANY)
10401042
mock_pp_df.return_value.__setitem__.assert_any_call("i_c_hv_ka", ANY)

0 commit comments

Comments
 (0)