From 08c70254f537a2bf1e61490e4e33b4c8a5f8026a Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Fri, 2 Jun 2023 10:40:00 +0100
Subject: [PATCH] Put scatter and features scatter tests in different files

---
 .../tests/scatter/__init__.py                 |   0
 .../test_features_scatter_widget_2D.png       | Bin
 .../baseline/test_scatter_2D.png              | Bin
 .../tests/scatter/test_scatter.py             |  25 ++++++++++++++++++
 .../test_scatter_features.py}                 |  22 +--------------
 5 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 src/napari_matplotlib/tests/scatter/__init__.py
 rename src/napari_matplotlib/tests/{ => scatter}/baseline/test_features_scatter_widget_2D.png (100%)
 rename src/napari_matplotlib/tests/{ => scatter}/baseline/test_scatter_2D.png (100%)
 create mode 100644 src/napari_matplotlib/tests/scatter/test_scatter.py
 rename src/napari_matplotlib/tests/{test_scatter.py => scatter/test_scatter_features.py} (85%)

diff --git a/src/napari_matplotlib/tests/scatter/__init__.py b/src/napari_matplotlib/tests/scatter/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/napari_matplotlib/tests/baseline/test_features_scatter_widget_2D.png b/src/napari_matplotlib/tests/scatter/baseline/test_features_scatter_widget_2D.png
similarity index 100%
rename from src/napari_matplotlib/tests/baseline/test_features_scatter_widget_2D.png
rename to src/napari_matplotlib/tests/scatter/baseline/test_features_scatter_widget_2D.png
diff --git a/src/napari_matplotlib/tests/baseline/test_scatter_2D.png b/src/napari_matplotlib/tests/scatter/baseline/test_scatter_2D.png
similarity index 100%
rename from src/napari_matplotlib/tests/baseline/test_scatter_2D.png
rename to src/napari_matplotlib/tests/scatter/baseline/test_scatter_2D.png
diff --git a/src/napari_matplotlib/tests/scatter/test_scatter.py b/src/napari_matplotlib/tests/scatter/test_scatter.py
new file mode 100644
index 00000000..05b7856b
--- /dev/null
+++ b/src/napari_matplotlib/tests/scatter/test_scatter.py
@@ -0,0 +1,25 @@
+from copy import deepcopy
+
+import pytest
+
+from napari_matplotlib import ScatterWidget
+
+
+@pytest.mark.mpl_image_compare
+def test_scatter_2D(make_napari_viewer, astronaut_data):
+    viewer = make_napari_viewer()
+    widget = ScatterWidget(viewer)
+    fig = widget.figure
+
+    viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
+
+    viewer.add_image(
+        astronaut_data[0] * -1, **astronaut_data[1], name="astronaut_reversed"
+    )
+    # De-select existing selection
+    viewer.layers.selection.clear()
+
+    # Select images
+    viewer.layers.selection.add(viewer.layers[0])
+    viewer.layers.selection.add(viewer.layers[1])
+    return deepcopy(fig)
diff --git a/src/napari_matplotlib/tests/test_scatter.py b/src/napari_matplotlib/tests/scatter/test_scatter_features.py
similarity index 85%
rename from src/napari_matplotlib/tests/test_scatter.py
rename to src/napari_matplotlib/tests/scatter/test_scatter_features.py
index bee03591..8284a1e8 100644
--- a/src/napari_matplotlib/tests/test_scatter.py
+++ b/src/napari_matplotlib/tests/scatter/test_scatter_features.py
@@ -5,27 +5,7 @@
 import numpy.typing as npt
 import pytest
 
-from napari_matplotlib import FeaturesScatterWidget, ScatterWidget
-
-
-@pytest.mark.mpl_image_compare
-def test_scatter_2D(make_napari_viewer, astronaut_data):
-    viewer = make_napari_viewer()
-    widget = ScatterWidget(viewer)
-    fig = widget.figure
-
-    viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
-
-    viewer.add_image(
-        astronaut_data[0] * -1, **astronaut_data[1], name="astronaut_reversed"
-    )
-    # De-select existing selection
-    viewer.layers.selection.clear()
-
-    # Select images
-    viewer.layers.selection.add(viewer.layers[0])
-    viewer.layers.selection.add(viewer.layers[1])
-    return deepcopy(fig)
+from napari_matplotlib import FeaturesScatterWidget
 
 
 @pytest.mark.mpl_image_compare