diff --git a/src/ahbicht/validation/validation_results.py b/src/ahbicht/models/validation_results.py similarity index 100% rename from src/ahbicht/validation/validation_results.py rename to src/ahbicht/models/validation_results.py diff --git a/src/ahbicht/validation/validation.py b/src/ahbicht/validation/validation.py index 0c3109ab..b12d47e1 100644 --- a/src/ahbicht/validation/validation.py +++ b/src/ahbicht/validation/validation.py @@ -26,12 +26,12 @@ from ahbicht.expressions.ahb_expression_evaluation import evaluate_ahb_expression_tree from ahbicht.expressions.expression_resolver import parse_expression_including_unresolved_subexpressions from ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator -from ahbicht.validation import validation_logger -from ahbicht.validation.validation_results import ( +from ahbicht.models.validation_results import ( DataElementValidationResult, SegmentLevelValidationResult, ValidationResultInContext, ) +from ahbicht.validation import validation_logger from ahbicht.validation.validation_values import RequirementValidationValue diff --git a/unittests/test_json_serialization.py b/unittests/test_json_serialization.py index 72e5c43a..6f071707 100644 --- a/unittests/test_json_serialization.py +++ b/unittests/test_json_serialization.py @@ -31,7 +31,7 @@ ) from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema from ahbicht.models.enums import ModalMark -from ahbicht.validation.validation_results import ( +from ahbicht.models.validation_results import ( DataElementValidationResult, DataElementValidationResultSchema, ListOfValidationResultInContext, diff --git a/unittests/test_validation.py b/unittests/test_validation.py index a6d7583d..b021a978 100644 --- a/unittests/test_validation.py +++ b/unittests/test_validation.py @@ -18,6 +18,11 @@ from ahbicht.models.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint from ahbicht.models.content_evaluation_result import ContentEvaluationResult from ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator +from ahbicht.models.validation_results import ( + DataElementValidationResult, + SegmentLevelValidationResult, + ValidationResultInContext, +) from ahbicht.validation.validation import ( combine_requirements_of_different_levels, map_requirement_validation_values, @@ -28,11 +33,6 @@ validate_segment_group, validate_segment_level, ) -from ahbicht.validation.validation_results import ( - DataElementValidationResult, - SegmentLevelValidationResult, - ValidationResultInContext, -) from ahbicht.validation.validation_values import RequirementValidationValue # TODO: Add testcases for segment_requirement is None & soll_is_required = False diff --git a/unittests/test_validation_results.py b/unittests/test_validation_results.py index 1013f7fb..7e2eec14 100644 --- a/unittests/test_validation_results.py +++ b/unittests/test_validation_results.py @@ -1,7 +1,7 @@ import pytest from maus.models.edifact_components import DataElementDataType -from ahbicht.validation.validation_results import ( +from ahbicht.models.validation_results import ( DataElementValidationResult, ListOfValidationResultInContext, SegmentLevelValidationResult,