fix metrics model creation

Author: couteau

redistricting/models/Plan.py

@@ -87,13 +87,13 @@ def __init__(self, plan: 'RdsPlan'):
     def __init__(self, cutEdges: Union[int, None] = None, splits: KeyedList[RdsSplits] = None):
         ...
 
-    def __init__(self, planOrCutEdges: Union[int, 'RdsPlan'] = None, splits: KeyedList[RdsSplits] = MISSING, parent: Optional[QObject] = None):
-        if isinstance(planOrCutEdges, RdsPlan):
+    def __init__(self, cutEdges: Union[int, 'RdsPlan'] = None, splits: KeyedList[RdsSplits] = MISSING, parent: Optional[QObject] = None):
+        if isinstance(cutEdges, RdsPlan):
             super().__init__(parent=parent)
-            self.plan = planOrCutEdges
+            self.plan = cutEdges
             self.updateGeoFields(self.plan.geoFields)
         else:
-            super().__init__(cutEdges=planOrCutEdges, splits=splits, parent=parent)
+            super().__init__(cutEdges=cutEdges, splits=splits, parent=parent)
 
     def __pre_init__(self):
         self.plan: 'RdsPlan' = None

redistricting/models/base/model.py

@@ -732,7 +732,7 @@ def __init__(self, *args, **kwargs):
         sig = inspect.signature(type(self).__init__)
 
         # remove any passed in missing params
-        args = (a for a in args if a is not MISSING)
+        args = tuple(a for a in args if a is not MISSING)
         kwargs = {k: v for k, v in kwargs.items() if v is not MISSING}
 
         bound_args = sig.bind(*args, **kwargs)

tests/unittests/models/test_stats.py

@@ -16,17 +16,26 @@
  *                                                                         *
  ***************************************************************************/
 """
+import pytest
 from pytest_mock import MockerFixture
 
+from redistricting.models.base.lists import KeyedList
 from redistricting.models.columns import MetricsColumns
 from redistricting.models.field import RdsGeoField
 from redistricting.models.plan import RdsMetrics
+from redistricting.models.splits import RdsSplits
 
 # pylint: disable=protected-access
 
 
 class TestPlanStats:
 
+    @pytest.fixture
+    def mock_splits(self, mocker: MockerFixture):
+        l = mocker.create_autospec(spec=KeyedList[RdsSplits])
+        l.__len__.return_value = 1
+        l.__getitem__.return_value = mocker.create_autospec(spec=RdsSplits)
+
     def test_create(self, mock_plan, mocker: MockerFixture):
         districts = type(mock_plan).districts
         districts.__getitem__.return_value = [0.5]
@@ -37,3 +46,7 @@ def test_create(self, mock_plan, mocker: MockerFixture):
         for f in MetricsColumns.CompactnessScores():
             assert getattr(stats, f) == 0.5
         assert len(stats.splits) == 1
+
+    def test_create_with_cutedges_and_splits(self, mock_splits):
+        stats = RdsMetrics(2013, mock_splits)
+        assert stats.cutEdges == 2013