Skip to content

Commit b82c414

Browse files
committed
check ci test
Signed-off-by: zhen0427 <[email protected]>
1 parent cafd6d7 commit b82c414

File tree

7 files changed

+470
-385
lines changed

7 files changed

+470
-385
lines changed

src/power_grid_model_io/converters/pandapower_converter.py

Lines changed: 148 additions & 110 deletions
Large diffs are not rendered by default.

tests/unit/converters/test_base_converter.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import numpy as np
1010
import pytest
11+
from power_grid_model import ComponentType
1112

1213
from power_grid_model_io.converters.base_converter import BaseConverter
1314

@@ -30,7 +31,7 @@ def converter():
3031
converter = DummyConverter()
3132
converter._parse_data = MagicMock()
3233
converter._serialize_data = MagicMock()
33-
converter._serialize_data.return_value = {"node": [{"id": 1}, {"id": 2}]}
34+
converter._serialize_data.return_value = {ComponentType.node: [{"id": 1}, {"id": 2}]}
3435
return converter
3536

3637

@@ -48,11 +49,11 @@ def add_extra_info(data, data_type, extra_info):
4849
converter._parse_data.side_effect = add_extra_info # type: ignore
4950

5051
# Act
51-
data, extra_info = converter.load_input_data(data={"node": [{"id": 1}, {"id": 2}]})
52+
data, extra_info = converter.load_input_data(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
5253

5354
# Assert
5455
converter._parse_data.assert_called_once_with( # type: ignore
55-
data={"node": [{"id": 1}, {"id": 2}]}, data_type="input", extra_info=ANY
56+
data={ComponentType.node: [{"id": 1}, {"id": 2}]}, data_type="input", extra_info=ANY
5657
)
5758
assert data == {"foo": 1}
5859
assert extra_info == {1: "Foo"}
@@ -76,19 +77,19 @@ def test_load_input_data__list(converter: DummyConverter):
7677

7778
# Act & Assers
7879
with pytest.raises(TypeError, match="can not be batch"):
79-
converter.load_input_data(data={"node": [{"id": 1}, {"id": 2}]})
80+
converter.load_input_data(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
8081

8182

8283
def test_load_update_data(converter: DummyConverter):
8384
# Arrange
8485
converter._parse_data.return_value = {"foo": 1} # type: ignore
8586

8687
# Act
87-
data = converter.load_update_data(data={"node": [{"id": 1}, {"id": 2}]})
88+
data = converter.load_update_data(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
8889

8990
# Assert
9091
converter._parse_data.assert_called_once_with( # type: ignore
91-
data={"node": [{"id": 1}, {"id": 2}]}, data_type="update", extra_info=None
92+
data={ComponentType.node: [{"id": 1}, {"id": 2}]}, data_type="update", extra_info=None
9293
)
9394
assert data == {"foo": 1}
9495

@@ -98,11 +99,11 @@ def test_load_sym_output_data(converter: DummyConverter):
9899
converter._parse_data.return_value = {"foo": 1} # type: ignore
99100

100101
# Act
101-
data = converter.load_sym_output_data(data={"node": [{"id": 1}, {"id": 2}]})
102+
data = converter.load_sym_output_data(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
102103

103104
# Assert
104105
converter._parse_data.assert_called_once_with( # type: ignore
105-
data={"node": [{"id": 1}, {"id": 2}]}, data_type="sym_output", extra_info=None
106+
data={ComponentType.node: [{"id": 1}, {"id": 2}]}, data_type="sym_output", extra_info=None
106107
)
107108
assert data == {"foo": 1}
108109

@@ -112,11 +113,11 @@ def test_load_asym_output_data(converter: DummyConverter):
112113
converter._parse_data.return_value = {"foo": 1} # type: ignore
113114

114115
# Act
115-
data = converter.load_asym_output_data(data={"node": [{"id": 1}, {"id": 2}]})
116+
data = converter.load_asym_output_data(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
116117

117118
# Assert
118119
converter._parse_data.assert_called_once_with( # type: ignore
119-
data={"node": [{"id": 1}, {"id": 2}]}, data_type="asym_output", extra_info=None
120+
data={ComponentType.node: [{"id": 1}, {"id": 2}]}, data_type="asym_output", extra_info=None
120121
)
121122
assert data == {"foo": 1}
122123

@@ -126,11 +127,11 @@ def test_load_sc_output_data(converter: DummyConverter):
126127
converter._parse_data.return_value = {"foo": 1} # type: ignore
127128

128129
# Act
129-
data = converter.load_sc_output_data(data={"node": [{"id": 1}, {"id": 2}]})
130+
data = converter.load_sc_output_data(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
130131

131132
# Assert
132133
converter._parse_data.assert_called_once_with( # type: ignore
133-
data={"node": [{"id": 1}, {"id": 2}]}, data_type="sc_output", extra_info=None
134+
data={ComponentType.node: [{"id": 1}, {"id": 2}]}, data_type="sc_output", extra_info=None
134135
)
135136
assert data == {"foo": 1}
136137

@@ -151,7 +152,7 @@ def test_save_data(converter: DummyConverter):
151152
# Destination supplied as argument
152153
destination = MagicMock()
153154
converter.save(data={"foo": np.array([1])}, destination=destination)
154-
destination.save.assert_called_once_with(data={"node": [{"id": 1}, {"id": 2}]})
155+
destination.save.assert_called_once_with(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
155156

156157
# Destination supplied at instantiation
157158
destination2 = MagicMock()
@@ -165,7 +166,7 @@ def test_load_data(converter: DummyConverter):
165166
with pytest.raises(ValueError, match="No data supplied!"):
166167
converter._load_data(data=None)
167168

168-
data = converter._load_data(data={"node": [{"id": 1}, {"id": 2}]})
169+
data = converter._load_data(data={ComponentType.node: [{"id": 1}, {"id": 2}]})
169170
assert data == data
170171

171172
source = MagicMock()

0 commit comments

Comments
 (0)