tests: update repr expectations

Author: glichtner

execution_engine/omop/concepts.py

@@ -23,21 +23,10 @@ def __str__(self) -> str:
         """
         Returns a string representation of the concept.
         """
-        base = f'OMOP Concept: "{self.concept_name}" ({self.concept_id}) [{self.vocabulary_id}#{self.concept_code}]'
+        if self.vocabulary_id == "UCUM":
+            return str(self.concept_code)
 
-        if self.standard_concept is not None and self.standard_concept == "S":
-            return f"{base} (STANDARD)"
-
-        return base
-
-    # def __str__(self) -> str:
-    #     """
-    #     Returns a string representation of the concept.
-    #     """
-    #     if self.vocabulary_id == "UCUM":
-    #         return str(self.concept_code)
-    #
-    #     return str(self.concept_name)
+        return str(self.concept_name)
 
     def is_custom(self) -> bool:
         """

execution_engine/omop/criterion/combination/temporal.py

@@ -20,6 +20,12 @@ class TimeIntervalType(StrEnum):
     DAY = "day"
     ANY_TIME = "any_time"
 
+    def __repr__(self) -> str:
+        """
+        Get the string representation of the time interval type.
+        """
+        return f'{self.__class__.__name__}("{self.value}")'
+
 
 class TemporalIndicatorCombination(CriterionCombination):
     """

tests/execution_engine/converter/test_converter.py

@@ -90,7 +90,7 @@ def test_parse_value_codeable_concept(self, monkeypatch, test_concept):
         mock_get_standard_concept = MagicMock()
         mock_get_standard_concept.return_value = test_concept
         monkeypatch.setattr(
-            "execution_engine.omop.vocabulary.standard_vocabulary.get_standard_concept",
+            "execution_engine.omop.vocabulary.standard_vocabulary.get_concept",
             mock_get_standard_concept,
         )
 
@@ -102,7 +102,7 @@ def test_parse_value_codeable_concept(self, monkeypatch, test_concept):
 
         assert isinstance(value, ValueConcept)
         mock_get_standard_concept.assert_called_once_with(
-            system_uri="http://example.com", concept="123"
+            system_uri="http://example.com", concept="123", standard=True
         )
 
     def test_parse_value_quantity(self, monkeypatch, unit_concept):

tests/execution_engine/omop/criterion/combination/test_logical_combination.py

@@ -224,10 +224,7 @@ def test_repr(self):
             category=CohortCategory.POPULATION_INTERVENTION,
         )
 
-        assert (
-            repr(combination)
-            == "LogicalCriterionCombination(AND).POPULATION_INTERVENTION"
-        )
+        assert repr(combination) == "LogicalCriterionCombination.And(\n)"
 
     def test_add_all(self):
         operator = LogicalCriterionCombination.Operator(

tests/execution_engine/omop/criterion/combination/test_temporal_combination.py

@@ -214,7 +214,7 @@ def test_repr(self):
 
         assert (
             repr(combination)
-            == "TemporalIndicatorCombination(AT_LEAST(threshold=1)).POPULATION_INTERVENTION for morning_shift"
+            == 'TemporalIndicatorCombination(operator=Operator("AT_LEAST", threshold=1), category=CohortCategory.POPULATION_INTERVENTION, interval_type=TimeIntervalType("morning_shift"))'
         )
 
         combination = TemporalIndicatorCombination(
@@ -226,7 +226,7 @@ def test_repr(self):
 
         assert (
             repr(combination)
-            == "TemporalIndicatorCombination(AT_LEAST(threshold=1)).POPULATION_INTERVENTION from 08:00:00 to 16:00:00"
+            == 'TemporalIndicatorCombination(operator=Operator("AT_LEAST", threshold=1), category=CohortCategory.POPULATION_INTERVENTION, start_time=datetime.time(8, 0), end_time=datetime.time(16, 0))'
         )
 
     def test_add_all(self):

tests/execution_engine/omop/test_concepts.py

@@ -33,7 +33,7 @@ def test_str(self):
             standard_concept="S",
             invalid_reason=None,
         )
-        assert str(concept) == concept.concept_name
+        assert str(concept) == "Test Concept"
 
         concept = Concept(
             concept_id=1,
@@ -45,7 +45,7 @@ def test_str(self):
             standard_concept="N",
             invalid_reason=None,
         )
-        assert str(concept) == concept.concept_name
+        assert str(concept) == "Test Concept"
 
     def test_repr(self):
         concept = Concept(
@@ -60,7 +60,8 @@ def test_repr(self):
         )
         assert (
             repr(concept)
-            == 'OMOP Concept: "Test Concept" (1) [Test Vocabulary#C123] (STANDARD)'
+            == "Concept(concept_id=1, concept_name='Test Concept', concept_code='C123', domain_id='Test Domain', "
+            "vocabulary_id='Test Vocabulary', concept_class_id='Test Class', standard_concept='S', invalid_reason=None)"
         )
 
     def test_is_custom(self):

tests/execution_engine/util/test_value.py

@@ -132,7 +132,7 @@ def test_repr(self, unit_concept):
         vn = ValueNumber(unit=unit_concept, value=5)
         assert (
             repr(vn)
-            == """ValueNumber(unit=OMOP Concept: "Test Unit" (1) [test#unit], value=5.0, value_min=None, value_max=None)"""
+            == """ValueNumber(unit=Concept(concept_id=1, concept_name='Test Unit', concept_code='unit', domain_id='units', vocabulary_id='test', concept_class_id='test', standard_concept=None, invalid_reason=None), value=5.0, value_min=None, value_max=None)"""
         )
 
     def test_to_sql(self, unit_concept, test_table):
@@ -309,14 +309,14 @@ def test_str(self, test_concept):
         value_concept = ValueConcept(value=test_concept)
         assert (
             repr(value_concept)
-            == 'Value == OMOP Concept: "Test Concept" (1) [test#unit]'
+            == "Value == Concept(concept_id=1, concept_name='Test Concept', concept_code='unit', domain_id='units', vocabulary_id='test', concept_class_id='test', standard_concept=None, invalid_reason=None)"
         )
 
     def test_repr(self, test_concept):
         value_concept = ValueConcept(value=test_concept)
         assert (
             repr(value_concept)
-            == 'Value == OMOP Concept: "Test Concept" (1) [test#unit]'
+            == "Value == Concept(concept_id=1, concept_name='Test Concept', concept_code='unit', domain_id='units', vocabulary_id='test', concept_class_id='test', standard_concept=None, invalid_reason=None)"
         )
 
     def test_dict(self, test_concept):