Cleaned up test features scatter

ruaridhg · ruaridhg · commit 24b52d4eb8ee · 2023-06-01T14:18:23.000+01:00
diff --git a/src/napari_matplotlib/tests/test_scatter.py b/src/napari_matplotlib/tests/test_scatter.py
@@ -9,7 +9,6 @@
 from napari_matplotlib import FeaturesScatterWidget, ScatterWidget
 
 
-@pytest.mark.mpl_image_compare
 @pytest.mark.mpl_image_compare
 def test_scatter(make_napari_viewer, astronaut_data):
     viewer = make_napari_viewer()
@@ -32,22 +31,31 @@ def test_scatter(make_napari_viewer, astronaut_data):
 
 @pytest.mark.mpl_image_compare
 def test_features_scatter_widget(make_napari_viewer, astronaut_data):
-    # Smoke test adding a features scatter widget
     viewer = make_napari_viewer()
+    widget = FeaturesScatterWidget(viewer)
+    x_column = "feature_0"
+    widget.x_axis_key = x_column
+    y_column = "feature_1"
+    widget.y_axis_key = y_column
+    fig = widget.figure
+
     viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
+
     # make a test label image
     label_image = np.zeros((100, 100), dtype=np.uint16)
-
     label_image[10:20, 10:20] = 1
     label_image[50:70, 50:70] = 2
-
     label_image * -1
 
     feature_table_1 = regionprops_table(
         label_image, properties=("label", "area", "perimeter")
     )
     feature_table_1["index"] = feature_table_1["label"]
 
+    viewer.add_labels(
+        label_image, name="label+features", features=feature_table_1
+    )
+
     # make the points data
     n_points = 100
     points_data = 100 * np.random.random((100, 2))
@@ -57,30 +65,15 @@ def test_features_scatter_widget(make_napari_viewer, astronaut_data):
         "feature_2": np.random.random((n_points,)),
     }
 
-    viewer.add_labels(
-        label_image, name="label+features", features=feature_table_1
-    )
-    viewer.layers.selection.remove(viewer.layers["label+features"])
-    # viewer.add_labels(
-    #     label_image2, name="label+features", features=feature_table_1
-    # )
-    # pdb.set_trace()
     viewer.add_points(points_data, features=points_features)
-    viewer.layers.selection.remove(viewer.layers["points_data"])
-    # pdb.set_trace()
+
+    # De-select existing selection
+    viewer.layers.selection.clear()
     viewer.layers.selection.add(
         viewer.layers["points_data"]
     )  # images need to be selected
     viewer.layers.selection.add(viewer.layers["label+features"])
 
-    # pdb.set_trace()
-    scatter_widget = FeaturesScatterWidget(viewer)
-    x_column = "feature_0"
-    scatter_widget.x_axis_key = x_column
-    y_column = "feature_1"
-    scatter_widget.y_axis_key = y_column
-    fig = scatter_widget.figure
-
     return deepcopy(fig)
 
 
