Updated host + parasite axes picking tests.

smheidrich · smheidrich · commit 324e651b55f4 · 2017-12-09T02:11:07.000+01:00
diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -19,6 +19,8 @@
 
 import numpy as np
 
+import pytest
+
 
 @image_comparison(baseline_images=['divider_append_axes'])
 def test_divider_append_axes():
@@ -181,22 +183,29 @@ class TestPickingCallbacksOverlap(object):
     # In each case we expect that both rectangles are picked if we click on the
     # small one and only the big one is picked if we click on the big one.
     # Also tests picking on normal axes ("gca") as a control.
-    def setUp(self):
-        self.q = six.Queue()
+
+    @pytest.fixture(autouse=True)
+    def setup(self):
+        self.q = six.moves.queue.Queue()
         self.big = plt.Rectangle((0.25, 0.25), 0.5, 0.5, picker=5)
         self.small = plt.Rectangle((0.4, 0.4), 0.2, 0.2, facecolor="r",
             picker=5)
         plt.gcf().canvas.mpl_connect('pick_event', self.on_pick)
+
     def on_pick(self, event):
         self.q.put(event)
-    def test_picking_simple(self):
-        # Configurations here are of the form: ( big_on_axes, small_on_axes )
-        for rectangles_on_axes in [ ("gca", "gca"), ("host", "host"),
-            ("host", "parasite"), ("parasite", "host"),
-            ("parasite", "parasite") ]:
-            for click_on in [ "big", "small" ]:
-                yield self.run, rectangles_on_axes, click_on
-    def run(self, rectangles_on_axes, click_on):
+
+    @pytest.mark.parametrize("click_on", [ "big", "small" ])
+    @pytest.mark.parametrize("big_on_axes,small_on_axes", [
+        ("gca", "gca"),
+        ("host", "host"),
+        ("host", "parasite"),
+        ("parasite", "host"),
+        ("parasite", "parasite")
+    ])
+    def test_picking_simple(self, big_on_axes, small_on_axes, click_on):
+        # Shortcut
+        rectangles_on_axes = (big_on_axes, small_on_axes)
         # Axes setup
         axes = { "gca": None, "host": None, "parasite": None }
         if "gca" in rectangles_on_axes:
@@ -205,7 +214,6 @@ def run(self, rectangles_on_axes, click_on):
             axes["host"] = host_subplot(111)
             axes["parasite"] = axes["host"].twin()
         # Add rectangles to axes
-        (big_on_axes, small_on_axes) = rectangles_on_axes
         axes[big_on_axes].add_patch(self.big)
         axes[small_on_axes].add_patch(self.small)
         # Simulate picking with click mouse event
