Skip to content

Commit 2895e82

Browse files
committed
Rename helper method to be more explicit
1 parent 3957d56 commit 2895e82

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/astro_image_display_api/widget_api_test.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class variable does the trick.
4949
"""
5050
self.image = self.image_widget_class(image_width=250, image_height=100)
5151

52-
def _check_marker_table_return_properties(self, table):
52+
def _check_empty_marker_table_return_properties(self, table):
5353
assert isinstance(table, Table)
5454
assert len(table) == 0
5555
assert sorted(table.colnames) == sorted(['x', 'y', 'coord', 'marker name'])
@@ -119,7 +119,7 @@ def test_zoom(self):
119119

120120
def test_marking_operations(self):
121121
marks = self.image.get_markers(marker_name="all")
122-
self._check_marker_table_return_properties(marks)
122+
self._check_empty_marker_table_return_properties(marks)
123123
assert not self.image.is_marking
124124

125125
# Ensure you cannot set it like this.
@@ -160,7 +160,7 @@ def test_marking_operations(self):
160160
warnings.simplefilter("error")
161161
t = self.image.get_markers(marker_name='markymark')
162162

163-
self._check_marker_table_return_properties(t)
163+
self._check_empty_marker_table_return_properties(t)
164164

165165
self.image.click_drag = True
166166
self.image.start_marking()
@@ -177,7 +177,7 @@ def test_marking_operations(self):
177177
self.image.stop_marking(clear_markers=True)
178178

179179
assert self.image.is_marking is False
180-
self._check_marker_table_return_properties(self.image.get_markers(marker_name="all"))
180+
self._check_empty_marker_table_return_properties(self.image.get_markers(marker_name="all"))
181181

182182
# Hate this, should add to public API
183183
marknames = self.image._marktags
@@ -250,15 +250,15 @@ def test_add_markers(self):
250250
self.image.reset_markers()
251251
marknames = self.image._marktags
252252
assert len(marknames) == 0
253-
self._check_marker_table_return_properties(self.image.get_markers(marker_name="all"))
253+
self._check_empty_marker_table_return_properties(self.image.get_markers(marker_name="all"))
254254
# Check that no markers remain after clearing
255-
tab = self.image.get_markers(marker_name=self.image._default_mark_tag_name)
256-
self._check_marker_table_return_properties(tab)
255+
tab = self.image.get_markers(marker_name=self.image.DEFAULT_MARKER_NAME)
256+
self._check_empty_marker_table_return_properties(tab)
257257

258258
# Check that retrieving a marker set that doesn't exist returns
259259
# an empty table with the right columns
260260
tab = self.image.get_markers(marker_name='test1')
261-
self._check_marker_table_return_properties(tab)
261+
self._check_empty_marker_table_return_properties(tab)
262262

263263
def test_get_markers_accepts_list_of_names(self):
264264
# Check that the get_markers method accepts a list of marker names
@@ -288,7 +288,7 @@ def test_remove_markers_name_all(self):
288288
self.image.add_markers(tab, marker_name='test2')
289289

290290
self.image.remove_markers(marker_name='all')
291-
self._check_marker_table_return_properties(self.image.get_markers(marker_name='all'))
291+
self._check_empty_marker_table_return_properties(self.image.get_markers(marker_name='all'))
292292

293293
def test_remove_marker_accepts_list(self):
294294
data = np.arange(10).reshape(5, 2)
@@ -298,7 +298,7 @@ def test_remove_marker_accepts_list(self):
298298

299299
self.image.remove_markers(marker_name=['test1', 'test2'])
300300
marks = self.image.get_markers(marker_name='all')
301-
self._check_marker_table_return_properties(marks)
301+
self._check_empty_marker_table_return_properties(marks)
302302

303303
def test_adding_markers_as_world(self, data, wcs):
304304
ndd = NDData(data=data, wcs=wcs)

0 commit comments

Comments
 (0)