fix test

Author: Dobson

tests/test_land.py

@@ -1493,7 +1493,6 @@ def test_apply_surface_overrides(tmp_path):
                     "surfaces": {
                         "Woodland": {
                             "surface": "Woodland",
-                            "type_": "GrowingSurface",
                             "area": 1000,
                             "ET_depletion_factor": 0.8,
                         }

tests/test_nodes.py

@@ -430,7 +430,7 @@ def test_data_overrides(self):
         )
         input_data = pd.read_csv(data_path)
 
-        overrides = {"data_input_dict": data_path}
+        overrides = {"filename": data_path}
         node = Node(name="")
         node.apply_overrides(overrides)
         node.t = list(node.data_input_dict.keys())[0][1]
@@ -440,7 +440,7 @@ def test_data_overrides(self):
             node.get_data_input("temperature"),
         )
         # test runtime error
-        self.assertRaises(RuntimeError, lambda: node.apply_overrides({}))
+        self.assertRaises(RuntimeError, lambda: node.apply_overrides({"filename": 123}))
 
 
 if __name__ == "__main__":

wsimod/nodes/land.py

@@ -183,11 +183,12 @@ def apply_overrides(self, overrides=Dict[str, Any]):
         self.surface_runoff.residence_time = self.surface_residence_time
         self.subsurface_runoff.residence_time = self.subsurface_residence_time
         self.percolation.residence_time = self.percolation_residence_time
-        super().apply_overrides(overrides)
 
-        for surface, override in overrides.get("surfaces", {}).items():
+        for surface, override in overrides.pop("surfaces", {}).items():
             self.get_surface(surface).apply_overrides(override)
 
+        super().apply_overrides(overrides)
+
     def apply_irrigation(self):
         """Iterate over any irrigation functions (needs further testing..
 

wsimod/nodes/nodes.py

@@ -90,7 +90,7 @@ def apply_overrides(self, overrides: Dict[str, Any] = {}) -> None:
         # overrides data_input_dict
         from wsimod.orchestration.model import read_csv
 
-        content = overrides.pop("data_input_dict", self.data_input_dict)
+        content = overrides.pop("filename", None)
         if isinstance(content, str):
             self.data_input_dict = read_csv(content)
         elif not content: