rebase

Author: ceorourke

tests/sentry/workflow_engine/models/test_data_condition.py

@@ -1,15 +1,17 @@
+from enum import IntEnum
+from typing import Any, cast
 from unittest import mock
 
 import pytest
 
 from sentry.testutils.cases import TestCase
 from sentry.workflow_engine.models.data_condition import Condition, DataConditionEvaluationException
-from sentry.workflow_engine.types import DataConditionHandler, DetectorPriorityLevel, WorkflowEventData
-from tests.sentry.workflow_engine.endpoints.validators.test_base_data_condition import (
-    MockDataConditionEnum,
-    MockDataConditionHandlerDictComparison,
-)
 from sentry.workflow_engine.registry import condition_handler_registry
+from sentry.workflow_engine.types import (
+    DataConditionHandler,
+    DetectorPriorityLevel,
+    WorkflowEventData,
+)
 from tests.sentry.workflow_engine.test_base import BaseWorkflowTest
 
 
@@ -69,18 +71,11 @@ def test_boolean(self):
 
 
 class EvaluateValueTest(BaseWorkflowTest):
-    def setUp(self):
+    def setUp(self) -> None:
         super().setUp()
-        self.workflow_triggers = self.create_data_condition_group()
-        self.dict_comparison_dc = self.create_data_condition(
-            type="test",
-            comparison={
-                "baz": MockDataConditionEnum.FOO,
-            }
+        condition_handler_registry.registrations[Condition.REAPPEARED_EVENT] = cast(
+            DataConditionHandler[Any], MockDataConditionHandlerDictComparison
         )
-        condition_handler_registry.registrations[Condition.REAPPEARED_EVENT] = (
-            MockDataConditionHandlerDictComparison
-        )  # type:ignore[assignment]
         self.workflow_triggers = self.create_data_condition_group()
         self.dict_comparison_dc = self.create_data_condition(
             type=Condition.REAPPEARED_EVENT,
@@ -98,20 +93,7 @@ def test(self):
         assert dc.evaluate_value(2) == DetectorPriorityLevel.HIGH
         assert dc.evaluate_value(1) is None
 
-    @mock.patch(
-        "sentry.workflow_engine.registry.condition_handler_registry.get",
-        return_value=MockDataConditionHandlerDictComparison,
-    )
-    def test_dict_comparison_result_high(self, mock_dc_handler):
-        assert self.dict_comparison_dc.evaluate_value(2) == DetectorPriorityLevel.HIGH
-
-    @mock.patch(
-        "sentry.workflow_engine.registry.condition_handler_registry.get",
-        return_value=MockDataConditionHandlerDictComparison,
-    )
-
     def test_dict_comparison_result_high(self):
-        self.dict_comparison_dc.update(comparison={"baz": MockDataConditionEnum.BAR})
         assert self.dict_comparison_dc.evaluate_value(2) == DetectorPriorityLevel.HIGH
 
     def test_dict_comparison_result_ok(self):