a few more

Signed-off-by: Santiago Figueroa Manrique <[email protected]>

Author: figueroa1395

tests/validation/converters/test_pandapower_converter_input.py

@@ -9,6 +9,7 @@
 
 import pandas as pd
 import pytest
+from power_grid_model import DatasetType
 from power_grid_model.data_types import SingleDataset
 
 from power_grid_model_io.converters import PandaPowerConverter
@@ -72,7 +73,7 @@ def test_input_data(input_data: Tuple[SingleDataset, SingleDataset]):
     assert len(expected) <= len(actual)
 
 
-@pytest.mark.parametrize(("component", "attribute"), component_attributes(VALIDATION_FILE, data_type="input"))
+@pytest.mark.parametrize(("component", "attribute"), component_attributes(VALIDATION_FILE, data_type=DatasetType.input))
 def test_attributes(input_data: Tuple[SingleDataset, SingleDataset], component: str, attribute: str):
     """
     For each attribute, check if the actual values are consistent with the expected values

tests/validation/converters/test_vision_excel_converter.py

@@ -11,6 +11,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+from power_grid_model import DatasetType
 from power_grid_model.data_types import SingleDataset
 
 from power_grid_model_io.converters import VisionExcelConverter
@@ -110,7 +111,7 @@ def test_input_data_custom_yaml():
         assert len(expected) <= len(actual)
 
 
-@pytest.mark.parametrize(("component", "attribute"), component_attributes(VALIDATION_EN, data_type="input"))
+@pytest.mark.parametrize(("component", "attribute"), component_attributes(VALIDATION_EN, data_type=DatasetType.input))
 @pytest.mark.parametrize("input_data", LANGUAGES, indirect=True)
 def test_attributes(input_data: Tuple[SingleDataset, SingleDataset], component: str, attribute: str):
     """

tests/validation/utils.py

@@ -10,7 +10,7 @@
 
 import numpy as np
 import pandas as pd
-from power_grid_model import power_grid_meta_data
+from power_grid_model import DatasetType, power_grid_meta_data
 from power_grid_model.data_types import SingleDataset, SinglePythonDataset
 from power_grid_model.errors import PowerGridSerializationError
 from power_grid_model.utils import import_json_data, json_deserialize_from_file
@@ -52,7 +52,7 @@ def component_objects(json_path: Path) -> Generator[Tuple[str, List[int]], None,
             yield component, obj_ids
 
 
-def component_attributes(json_path: Path, data_type: str) -> Generator[Tuple[str, str], None, None]:
+def component_attributes(json_path: Path, data_type: DatasetType) -> Generator[Tuple[str, str], None, None]:
     """
     Read the json file (only the structure is used, i.e. the component names and attribute name)