fixup! fix: evaluate expressions from root to support branches

microsoft · Feb 5, 2024 · c2df48a · c2df48a
1 parent 13e15f6
commit c2df48a
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 44 deletions.
diff --git a/src/data_factory_testing_framework/functions/evaluator/expression_evaluator.py b/src/data_factory_testing_framework/functions/evaluator/expression_evaluator.py
@@ -11,7 +11,7 @@
     ExpressionTerminalTransformer,
 )
 from data_factory_testing_framework.functions.evaluator.rules import ExpressionRuleEvaluator
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.functions.functions_repository import FunctionsRepository
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 

diff --git a/src/data_factory_testing_framework/functions/evaluator/expression_terminal_transformer.py b/src/data_factory_testing_framework/functions/evaluator/expression_terminal_transformer.py
@@ -4,7 +4,7 @@
 from lark import Discard, Token, Transformer
 
 from data_factory_testing_framework.exceptions.expression_evaluation_error import ExpressionEvaluationError
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.run_parameter_type import RunParameterType
 
 

diff --git a/src/data_factory_testing_framework/functions/evaluator/rules/__init__.py b/src/data_factory_testing_framework/functions/evaluator/rules/__init__.py
@@ -1,18 +1,18 @@
-from .activity_reference_expression_rule import ActivityReferenceExpressionRuleEvaluator
-from .branch_expression_rule import BranchExpressionRuleEvaluator
-from .dataset_reference_expression_rule import DatasetReferenceExpressionRuleEvaluator
-from .evaluation_expression_rule import EvaluationExpressionRuleEvaluator
-from .expression_parameter_expression_rule import ExpressionParameterExpressionRuleEvaluator
-from .expression_rule import ExpressionRuleEvaluator
-from .function_call_expression_rule import FunctionCallExpressionRuleEvaluator
-from .item_reference_expression_rule import ItemReferenceExpressionRuleEvaluator
-from .linked_service_reference_expression_rule import LinkedServiceReferenceExpressionRuleEvaluator
-from .literal_evaluation_expression_rule import LiteralEvaluationExpressionRuleEvaluator
-from .literal_interpolation_expression_rule import LiteralInterpolationExpressionRuleEvaluator
-from .logical_bool_expression_rule import LogicalBoolExpressionEvaluator
-from .pipeline_reference_expression_rule import PipelineReferenceExpressionRuleEvaluator
-from .system_variable_reference_expression_rule import SystemVariableReferenceExpressionRuleEvaluator
-from .variable_reference_expression_rule import VariableReferenceExpressionRuleEvaluator
+from .activity_reference_expression_rule_evaluator import ActivityReferenceExpressionRuleEvaluator
+from .branch_expression_rule_evaluator import BranchExpressionRuleEvaluator
+from .dataset_reference_expression_rule_evaluator import DatasetReferenceExpressionRuleEvaluator
+from .evaluation_expression_rule_evaluator import EvaluationExpressionRuleEvaluator
+from .expression_parameter_expression_rule_evaluator import ExpressionParameterExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
+from .function_call_expression_rule_evaluator import FunctionCallExpressionRuleEvaluator
+from .item_reference_expression_rule_evaluator import ItemReferenceExpressionRuleEvaluator
+from .linked_service_reference_expression_rule_evaluator import LinkedServiceReferenceExpressionRuleEvaluator
+from .literal_evaluation_expression_rule_evaluator import LiteralEvaluationExpressionRuleEvaluator
+from .literal_interpolation_expression_rule_evaluator import LiteralInterpolationExpressionRuleEvaluator
+from .logical_bool_expression_rule_evaluator import LogicalBoolExpressionEvaluator
+from .pipeline_reference_expression_rule_evaluator import PipelineReferenceExpressionRuleEvaluator
+from .system_variable_reference_expression_rule_evaluator import SystemVariableReferenceExpressionRuleEvaluator
+from .variable_reference_expression_rule_evaluator import VariableReferenceExpressionRuleEvaluator
 
 __all__ = [
     "ActivityReferenceExpressionRuleEvaluator",

diff --git a/...les/activity_reference_expression_rule.py → ...ty_reference_expression_rule_evaluator.py b/...les/activity_reference_expression_rule.py → ...ty_reference_expression_rule_evaluator.py
@@ -4,10 +4,10 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class ActivityReferenceExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...evaluator/rules/branch_expression_rule.py → ...rules/branch_expression_rule_evaluator.py b/...evaluator/rules/branch_expression_rule.py → ...rules/branch_expression_rule_evaluator.py
@@ -7,9 +7,9 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class BranchExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...ules/dataset_reference_expression_rule.py → ...et_reference_expression_rule_evaluator.py b/...ules/dataset_reference_expression_rule.py → ...et_reference_expression_rule_evaluator.py
@@ -4,11 +4,11 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 from data_factory_testing_framework.state.run_parameter_type import RunParameterType
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class DatasetReferenceExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...uator/rules/evaluation_expression_rule.py → ...s/evaluation_expression_rule_evaluator.py b/...uator/rules/evaluation_expression_rule.py → ...s/evaluation_expression_rule_evaluator.py
@@ -2,9 +2,9 @@
 
 from data_factory_testing_framework.exceptions.expression_evaluation_error import ExpressionEvaluationError
 from data_factory_testing_framework.functions.evaluator.exceptions import ExpressionEvaluationInvalidChildTypeError
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class EvaluationExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...s/expression_parameter_expression_rule.py → ...on_parameter_expression_rule_evaluator.py b/...s/expression_parameter_expression_rule.py → ...on_parameter_expression_rule_evaluator.py
@@ -4,9 +4,9 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class ExpressionParameterExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...ctions/evaluator/rules/expression_rule.py → ...luator/rules/expression_rule_evaluator.py b/...ctions/evaluator/rules/expression_rule.py → ...luator/rules/expression_rule_evaluator.py
diff --git a/...or/rules/function_call_expression_rule.py → ...unction_call_expression_rule_evaluator.py b/...or/rules/function_call_expression_rule.py → ...unction_call_expression_rule_evaluator.py
@@ -5,7 +5,7 @@
 
 from data_factory_testing_framework.exceptions.expression_evaluation_error import ExpressionEvaluationError
 from data_factory_testing_framework.functions.evaluator.exceptions import ExpressionEvaluationInvalidChildTypeError
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import (
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import (
     EvaluationResult,
     ExpressionRuleEvaluator,
 )

diff --git a/...r/rules/item_reference_expression_rule.py → ...em_reference_expression_rule_evaluator.py b/...r/rules/item_reference_expression_rule.py → ...em_reference_expression_rule_evaluator.py
@@ -4,10 +4,10 @@
 from data_factory_testing_framework.functions.evaluator.exceptions import (
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class ItemReferenceExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...nked_service_reference_expression_rule.py → ...ce_reference_expression_rule_evaluator.py b/...nked_service_reference_expression_rule.py → ...ce_reference_expression_rule_evaluator.py
@@ -4,11 +4,11 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 from data_factory_testing_framework.state.run_parameter_type import RunParameterType
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class LinkedServiceReferenceExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...les/literal_evaluation_expression_rule.py → ...l_evaluation_expression_rule_evaluator.py b/...les/literal_evaluation_expression_rule.py → ...l_evaluation_expression_rule_evaluator.py
@@ -4,9 +4,9 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class LiteralEvaluationExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/.../literal_interpolation_expression_rule.py → ...nterpolation_expression_rule_evaluator.py b/.../literal_interpolation_expression_rule.py → ...nterpolation_expression_rule_evaluator.py
@@ -2,9 +2,9 @@
 
 from data_factory_testing_framework.exceptions.expression_evaluation_error import ExpressionEvaluationError
 from data_factory_testing_framework.functions.evaluator.exceptions import ExpressionEvaluationInvalidChildTypeError
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class LiteralInterpolationExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...tor/rules/logical_bool_expression_rule.py → ...logical_bool_expression_rule_evaluator.py b/...tor/rules/logical_bool_expression_rule.py → ...logical_bool_expression_rule_evaluator.py
@@ -7,9 +7,9 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class LogicalBoolExpressionEvaluator(ExpressionRuleEvaluator):

diff --git a/...les/pipeline_reference_expression_rule.py → ...ne_reference_expression_rule_evaluator.py b/...les/pipeline_reference_expression_rule.py → ...ne_reference_expression_rule_evaluator.py
@@ -4,10 +4,10 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class PipelineReferenceExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...tem_variable_reference_expression_rule.py → ...le_reference_expression_rule_evaluator.py b/...tem_variable_reference_expression_rule.py → ...le_reference_expression_rule_evaluator.py
@@ -4,11 +4,11 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 from data_factory_testing_framework.state.run_parameter_type import RunParameterType
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class SystemVariableReferenceExpressionRuleEvaluator(ExpressionRuleEvaluator):

diff --git a/...les/variable_reference_expression_rule.py → ...le_reference_expression_rule_evaluator.py b/...les/variable_reference_expression_rule.py → ...le_reference_expression_rule_evaluator.py
@@ -4,10 +4,10 @@
     ExpressionEvaluationInvalidChildTypeError,
     ExpressionEvaluationInvalidNumberOfChildrenError,
 )
-from data_factory_testing_framework.functions.evaluator.rules.expression_rule import EvaluationResult
+from data_factory_testing_framework.functions.evaluator.rules.expression_rule_evaluator import EvaluationResult
 from data_factory_testing_framework.state.pipeline_run_state import PipelineRunState
 
-from .expression_rule import ExpressionRuleEvaluator
+from .expression_rule_evaluator import ExpressionRuleEvaluator
 
 
 class VariableReferenceExpressionRuleEvaluator(ExpressionRuleEvaluator):