Skip to content

Commit e481734

Browse files
authored
Merge pull request matplotlib#150 from dstansby/separate-scatter-tests
Put scatter and features scatter tests in different files
2 parents 76dd23b + 08c7025 commit e481734

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

src/napari_matplotlib/tests/scatter/__init__.py

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from copy import deepcopy
2+
3+
import pytest
4+
5+
from napari_matplotlib import ScatterWidget
6+
7+
8+
@pytest.mark.mpl_image_compare
9+
def test_scatter_2D(make_napari_viewer, astronaut_data):
10+
viewer = make_napari_viewer()
11+
widget = ScatterWidget(viewer)
12+
fig = widget.figure
13+
14+
viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
15+
16+
viewer.add_image(
17+
astronaut_data[0] * -1, **astronaut_data[1], name="astronaut_reversed"
18+
)
19+
# De-select existing selection
20+
viewer.layers.selection.clear()
21+
22+
# Select images
23+
viewer.layers.selection.add(viewer.layers[0])
24+
viewer.layers.selection.add(viewer.layers[1])
25+
return deepcopy(fig)

src/napari_matplotlib/tests/test_scatter.py renamed to src/napari_matplotlib/tests/scatter/test_scatter_features.py

+1-21
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,7 @@
55
import numpy.typing as npt
66
import pytest
77

8-
from napari_matplotlib import FeaturesScatterWidget, ScatterWidget
9-
10-
11-
@pytest.mark.mpl_image_compare
12-
def test_scatter_2D(make_napari_viewer, astronaut_data):
13-
viewer = make_napari_viewer()
14-
widget = ScatterWidget(viewer)
15-
fig = widget.figure
16-
17-
viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
18-
19-
viewer.add_image(
20-
astronaut_data[0] * -1, **astronaut_data[1], name="astronaut_reversed"
21-
)
22-
# De-select existing selection
23-
viewer.layers.selection.clear()
24-
25-
# Select images
26-
viewer.layers.selection.add(viewer.layers[0])
27-
viewer.layers.selection.add(viewer.layers[1])
28-
return deepcopy(fig)
8+
from napari_matplotlib import FeaturesScatterWidget
299

3010

3111
@pytest.mark.mpl_image_compare

0 commit comments

Comments
 (0)