Move features data gen to fixture

dstansby · dstansby · commit 3e84f6cde10e · 2023-06-12T13:21:41.000+01:00
diff --git a/src/napari_matplotlib/tests/conftest.py b/src/napari_matplotlib/tests/conftest.py
@@ -26,6 +26,20 @@ def brain_data():
     return data.brain(), {"rgb": False}
 
 
+@pytest.fixture
+def points_with_features_data():
+    n_points = 100
+    np.random.seed(10)
+    points_data = 100 * np.random.random((100, 2))
+    points_features = {
+        "feature_0": np.random.random((n_points,)),
+        "feature_1": np.random.random((n_points,)),
+        "feature_2": np.random.random((n_points,)),
+    }
+
+    return points_data, {"features": points_features}
+
+
 @pytest.fixture(autouse=True, scope="session")
 def set_strict_qt():
     env_var = "NAPARI_STRICT_QT"
diff --git a/src/napari_matplotlib/tests/scatter/test_scatter_features.py b/src/napari_matplotlib/tests/scatter/test_scatter_features.py
@@ -9,29 +9,22 @@
 
 
 @pytest.mark.mpl_image_compare
-def test_features_scatter_widget_2D(make_napari_viewer):
+def test_features_scatter_widget_2D(
+    make_napari_viewer, points_with_features_data
+):
     viewer = make_napari_viewer()
     viewer.theme = "light"
     widget = FeaturesScatterWidget(viewer)
 
-    # make the points data
-    n_points = 100
-    np.random.seed(10)
-    points_data = 100 * np.random.random((100, 2))
-    points_features = {
-        "feature_0": np.random.random((n_points,)),
-        "feature_1": np.random.random((n_points,)),
-        "feature_2": np.random.random((n_points,)),
-    }
-
-    viewer.add_points(points_data, features=points_features)
+    viewer.add_points(
+        points_with_features_data[0], **points_with_features_data[1]
+    )
+    assert len(viewer.layers) == 1
     # De-select existing selection
     viewer.layers.selection.clear()
 
     # Select points data and chosen features
-    viewer.layers.selection.add(
-        viewer.layers["points_data"]
-    )  # images need to be selected
+    viewer.layers.selection.add(viewer.layers[0])  # images need to be selected
     widget.x_axis_key = "feature_0"
     widget.y_axis_key = "feature_1"
 
