TST: merge tests that share the same baseline image

Author: tacaswell

lib/matplotlib/tests/test_patches.py

@@ -825,8 +825,9 @@ def test_annulus():
     ax.set_aspect('equal')
 
 
+@pytest.mark.parametrize('mode', ('a', 'b'))
 @image_comparison(baseline_images=['annulus'], extensions=['png'])
-def test_annulus_setters():
+def test_annulus_setters(mode):
 
     fig, ax = plt.subplots()
     cir = Annulus((0., 0.), 0.2, 0.01, fc='g')   # circular annulus
@@ -837,36 +838,21 @@ def test_annulus_setters():
     ax.set_aspect('equal')
 
     cir.center = (0.5, 0.5)
-    cir.radii = 0.2
+    if mode == 'a':
+        cir.set_semimajor(0.2)
+        cir.set_semiminor(0.2)
+        assert cir.radii == (0.2, 0.2)
+    elif mode == 'b':
+        cir.radii = 0.2
     cir.width = 0.05
 
     ell.center = (0.5, 0.5)
-    ell.radii = (0.5, 0.3)
-    ell.width = 0.1
-    ell.angle = 45
-
-
-@image_comparison(baseline_images=['annulus'], extensions=['png'])
-def test_annulus_setters2():
-
-    fig, ax = plt.subplots()
-    cir = Annulus((0., 0.), 0.2, 0.01, fc='g')   # circular annulus
-    ell = Annulus((0., 0.), (1, 2), 0.1, 0,      # elliptical
-                  fc='m', ec='b', alpha=0.5, hatch='xxx')
-    ax.add_patch(cir)
-    ax.add_patch(ell)
-    ax.set_aspect('equal')
-
-    cir.center = (0.5, 0.5)
-    cir.set_semimajor(0.2)
-    cir.set_semiminor(0.2)
-    assert cir.radii == (0.2, 0.2)
-    cir.width = 0.05
-
-    ell.center = (0.5, 0.5)
-    ell.set_semimajor(0.5)
-    ell.set_semiminor(0.3)
-    assert ell.radii == (0.5, 0.3)
+    if mode == 'a':
+        ell.set_semimajor(0.5)
+        ell.set_semiminor(0.3)
+        assert ell.radii == (0.5, 0.3)
+    elif mode == 'b':
+        ell.radii = (0.5, 0.3)
     ell.width = 0.1
     ell.angle = 45