ELI-595 | KT | updated the names of fields used in testcases (they are pascal case)

Author: Karthikeyannhs

src/rules_validation_api/validators/iteration_validator.py

@@ -100,19 +100,14 @@ def transform_actions_mapper(cls, action_mapper: ActionsMapper) -> ActionsMapper
     @model_validator(mode="after")
     def validate_rule_cohort_labels_against_iteration_cohorts(self) -> typing.Self:
         allowed_labels = {cohort.cohort_label for cohort in self.iteration_cohorts}
-        print(allowed_labels)
 
         for idx, rule in enumerate(self.iteration_rules):
             if rule.cohort_label is None:
                 continue
-            print("parsed cohort labels from rules:")
-            print(rule.parsed_cohort_labels)
             if not all(label in allowed_labels for label in rule.parsed_cohort_labels):
                 allowed_str = ", ".join(sorted(allowed_labels))
                 msg = (
-                    f"Invalid cohort_label value: {rule.cohort_label}. "
-                    f"Allowed values: {allowed_str}. "
-                    f"Rule index: {idx}"
+                    f"Invalid cohort_label value: {rule.cohort_label}. Allowed values: {allowed_str}. Rule index: {idx}"
                 )
                 raise ValueError(msg)
 

tests/unit/validation/test_campaign_config_validator.py

@@ -13,10 +13,7 @@ class TestMandatoryFieldsSchemaValidations:
     def test_campaign_config_with_only_mandatory_fields_configuration(
         self, valid_campaign_config_with_only_mandatory_fields
     ):
-        try:
-            CampaignConfigValidation(**valid_campaign_config_with_only_mandatory_fields)
-        except ValidationError as e:
-            pytest.fail(f"Unexpected error during model instantiation: {e}")
+        CampaignConfigValidation(**valid_campaign_config_with_only_mandatory_fields)
 
     @pytest.mark.parametrize(
         "mandatory_field",

tests/unit/validation/test_iteration_rules_validator.py

@@ -9,10 +9,7 @@ class TestMandatoryFieldsSchemaValidations:
     def test_campaign_config_with_only_mandatory_fields_configuration(
         self, valid_iteration_rule_with_only_mandatory_fields
     ):
-        try:
-            IterationRuleValidation(**valid_iteration_rule_with_only_mandatory_fields)
-        except ValidationError as e:
-            pytest.fail(f"Unexpected error during model instantiation: {e}")
+        IterationRuleValidation(**valid_iteration_rule_with_only_mandatory_fields)
 
     @pytest.mark.parametrize(
         "mandatory_field",

tests/unit/validation/test_iteration_validator.py

@@ -14,10 +14,7 @@ class TestMandatoryFieldsSchemaValidations:
     def test_campaign_config_with_only_mandatory_fields_configuration(
         self, valid_campaign_config_with_only_mandatory_fields
     ):
-        try:
-            IterationValidation(**(valid_campaign_config_with_only_mandatory_fields["Iterations"][0]))
-        except ValidationError as e:
-            pytest.fail(f"Unexpected error during model instantiation: {e}")
+        IterationValidation(**(valid_campaign_config_with_only_mandatory_fields["Iterations"][0]))
 
     @pytest.mark.parametrize(
         "mandatory_field",
@@ -556,7 +553,7 @@ def test_iteration_full_datetime_validation(  # noqa : PLR0913
         data = valid_campaign_config_with_only_mandatory_fields.copy()
 
         if default_time_iteration_input:
-            data["iteration_time"] = default_time_iteration_input
+            data["IterationTime"] = default_time_iteration_input
 
         data["Iterations"] = [iteration_data]
 
@@ -572,17 +569,15 @@ def test_iteration_full_datetime_validation(  # noqa : PLR0913
         )
 
     def test_iteration_rules_having_invalid_cohort_labels_throws_error(
-        self, valid_iteration_with_only_mandatory_fields,
+        self,
+        valid_iteration_with_only_mandatory_fields,
         valid_iteration_rule_with_only_mandatory_fields,
         valid_iteration_cohorts,
     ):
         data = valid_iteration_with_only_mandatory_fields.copy()
-        data["iteration_rules"] = [valid_iteration_rule_with_only_mandatory_fields]
-        data["iteration_cohorts"] = [valid_iteration_cohorts]
-        data["iteration_rules"][0]["CohortLabel"] = "label_2"
-        IterationValidation(**(data))
-        # try:
-
-        #     IterationValidation(**(data))
-        # except ValidationError as e:
-        #     pytest.fail(f"Unexpected error during model instantiation: {e}")
+        data["IterationRules"] = [valid_iteration_rule_with_only_mandatory_fields]
+        data["IterationCohorts"] = [valid_iteration_cohorts]
+        data["IterationRules"][0]["CohortLabel"] = "label_2"
+
+        with pytest.raises(ValidationError):
+            IterationValidation(**(data))