passes fsc at this point

oakbani · oakbani · commit ac8113eb9fd8 · 2020-08-27T15:59:55.000+05:00
diff --git a/optimizely/helpers/condition.py b/optimizely/helpers/condition.py
@@ -150,8 +150,24 @@ def compare_user_version_with_target_version(self, index):
         target_version = self.condition_data[index][1]
         user_version = self.attributes.get(condition_name)
 
+        if not isinstance(target_version, string_types):
+            self.logger.warning(audience_logs.UNKNOWN_CONDITION_VALUE.format(self._get_condition_json(index), ))
+            return None
+
+        if not isinstance(user_version, string_types):
+            self.logger.warning(
+                audience_logs.UNEXPECTED_TYPE.format(self._get_condition_json(index), type(user_version), condition_name)
+            )
+            return None
+
         target_version_parts = self.split_semantic_version(target_version)
+        if target_version_parts is None:
+            return None
+
         user_version_parts = self.split_semantic_version(user_version)
+        if user_version_parts is None:
+            return None
+
         user_version_parts_len = len(user_version_parts)
 
         for (idx, _) in enumerate(target_version_parts):
@@ -403,6 +419,10 @@ def semver_equal_evaluator(self, index):
           None:
             - if the user version value is not string type or is null.
         """
+        result = self.compare_user_version_with_target_version(index)
+        if result is None:
+            return result
+
         return self.compare_user_version_with_target_version(index) == 0
 
     def semver_greater_than_evaluator(self, index):
@@ -418,6 +438,9 @@ def semver_greater_than_evaluator(self, index):
           None:
             - if the user version value is not string type or is null.
         """
+        result = self.compare_user_version_with_target_version(index)
+        if result is None:
+            return result
         return self.compare_user_version_with_target_version(index) > 0
 
     def semver_less_than_evaluator(self, index):
@@ -433,6 +456,9 @@ def semver_less_than_evaluator(self, index):
           None:
             - if the user version value is not string type or is null.
         """
+        result = self.compare_user_version_with_target_version(index)
+        if result is None:
+            return result
         return self.compare_user_version_with_target_version(index) < 0
 
     def semver_less_than_or_equal_evaluator(self, index):
@@ -448,6 +474,9 @@ def semver_less_than_or_equal_evaluator(self, index):
           None:
             - if the user version value is not string type or is null.
         """
+        result = self.compare_user_version_with_target_version(index)
+        if result is None:
+            return result
         return self.compare_user_version_with_target_version(index) <= 0
 
     def semver_greater_than_or_equal_evaluator(self, index):
@@ -463,6 +492,9 @@ def semver_greater_than_or_equal_evaluator(self, index):
           None:
             - if the user version value is not string type or is null.
         """
+        result = self.compare_user_version_with_target_version(index)
+        if result is None:
+            return result
         return self.compare_user_version_with_target_version(index) >= 0
 
     EVALUATORS_BY_MATCH_TYPE = {
diff --git a/tests/helpers_tests/test_condition.py b/tests/helpers_tests/test_condition.py
@@ -2019,11 +2019,13 @@ def test_substring__condition_value_invalid(self):
             ).format(json.dumps(expected_condition_log))
         )
 
-    @pytest.mark.parametrize("test_input,expected", [(i, None) for i in ["-", ".", "..", "+", "+test", " ", "2 .0. 0",
-                                                                         "2.", ".0.0", "1.2.2.2", "2.x", ",",
-                                                                         "+build-prerelese"]])
-    def test_invalid_semver__returns_null__when_semver_is_invalid(self, test_input, expected):
-        evaluator = condition_helper.CustomAttributeConditionEvaluator(
-            semver_less_than_or_equal_2_0_1_condition_list, {'Android': test_input}, self.mock_client_logger)
+    def test_invalid_semver__returns_None__when_semver_is_invalid(self):
+        invalid_test_cases = ["-", ".", "..", "+", "+test", " ", "2 .0. 0",
+                              "2.", ".0.0", "1.2.2.2", "2.x", ",",
+                              "+build-prerelese"]
+
+        for invalid_test_case in invalid_test_cases:
+            evaluator = condition_helper.CustomAttributeConditionEvaluator(
+                semver_less_than_or_equal_2_0_1_condition_list, {'Android': invalid_test_case}, self.mock_client_logger)
 
-        assert eval(evaluator.evaluate(0)) == expected
+            self.assertIsNone(evaluator.evaluate(0))
