TrainingModel composes ExperimentsModel

src/allencell_ml_segmenter/_tests/fakes/fake_experiments_model.py

@@ -5,7 +5,7 @@
 from allencell_ml_segmenter.core.event import Event
 
 
-class FakeExperimentModel(IExperimentsModel):
+class FakeExperimentsModel(IExperimentsModel):
     def __init__(self):
         self._experiment_name = None
         self._checkpoint = None

src/allencell_ml_segmenter/_tests/services/test_training_service.py

@@ -12,6 +12,7 @@
 from allencell_ml_segmenter.training.training_model import (
     TrainingModel,
 )
+from allencell_ml_segmenter._tests.fakes.fake_experiments_model import FakeExperimentsModel
 
 
 @pytest.fixture
@@ -20,7 +21,7 @@ def training_service() -> TrainingService:
     Returns a TrainingService object with arbitrary-set fields in the model for testing.
     """
     experiments_model = ExperimentsModel(CytoDlConfig(Path(), Path()))
-    training_model: TrainingModel = TrainingModel(MainModel())
+    training_model: TrainingModel = TrainingModel(MainModel(), FakeExperimentsModel())
     training_model.set_experiment_type("segmentation")
     training_model.set_hardware_type("cpu")
     training_model.set_image_dims(2)

src/allencell_ml_segmenter/_tests/training/test_image_selection_widget.py

@@ -7,6 +7,7 @@
 from qtpy.QtCore import Qt
 from pytestqt.qtbot import QtBot
 from allencell_ml_segmenter.main.main_model import MainModel
+from allencell_ml_segmenter._tests.fakes.fake_experiments_model import FakeExperimentsModel
 
 from allencell_ml_segmenter.training.image_selection_widget import (
     ImageSelectionWidget,
@@ -22,7 +23,7 @@ def training_model() -> TrainingModel:
     """
     Fixture that creates an instance of TrainingModel for testing.
     """
-    return TrainingModel(MainModel())
+    return TrainingModel(MainModel(), FakeExperimentsModel())
 
 
 @pytest.fixture

src/allencell_ml_segmenter/_tests/training/test_model.py

@@ -1,5 +1,6 @@
 import pytest
 from pathlib import Path
+from allencell_ml_segmenter._tests.fakes.fake_experiments_model import FakeExperimentsModel
 from allencell_ml_segmenter.main.main_model import MainModel
 
 from allencell_ml_segmenter.training.training_model import (
@@ -15,7 +16,7 @@ def training_model() -> TrainingModel:
     """
     Returns a TrainingModel instance for testing.
     """
-    return TrainingModel(MainModel())
+    return TrainingModel(MainModel(), FakeExperimentsModel())
 
 
 def test_get_experiment_type(training_model: TrainingModel) -> None:

src/allencell_ml_segmenter/_tests/training/test_model_selection_widget.py

@@ -1,7 +1,7 @@
 import pytest
 from pytestqt.qtbot import QtBot
 from allencell_ml_segmenter._tests.fakes.fake_experiments_model import (
-    FakeExperimentModel,
+    FakeExperimentsModel,
 )
 from allencell_ml_segmenter.main.i_experiments_model import IExperimentsModel
 from allencell_ml_segmenter.main.main_model import MainModel
@@ -12,11 +12,12 @@
 from allencell_ml_segmenter.training.training_model import (
     TrainingModel,
 )
+from allencell_ml_segmenter._tests.fakes.fake_experiments_model import FakeExperimentsModel
 
 
 @pytest.fixture
 def experiment_model() -> IExperimentsModel:
-    return FakeExperimentModel()
+    return FakeExperimentsModel()
 
 
 @pytest.fixture
@@ -25,7 +26,7 @@ def training_model() -> TrainingModel:
     Fixture that creates an instance of TrainingModel for testing.
     """
     return TrainingModel(  # instead of this, how about i mock os.listdir ?
-        MainModel()
+        MainModel(), FakeExperimentsModel()
     )