Change tests and fixtures to reflect multi-target mapper changes

Author: sallybg

tests/conftest.py

@@ -19,7 +19,12 @@
 
 import pytest
 
-from dcd_mapping.schemas import AlignmentResult, ScoresetMetadata, TxSelectResult
+from dcd_mapping.schemas import (
+    AlignmentResult,
+    ScoresetMetadata,
+    TargetGene,
+    TxSelectResult,
+)
 
 FIXTURE_DATA_DIR = Path(__file__).parents[0].resolve() / "fixtures"
 
@@ -43,7 +48,11 @@ def scoreset_metadata_fixture(fixture_data_dir: Path):
         data = json.load(f)
     results = {}
     for d in data["scoreset_metadata"]:
-        formatted_data = ScoresetMetadata(**d)
+        target_genes = {}
+        for target_gene in d["target_genes"]:
+            target_gene_metadata = d["target_genes"][target_gene]
+            target_genes[target_gene] = TargetGene(**target_gene_metadata)
+        formatted_data = ScoresetMetadata(urn=d["urn"], target_genes=target_genes)
         results[formatted_data.urn] = formatted_data
     return results
 
@@ -56,8 +65,10 @@ def align_result_fixture(fixture_data_dir: Path):
         data = json.load(f)
     results = {}
     for urn, result in data.items():
-        formatted_result = AlignmentResult(**result)
-        results[urn] = formatted_result
+        formatted_results = {}
+        for target_gene in result:
+            formatted_results[target_gene] = AlignmentResult(**result[target_gene])
+        results[urn] = formatted_results
     return results
 
 
@@ -69,8 +80,10 @@ def transcript_results_fixture(fixture_data_dir: Path):
         data = json.load(f)
     results = {}
     for urn, result in data.items():
-        formatted_result = TxSelectResult(**result)
-        results[urn] = formatted_result
+        formatted_results = {}
+        for target_gene in result:
+            formatted_results[target_gene] = TxSelectResult(**result[target_gene])
+        results[urn] = formatted_results
     return results