tidy up old code

tests/node_tests/crop_resize.py

@@ -1,5 +1,6 @@
 import numpy as np
 from backend.data_types import DataField
+from backend.execution_context import execution_callbacks, active_node
 
 
 def test_crop_resize_field():
@@ -19,42 +20,38 @@ def test_crop_resize_field():
     )
 
     overlays = []
-    CropResizeField._broadcast_overlay_fn = lambda nid, data: overlays.append(data)
-    CropResizeField._current_node_id = "test"
+    with execution_callbacks(overlay=lambda nid, data: overlays.append(data)), active_node("test"):
+        cropped, = node.process(field, x1=0.25, y1=0.25, x2=0.75, y2=1.0, target_width=0, target_height=0, interpolation="bilinear")
+        assert cropped.data.shape == (3, 4)
+        assert np.array_equal(cropped.data, data[1:4, 2:6])
+        assert cropped.xreal == 4.0
+        assert cropped.yreal == 3.0
+        assert cropped.xoff == 12.0
+        assert cropped.yoff == 21.0
+        assert cropped.si_unit_xy == field.si_unit_xy
+        assert cropped.si_unit_z == field.si_unit_z
+        assert cropped.overlays == []
+        assert len(overlays) == 1
+        assert overlays[0]["kind"] == "crop_box"
+        assert overlays[0]["image"].startswith("data:image/png;base64,")
+        assert overlays[0]["a_locked"] is False
+        assert overlays[0]["b_locked"] is False
 
-    cropped, = node.process(field, x1=0.25, y1=0.25, x2=0.75, y2=1.0, target_width=0, target_height=0, interpolation="bilinear")
-    assert cropped.data.shape == (3, 4)
-    assert np.array_equal(cropped.data, data[1:4, 2:6])
-    assert cropped.xreal == 4.0
-    assert cropped.yreal == 3.0
-    assert cropped.xoff == 12.0
-    assert cropped.yoff == 21.0
-    assert cropped.si_unit_xy == field.si_unit_xy
-    assert cropped.si_unit_z == field.si_unit_z
-    assert cropped.overlays == []
-    assert len(overlays) == 1
-    assert overlays[0]["kind"] == "crop_box"
-    assert overlays[0]["image"].startswith("data:image/png;base64,")
-    assert overlays[0]["a_locked"] is False
-    assert overlays[0]["b_locked"] is False
+        resized, = node.process(field, x1=0.0, y1=0.0, x2=1.0, y2=1.0, target_width=8, target_height=0, interpolation="bilinear", corner_a=(0.25, 0.25), corner_b=(0.75, 1.0))
+        assert resized.data.shape == (6, 8)
+        assert resized.xreal == cropped.xreal
+        assert resized.yreal == cropped.yreal
+        assert resized.xoff == cropped.xoff
+        assert resized.yoff == cropped.yoff
+        assert resized.domain == field.domain
+        assert overlays[-1]["a_locked"] is True
+        assert overlays[-1]["b_locked"] is True
 
-    resized, = node.process(field, x1=0.0, y1=0.0, x2=1.0, y2=1.0, target_width=8, target_height=0, interpolation="bilinear", corner_a=(0.25, 0.25), corner_b=(0.75, 1.0))
-    assert resized.data.shape == (6, 8)
-    assert resized.xreal == cropped.xreal
-    assert resized.yreal == cropped.yreal
-    assert resized.xoff == cropped.xoff
-    assert resized.yoff == cropped.yoff
-    assert resized.domain == field.domain
-    assert overlays[-1]["a_locked"] is True
-    assert overlays[-1]["b_locked"] is True
+        reversed_crop, = node.process(field, x1=0.75, y1=1.0, x2=0.25, y2=0.25, target_width=0, target_height=0, interpolation="nearest")
+        assert np.array_equal(reversed_crop.data, cropped.data)
 
-    reversed_crop, = node.process(field, x1=0.75, y1=1.0, x2=0.25, y2=0.25, target_width=0, target_height=0, interpolation="nearest")
-    assert np.array_equal(reversed_crop.data, cropped.data)
-
-    try:
-        node.process(field, x1=0.9, y1=0.0, x2=0.9, y2=1.0, target_width=0, target_height=0, interpolation="nearest")
-        raise AssertionError("Expected invalid crop bounds to raise ValueError")
-    except ValueError:
-        pass
-
-    CropResizeField._broadcast_overlay_fn = None
+        try:
+            node.process(field, x1=0.9, y1=0.0, x2=0.9, y2=1.0, target_width=0, target_height=0, interpolation="nearest")
+            raise AssertionError("Expected invalid crop bounds to raise ValueError")
+        except ValueError:
+            pass