prune back

Benchling-Open-Source · Jan 29, 2024 · d3dfc27 · d3dfc27
1 parent 7f9ebc9
commit d3dfc27
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/tests/parsers/example_weyland_yutani/example_weyland_yutani_parser_test.py b/tests/parsers/example_weyland_yutani/example_weyland_yutani_parser_test.py
@@ -2,10 +2,7 @@
 
 from allotropy.parser_factory import Vendor
 from tests.parsers.test_utils import (
-    CALCULATED_DATA_IDENTIFIER,
-    DATA_SOURCE_IDENTIFIER,
     from_file,
-    MEASUREMENT_IDENTIFIER,
     validate_contents,
     validate_schema,
 )
@@ -19,17 +16,11 @@
 TESTDATA = "tests/parsers/example_weyland_yutani/testdata"
 VENDOR_TYPE = Vendor.EXAMPLE_WEYLAND_YUTANI
 
-IDENTIFIERS_TO_EXCLUDE = [
-    CALCULATED_DATA_IDENTIFIER,
-    DATA_SOURCE_IDENTIFIER,
-    MEASUREMENT_IDENTIFIER,
-]
-
 
 @pytest.mark.parametrize("filestem", valid_files)
 def test_parse_weyland_yutani_to_asm(filestem: str) -> None:
     test_filepath = f"{TESTDATA}/{filestem}.csv"
     expected_filepath = f"{TESTDATA}/{filestem}.json"
     allotrope_dict = from_file(test_filepath, VENDOR_TYPE)
     validate_schema(allotrope_dict, SCHEMA)
-    validate_contents(allotrope_dict, expected_filepath, IDENTIFIERS_TO_EXCLUDE)
+    validate_contents(allotrope_dict, expected_filepath)
diff --git a/tests/parsers/roche_cedex_bioht/roche_cedex_bioht_parser_test.py b/tests/parsers/roche_cedex_bioht/roche_cedex_bioht_parser_test.py
@@ -7,8 +7,6 @@
 from allotropy.parsers.utils.timestamp_parser import TimestampParser
 from tests.parsers.roche_cedex_bioht.roche_cedex_bioht_data import get_data, get_model
 from tests.parsers.test_utils import (
-    CALCULATED_DATA_IDENTIFIER,
-    DATA_SOURCE_IDENTIFIER,
     from_file,
     MEASUREMENT_IDENTIFIER,
     validate_contents,
@@ -26,8 +24,6 @@
 SCHEMA_FILE = "cell-culture-analyzer/BENCHLING/2023/09/cell-culture-analyzer.json"
 
 IDENTIFIERS_TO_EXCLUDE = [
-    CALCULATED_DATA_IDENTIFIER,
-    DATA_SOURCE_IDENTIFIER,
     MEASUREMENT_IDENTIFIER,
 ]
 

diff --git a/tests/parsers/test_utils.py b/tests/parsers/test_utils.py
@@ -74,7 +74,7 @@ def validate_schema(allotrope_dict: DictType, schema_relative_path: str) -> None
 def validate_contents(
     allotrope_dict: DictType,
     expected_file: str,
-    identifiers_to_exclude: list[str],
+    identifiers_to_exclude: Optional[list[str]] = None,
 ) -> None:
     """Use the newly created allotrope_dict to validate the contents inside expected_file."""
     with open(expected_file) as f: