fixed additional testcases

hydrolib/core/dflowfm/extold/models.py

@@ -501,6 +501,8 @@ def __init__(self, key: str) -> None:
         def raise_error_only_allowed_when(
             field: _Field, dependency: _Field, valid_dependency_value: str
         ):
+            if isinstance(valid_dependency_value, Enum):
+                valid_dependency_value = valid_dependency_value.value
             error = f"{field.alias} only allowed when {dependency.alias} is {valid_dependency_value}"
             raise ValueError(error)
 

hydrolib/core/dflowfm/ini/util.py

@@ -189,6 +189,8 @@ def validate_forbidden_fields(
 
     for field in field_names:
         if values.get(field) != None:
+            if isinstance(conditional_value, Enum):
+                conditional_value = conditional_value.value
             raise ValueError(
                 f"{field} is forbidden when {conditional_field_name} {operator_str(comparison_func)} {conditional_value}"
             )
@@ -228,6 +230,8 @@ def validate_required_fields(
 
     for field in field_names:
         if values.get(field) == None:
+            if isinstance(conditional_value, Enum):
+                conditional_value = conditional_value.value
             raise ValueError(
                 f"{field} should be provided when {conditional_field_name} {operator_str(comparison_func)} {conditional_value}"
             )

tests/dflowfm/test_inifield.py

@@ -188,7 +188,7 @@ def test_initialfield_value_with_missing_value(self):
             _ = InitialField(**inifield_values)
 
         expected_message = (
-            f"value should be provided when datafiletype is {DataFileType.polygon}"
+            f"value should be provided when datafiletype is {DataFileType.polygon.value}"
         )
 
         assert expected_message in str(error.value)