Combined order operator tests into one more comprehensive parametrized test

Author: KarlLundengaard

app/tests/physical_quantity_evaluation_tests.py

@@ -257,77 +257,32 @@ def test_MECH60001_dynamic_signals_error_with_dB(self):
         result = evaluation_function(res, ans, params, include_test_data=True)
         assert result["is_correct"] is True
 
-    def test_quantity_with_multiple_of_positive_value(self):
-        ans = "5 Hz"
-        res = "10 Hz"
-        params = {
-            "strict_syntax": False,
-            "physical_quantity": True,
-            "elementary functions": True,
-            "criteria": "response > answer"
-        }
-        result = evaluation_function(res, ans, params, include_test_data=True)
-        assert result["is_correct"] is True
-
-    def test_quantity_response_less_than_answer(self):
-        ans = "15 Hz"
-        res = "10 Hz"
-        params = {
-            "strict_syntax": False,
-            "physical_quantity": True,
-            "elementary functions": True,
-            "criteria": "response < answer"
-        }
-        result = evaluation_function(res, ans, params, include_test_data=True)
-        assert result["is_correct"] is True
-
-    def test_quantity_response_greater_than_equal_answer(self):
-        ans = "5 Hz"
-        res = "10 Hz"
-        params = {
-            "strict_syntax": False,
-            "physical_quantity": True,
-            "elementary functions": True,
-            "criteria": "response >= answer"
-        }
-        result = evaluation_function(res, ans, params, include_test_data=True)
-        assert result["is_correct"] is True
-
-    def test_quantity_response_greater_than_equal_answer_equal(self):
-        ans = "10 Hz"
-        res = "10 Hz"
-        params = {
-            "strict_syntax": False,
-            "physical_quantity": True,
-            "elementary functions": True,
-            "criteria": "response >= answer"
-        }
-        result = evaluation_function(res, ans, params, include_test_data=True)
-        assert result["is_correct"] is True
-
-    def test_quantity_response_less_than_equal_answer(self):
-        ans = "15 Hz"
-        res = "10 Hz"
-        params = {
-            "strict_syntax": False,
-            "physical_quantity": True,
-            "elementary functions": True,
-            "criteria": "response <= answer"
-        }
-        result = evaluation_function(res, ans, params, include_test_data=True)
-        assert result["is_correct"] is True
-
-    def test_quantity_response_less_than_equal_answer_equal(self):
-        ans = "10 Hz"
-        res = "10 Hz"
+    @pytest.mark.parametrize(
+        "response, answer, order_operator, value",
+        [
+            ("10 Hz", "5 Hz", ">", True),
+            ("5 Hz", "10 Hz", ">", False),
+            ("10 Hz", "10 Hz", ">", False),
+            ("10 Hz", "5 Hz", "<", False),
+            ("5 Hz", "10 Hz", "<", True),
+            ("10 Hz", "10 Hz", "<", False),
+            ("10 Hz", "5 Hz", ">=", True),
+            ("5 Hz", "10 Hz", ">=", False),
+            ("10 Hz", "10 Hz", ">=", True),
+            ("10 Hz", "5 Hz", "<=", False),
+            ("5 Hz", "10 Hz", "<=", True),
+            ("10 Hz", "10 Hz", "<=", True),
+        ]
+    )
+    def test_order_operators(self, response, answer, order_operator, value):
         params = {
             "strict_syntax": False,
             "physical_quantity": True,
             "elementary functions": True,
-            "criteria": "response <= answer"
+            "criteria": "response "+order_operator+" answer"
         }
-        result = evaluation_function(res, ans, params, include_test_data=True)
-        assert result["is_correct"] is True
+        result = evaluation_function(response, answer, params, include_test_data=True)
+        assert result["is_correct"] is value
 
     def test_radians_to_frequency(self):
         ans = "2*pi*f radian/second"