refactor - Organise lims samples fixtures

tests/apps/demultiplex/conftest.py

@@ -47,12 +47,12 @@ def bcl_convert_samples_similar_index2() -> list[FlowCellSampleBCLConvert]:
 @pytest.fixture
 def bcl2fastq_sample_sheet_creator(
     novaseq_flow_cell_demultiplexed_with_bcl2fastq: FlowCellDirectoryData,
-    lims_novaseq_6000_bcl2fastq_samples: list[FlowCellSampleBcl2Fastq],
+    novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples: list[FlowCellSampleBcl2Fastq],
 ) -> SampleSheetCreatorBcl2Fastq:
     """Returns a sample sheet creator for version 1 sample sheets with bcl2fastq format."""
     return SampleSheetCreatorBcl2Fastq(
         flow_cell=novaseq_flow_cell_demultiplexed_with_bcl2fastq,
-        lims_samples=lims_novaseq_6000_bcl2fastq_samples,
+        lims_samples=novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples,
     )
 
 

tests/apps/demultiplex/test_sample_models.py

@@ -321,8 +321,14 @@ def test_update_barcode_mismatches_2(
     "run_parameters_fixture, raw_lims_samples_fixture",
     [
         ("novaseq_x_run_parameters", "novaseq_x_lims_samples"),
-        ("novaseq_6000_run_parameters_pre_1_5_kits", "novaseq_6000_pre_1_5_kits_lims_samples"),
-        ("novaseq_6000_run_parameters_post_1_5_kits", "novaseq_6000_post_1_5_kits_lims_samples"),
+        (
+            "novaseq_6000_run_parameters_pre_1_5_kits",
+            "novaseq_6000_pre_1_5_kits_bcl_convert_lims_samples",
+        ),
+        (
+            "novaseq_6000_run_parameters_post_1_5_kits",
+            "novaseq_6000_post_1_5_kits_bcl_convert_lims_samples",
+        ),
         ("hiseq_x_single_index_run_parameters", "hiseq_x_single_index_bcl_convert_lims_samples"),
         ("hiseq_x_dual_index_run_parameters", "hiseq_x_dual_index_bcl_convert_lims_samples"),
         ("hiseq_2500_dual_index_run_parameters", "hiseq_2500_dual_index_bcl_convert_lims_samples"),

tests/apps/demultiplex/test_sample_sheet_creator.py

@@ -21,7 +21,7 @@
 
 def test_bcl_convert_sample_sheet_fails_with_bcl2fastq(
     novaseq_x_flow_cell: FlowCellDirectoryData,
-    lims_novaseq_bcl_convert_samples: list[FlowCellSampleBCLConvert],
+    novaseq_x_lims_samples: list[FlowCellSampleBCLConvert],
 ):
     """Test that creating a BCL Convert sample sheet fails if the bcl converter is Bcl2fastq."""
     # GIVEN a NovaSeqX flow cell and samples and the bcl converter is Bcl2fastq
@@ -31,7 +31,7 @@ def test_bcl_convert_sample_sheet_fails_with_bcl2fastq(
     with pytest.raises(SampleSheetError) as exc_info:
         SampleSheetCreatorBCLConvert(
             flow_cell=novaseq_x_flow_cell,
-            lims_samples=lims_novaseq_bcl_convert_samples,
+            lims_samples=novaseq_x_lims_samples,
         )
         # THEN an error is raised
         assert (

tests/apps/demultiplex/test_sample_sheet_creator_factory.py

@@ -17,7 +17,7 @@
 
 def test_sample_sheet_creator_factory_novaseq_6000(
     novaseq_flow_cell_demultiplexed_with_bcl2fastq: FlowCellDirectoryData,
-    lims_novaseq_bcl2fastq_samples: list[FlowCellSampleBcl2Fastq],
+    novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples: list[FlowCellSampleBcl2Fastq],
 ):
     """Test that a sample sheet creator defined with NovaSeq6000 data is V1."""
     # GIVEN a NovaSeq6000 flow cell and a list of NovaSeq6000 samples
@@ -28,26 +28,26 @@ def test_sample_sheet_creator_factory_novaseq_6000(
     # WHEN defining the sample sheet creator
     sample_sheet_creator: SampleSheetCreator = get_sample_sheet_creator(
         flow_cell=novaseq_flow_cell_demultiplexed_with_bcl2fastq,
-        lims_samples=lims_novaseq_bcl2fastq_samples,
+        lims_samples=novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples,
         force=False,
     )
 
     # THEN no error is raised and the sample sheet creator is a Bcl2Fastq sample sheet creator
     assert isinstance(sample_sheet_creator, SampleSheetCreatorBcl2Fastq)
 
 
-def test_sample_sheet_creator_factory_BCL_convert(
+def test_sample_sheet_creator_factory_bcl_convert(
     novaseq_x_flow_cell: FlowCellDirectoryData,
-    lims_novaseq_bcl_convert_samples: list[FlowCellSampleBCLConvert],
+    novaseq_x_lims_samples: list[FlowCellSampleBCLConvert],
 ):
     """Test that a sample sheet creator defined with BCL convert data is BCL Convert."""
-    # GIVEN a NovaSeqX flow cell and a list of NovaSeqX samples that is demultiplexed wit BCL Convert
+    # GIVEN a NovaSeqX flow cell and a list of NovaSeqX BCL Convert samples
     assert novaseq_x_flow_cell.bcl_converter == BclConverter.DRAGEN
 
     # WHEN defining the sample sheet creator
     sample_sheet_creator: SampleSheetCreator = get_sample_sheet_creator(
         flow_cell=novaseq_x_flow_cell,
-        lims_samples=lims_novaseq_bcl_convert_samples,
+        lims_samples=novaseq_x_lims_samples,
         force=False,
     )
 

tests/cli/demultiplex/test_create_sample_sheet.py

@@ -23,7 +23,7 @@ def test_create_sample_sheet_no_run_parameters_fails(
     cli_runner: testing.CliRunner,
     tmp_flow_cells_directory_no_run_parameters: Path,
     sample_sheet_context: CGConfig,
-    lims_novaseq_bcl2fastq_samples: list[FlowCellSampleBcl2Fastq],
+    novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples: list[FlowCellSampleBcl2Fastq],
     caplog,
     mocker,
 ):
@@ -36,7 +36,7 @@ def test_create_sample_sheet_no_run_parameters_fails(
     # GIVEN flow cell samples
     mocker.patch(
         FLOW_CELL_FUNCTION_NAME,
-        return_value=lims_novaseq_bcl2fastq_samples,
+        return_value=novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples,
     )
 
     # GIVEN that the context's flow cell directory holds the given flow cell
@@ -60,7 +60,7 @@ def test_create_bcl2fastq_sample_sheet(
     cli_runner: testing.CliRunner,
     tmp_flow_cells_directory_no_sample_sheet: Path,
     sample_sheet_context: CGConfig,
-    lims_novaseq_bcl2fastq_samples: list[FlowCellSampleBcl2Fastq],
+    novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples: list[FlowCellSampleBcl2Fastq],
     mocker,
 ):
     """Test that creating a Bcl2fastq sample sheet works."""
@@ -82,7 +82,7 @@ def test_create_bcl2fastq_sample_sheet(
     # GIVEN flow cell samples
     mocker.patch(
         FLOW_CELL_FUNCTION_NAME,
-        return_value=lims_novaseq_bcl2fastq_samples,
+        return_value=novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples,
     )
     # GIVEN a lims api that returns some samples
 
@@ -117,12 +117,12 @@ class SampleSheetScenario(BaseModel):
     [
         SampleSheetScenario(
             flow_cell_directory="novaseq_6000_pre_1_5_kits_flow_cell",
-            lims_samples="novaseq_6000_pre_1_5_kits_lims_samples",
+            lims_samples="novaseq_6000_pre_1_5_kits_bcl_convert_lims_samples",
             correct_sample_sheet="novaseq_6000_pre_1_5_kits_correct_sample_sheet",
         ),
         SampleSheetScenario(
             flow_cell_directory="novaseq_6000_post_1_5_kits_flow_cell",
-            lims_samples="novaseq_6000_post_1_5_kits_lims_samples",
+            lims_samples="novaseq_6000_post_1_5_kits_bcl_convert_lims_samples",
             correct_sample_sheet="novaseq_6000_post_1_5_kits_correct_sample_sheet",
         ),
         SampleSheetScenario(
@@ -137,7 +137,6 @@ def test_create_dragen_sample_sheet(
     cli_runner: testing.CliRunner,
     scenario: SampleSheetScenario,
     sample_sheet_context: CGConfig,
-    lims_novaseq_bcl_convert_samples: list[FlowCellSampleBCLConvert],
     mocker,
     request: FixtureRequest,
 ):
@@ -193,7 +192,7 @@ def test_incorrect_bcl2fastq_headers_samplesheet(
     cli_runner: testing.CliRunner,
     tmp_flow_cells_directory_malformed_sample_sheet: Path,
     sample_sheet_context: CGConfig,
-    lims_novaseq_bcl2fastq_samples: list[FlowCellSampleBcl2Fastq],
+    novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples: list[FlowCellSampleBcl2Fastq],
     mocker,
     caplog,
 ):
@@ -207,7 +206,7 @@ def test_incorrect_bcl2fastq_headers_samplesheet(
     # GIVEN flow cell samples
     mocker.patch(
         FLOW_CELL_FUNCTION_NAME,
-        return_value=lims_novaseq_bcl2fastq_samples,
+        return_value=novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples,
     )
     # GIVEN a lims api that returns some samples
 

tests/fixture_plugins/demultiplex_fixtures/flow_cell_fixtures.py

@@ -92,10 +92,10 @@ def novaseq_6000_flow_cell(bcl_convert_flow_cell: FlowCellDirectoryData) -> Flow
 
 
 @pytest.fixture(scope="function")
-def novaseq_x_flow_cell(novaseq_x_flow_cell_dir: Path) -> FlowCellDirectoryData:
+def novaseq_x_flow_cell(novaseq_x_flow_cell_directory: Path) -> FlowCellDirectoryData:
     """Create a NovaSeqX flow cell object with flow cell that is demultiplexed."""
     return FlowCellDirectoryData(
-        flow_cell_path=novaseq_x_flow_cell_dir, bcl_converter=BclConverter.DRAGEN
+        flow_cell_path=novaseq_x_flow_cell_directory, bcl_converter=BclConverter.DRAGEN
     )
 
 

tests/fixture_plugins/demultiplex_fixtures/path_fixtures.py

@@ -213,13 +213,6 @@ def novaseq_6000_post_1_5_kits_correct_sample_sheet(
     return Path(novaseq_6000_post_1_5_kits_flow_cell, CORRECT_SAMPLE_SHEET)
 
 
-@pytest.fixture
-def novaseq_6000_post_1_5_kits_raw_lims_samples(
-    novaseq_6000_post_1_5_kits_flow_cell: Path,
-) -> Path:
-    return Path(novaseq_6000_post_1_5_kits_flow_cell, "HK33MDRX3_raw.json")
-
-
 @pytest.fixture
 def novaseq_6000_pre_1_5_kits_flow_cell(tmp_flow_cells_directory: Path) -> Path:
     return Path(tmp_flow_cells_directory, "190927_A00689_0069_BHLYWYDSXX")
@@ -232,11 +225,6 @@ def novaseq_6000_pre_1_5_kits_correct_sample_sheet(
     return Path(novaseq_6000_pre_1_5_kits_flow_cell, CORRECT_SAMPLE_SHEET)
 
 
-@pytest.fixture
-def novaseq_6000_pre_1_5_kits_raw_lims_samples(novaseq_6000_pre_1_5_kits_flow_cell: Path) -> Path:
-    return Path(novaseq_6000_pre_1_5_kits_flow_cell, "HLYWYDSXX_raw.json")
-
-
 @pytest.fixture
 def novaseq_x_flow_cell_directory(tmp_flow_cells_directory: Path) -> Path:
     return Path(tmp_flow_cells_directory, "20231108_LH00188_0028_B22F52TLT3")
@@ -247,11 +235,6 @@ def novaseq_x_correct_sample_sheet(novaseq_x_flow_cell_directory: Path) -> Path:
     return Path(novaseq_x_flow_cell_directory, CORRECT_SAMPLE_SHEET)
 
 
-@pytest.fixture
-def novaseq_x_raw_lims_samples(novaseq_x_flow_cell_directory: Path) -> Path:
-    return Path(novaseq_x_flow_cell_directory, "22F52TLT3_raw.json")
-
-
 @pytest.fixture(scope="session")
 def novaseq_x_manifest_file(novaseq_x_flow_cell_dir: Path) -> Path:
     """Return the path to a NovaSeqX manifest file."""

tests/fixture_plugins/demultiplex_fixtures/sample_fixtures.py

@@ -9,78 +9,10 @@
 )
 from cg.apps.demultiplex.sample_sheet.sample_sheet_creator import SampleSheetCreatorBCLConvert
 from cg.constants import FileExtensions
-from cg.constants.constants import FileFormat
-from cg.io.controller import ReadFile
 from cg.io.json import read_json
 from cg.models.flow_cell.flow_cell import FlowCellDirectoryData
 
 
-@pytest.fixture
-def lims_novaseq_bcl_convert_samples(
-    lims_novaseq_samples_raw: list[dict],
-) -> list[FlowCellSampleBCLConvert]:
-    """Return a list of parsed flow cell samples demultiplexed with BCL convert."""
-    return [FlowCellSampleBCLConvert.model_validate(sample) for sample in lims_novaseq_samples_raw]
-
-
-@pytest.fixture
-def lims_novaseq_bcl2fastq_samples(
-    lims_novaseq_samples_raw: list[dict],
-) -> list[FlowCellSampleBcl2Fastq]:
-    """Return a list of parsed Bcl2fastq flow cell samples"""
-    return [FlowCellSampleBcl2Fastq.model_validate(sample) for sample in lims_novaseq_samples_raw]
-
-
-@pytest.fixture
-def lims_novaseq_6000_bcl2fastq_samples(
-    lims_novaseq_6000_sample_raw: list[dict],
-) -> list[FlowCellSampleBcl2Fastq]:
-    """Return a list of parsed Bcl2fastq flow cell samples"""
-    return [
-        FlowCellSampleBcl2Fastq.model_validate(sample) for sample in lims_novaseq_6000_sample_raw
-    ]
-
-
-@pytest.fixture
-def bcl_convert_sample_sheet_creator(
-    bcl_convert_flow_cell: FlowCellDirectoryData,
-    lims_novaseq_bcl_convert_samples: list[FlowCellSampleBCLConvert],
-) -> SampleSheetCreatorBCLConvert:
-    """Returns a sample sheet creator for version 2 sample sheets with dragen format."""
-    return SampleSheetCreatorBCLConvert(
-        flow_cell=bcl_convert_flow_cell,
-        lims_samples=lims_novaseq_bcl_convert_samples,
-    )
-
-
-@pytest.fixture
-def novaseq_6000_post_1_5_kits_lims_samples(
-    novaseq_6000_post_1_5_kits_raw_lims_samples: Path,
-) -> list[FlowCellSampleBCLConvert]:
-    return [
-        FlowCellSampleBCLConvert.model_validate(sample)
-        for sample in read_json(novaseq_6000_post_1_5_kits_raw_lims_samples)
-    ]
-
-
-@pytest.fixture
-def novaseq_6000_pre_1_5_kits_lims_samples(
-    novaseq_6000_pre_1_5_kits_raw_lims_samples: Path,
-) -> list[FlowCellSampleBCLConvert]:
-    return [
-        FlowCellSampleBCLConvert.model_validate(sample)
-        for sample in read_json(novaseq_6000_pre_1_5_kits_raw_lims_samples)
-    ]
-
-
-@pytest.fixture
-def novaseq_x_lims_samples(novaseq_x_raw_lims_samples: Path) -> list[FlowCellSampleBCLConvert]:
-    return [
-        FlowCellSampleBCLConvert.model_validate(sample)
-        for sample in read_json(novaseq_x_raw_lims_samples)
-    ]
-
-
 @pytest.fixture
 def hiseq_x_single_index_bcl_convert_lims_samples(
     hiseq_x_single_index_flow_cell_dir: Path,
@@ -120,16 +52,45 @@ def hiseq_2500_custom_index_bcl_convert_lims_samples(
 
 
 @pytest.fixture
-def lims_novaseq_samples_raw(lims_novaseq_samples_file: Path) -> list[dict]:
-    """Return a list of raw flow cell samples."""
-    return ReadFile.get_content_from_file(
-        file_format=FileFormat.JSON, file_path=lims_novaseq_samples_file
-    )
+def novaseq_6000_pre_1_5_kits_bcl2fastq_lims_samples(
+    novaseq_6000_pre_1_5_kits_flow_cell: Path,
+) -> list[FlowCellSampleBcl2Fastq]:
+    path = Path(novaseq_6000_pre_1_5_kits_flow_cell, "HLYWYDSXX_bcl2fastq_raw.json")
+    return [FlowCellSampleBcl2Fastq.model_validate(sample) for sample in read_json(path)]
+
+
+@pytest.fixture
+def novaseq_6000_pre_1_5_kits_bcl_convert_lims_samples(
+    novaseq_6000_pre_1_5_kits_flow_cell: Path,
+) -> list[FlowCellSampleBCLConvert]:
+    path = Path(novaseq_6000_pre_1_5_kits_flow_cell, "HLYWYDSXX_bcl_convert_raw.json")
+    return [FlowCellSampleBCLConvert.model_validate(sample) for sample in read_json(path)]
+
+
+@pytest.fixture
+def novaseq_6000_post_1_5_kits_bcl_convert_lims_samples(
+    novaseq_6000_post_1_5_kits_flow_cell: Path,
+) -> list[FlowCellSampleBCLConvert]:
+    path = Path(novaseq_6000_post_1_5_kits_flow_cell, "HK33MDRX3_bcl_convert_raw.json")
+    return [FlowCellSampleBCLConvert.model_validate(sample) for sample in read_json(path)]
+
+
+@pytest.fixture
+def novaseq_x_lims_samples(novaseq_x_flow_cell_directory: Path) -> list[FlowCellSampleBCLConvert]:
+    path = Path(novaseq_x_flow_cell_directory, "22F52TLT3_raw.json")
+    return [FlowCellSampleBCLConvert.model_validate(sample) for sample in read_json(path)]
+
+
+# Sample sheet creators
 
 
 @pytest.fixture
-def lims_novaseq_6000_sample_raw(lims_novaseq_6000_samples_file: Path) -> list[dict]:
-    """Return the list of raw samples from flow cell HVKJCDRXX."""
-    return ReadFile.get_content_from_file(
-        file_format=FileFormat.JSON, file_path=lims_novaseq_6000_samples_file
+def bcl_convert_sample_sheet_creator(
+    bcl_convert_flow_cell: FlowCellDirectoryData,
+    novaseq_x_lims_samples: list[FlowCellSampleBCLConvert],
+) -> SampleSheetCreatorBCLConvert:
+    """Returns a sample sheet creator for version 2 sample sheets with dragen format."""
+    return SampleSheetCreatorBCLConvert(
+        flow_cell=bcl_convert_flow_cell,
+        lims_samples=novaseq_x_lims_samples,
     )