Skip to content

Commit 51287c1

Browse files
committed
Making lint happier and renaming override test function
1 parent 7d3c11f commit 51287c1

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

Orange/widgets/visualize/tests/test_owscatterplot.py

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -139,17 +139,17 @@ def test_data_column_infs(self):
139139
attr_x = self.widget.controls.attr_x
140140
simulate.combobox_activate_item(attr_x, "b")
141141

142-
def test_regression_line(self):
142+
def test_regression_line_pair(self):
143143
"""It is possible to draw the line only for pair of continuous attrs"""
144144
self.send_signal(self.widget.Inputs.data, self.data)
145145
self.assertTrue(self.widget.cb_reg_line.isEnabled())
146-
self.assertIsNone(self.widget.graph.reg_line_item)
146+
self.assertListEqual([], self.widget.graph.reg_line_items)
147147
self.widget.cb_reg_line.setChecked(True)
148-
self.assertIsNotNone(self.widget.graph.reg_line_item)
148+
self.assertEqual(4, len(self.widget.graph.reg_line_items))
149149
self.widget.cb_attr_y.activated.emit(4)
150150
self.widget.cb_attr_y.setCurrentIndex(4)
151151
self.assertFalse(self.widget.cb_reg_line.isEnabled())
152-
self.assertIsNone(self.widget.graph.reg_line_item)
152+
self.assertListEqual([], self.widget.graph.reg_line_items)
153153

154154
def test_points_combo_boxes(self):
155155
"""Check Point box combo models and values"""
@@ -277,7 +277,7 @@ def test_points_selection(self):
277277
self.assertIsNone(selected_data)
278278

279279
def test_migrate_selection(self):
280-
settings = dict(selection=list(range(2)))
280+
settings = {"selection": list(range(2))}
281281
OWScatterPlot.migrate_settings(settings, 0)
282282
self.assertEqual(settings["selection_group"], [(0, 1), (1, 1)])
283283

@@ -371,7 +371,7 @@ def test_vizrank(self):
371371
vizrank = ScatterPlotVizRank(self.widget)
372372
n_states = len(data.domain.attributes)
373373
n_states = n_states * (n_states - 1) / 2
374-
states = [state for state in vizrank.iterate_states(None)]
374+
states = list(vizrank.iterate_states(None))
375375
self.assertEqual(len(states), n_states)
376376
self.assertEqual(len(set(states)), n_states)
377377
self.assertIsNotNone(vizrank.compute_score(states[0]))
@@ -381,8 +381,7 @@ def test_vizrank(self):
381381
data = Table("housing")[::10]
382382
self.send_signal(self.widget.Inputs.data, data)
383383
vizrank = ScatterPlotVizRank(self.widget)
384-
states = [state for state in vizrank.iterate_states(None)]
385-
self.assertIsNotNone(vizrank.compute_score(states[0]))
384+
self.assertIsNotNone(vizrank.compute_score(next(vizrank.iterate_states(None))))
386385

387386
def test_vizrank_class_nan(self):
388387
"""
@@ -646,29 +645,29 @@ def test_tooltip(self):
646645
widget.tooltip_shows_all = False
647646
self.assertTrue(graph.help_event(event))
648647
(_, text), _ = show_text.call_args
649-
self.assertIn("age = {}".format(data[42, "age"]), text)
650-
self.assertIn("gender = {}".format(data[42, "gender"]), text)
651-
self.assertNotIn("max HR = {}".format(data[42, "max HR"]), text)
648+
self.assertIn(f"age = {data[42, 'age']}", text)
649+
self.assertIn(f"gender = {data[42, 'gender']}", text)
650+
self.assertNotIn(f"max HR = {data[42, 'max HR']}", text)
652651
self.assertNotIn("others", text)
653652

654653
# Show all attributes
655654
widget.tooltip_shows_all = True
656655
self.assertTrue(graph.help_event(event))
657656
(_, text), _ = show_text.call_args
658-
self.assertIn("age = {}".format(data[42, "age"]), text)
659-
self.assertIn("gender = {}".format(data[42, "gender"]), text)
660-
self.assertIn("max HR = {}".format(data[42, "max HR"]), text)
657+
self.assertIn(f"age = {data[42, 'age']}", text)
658+
self.assertIn(f"gender = {data[42, 'gender']}", text)
659+
self.assertIn(f"max HR = {data[42, 'max HR']}", text)
661660
self.assertIn("... and 4 others", text)
662661

663662
# Two points hovered
664663
with patch.object(scatterplot_item, "pointsAt",
665664
return_value=[all_points[42], all_points[100]]):
666665
self.assertTrue(graph.help_event(event))
667666
(_, text), _ = show_text.call_args
668-
self.assertIn("age = {}".format(data[42, "age"]), text)
669-
self.assertIn("gender = {}".format(data[42, "gender"]), text)
670-
self.assertIn("age = {}".format(data[100, "age"]), text)
671-
self.assertIn("gender = {}".format(data[100, "gender"]), text)
667+
self.assertIn(f"age = {data[42, 'age']}", text)
668+
self.assertIn(f"gender = {data[42, 'gender']}", text)
669+
self.assertIn(f"age = {data[100, 'age']}", text)
670+
self.assertIn(f"gender = {data[100, 'gender']}", text)
672671

673672
# No points hovered
674673
with patch.object(scatterplot_item, "pointsAt",
@@ -694,10 +693,10 @@ def prepare_data():
694693
data.Y = np.array(values * 10, dtype=float)
695694
return data
696695

697-
def assert_equal(data, max):
696+
def assert_equal(data, max_):
698697
self.send_signal(self.widget.Inputs.data, data)
699-
pen_data, brush_data = self.widget.graph.get_colors()
700-
self.assertEqual(max, len(np.unique([id(p) for p in pen_data])), )
698+
pen_data, _ = self.widget.graph.get_colors()
699+
self.assertEqual(max_, len(np.unique([id(p) for p in pen_data])), )
701700

702701
assert_equal(prepare_data(), MAX_COLORS)
703702
# data with nan value

0 commit comments

Comments
 (0)