matplotlib
diff --git a/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dpi_cor_100dpi.png
5.19 KB b/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dpi_cor_100dpi.png
5.19 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dpi_cor_200dpi.png
11.2 KB b/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dpi_cor_200dpi.png
11.2 KB
diff --git a/‎lib/matplotlib/tests/test_arrow_patches.py
Lines changed: 28 additions & 31 deletions b/‎lib/matplotlib/tests/test_arrow_patches.py
Lines changed: 28 additions & 31 deletions
@@ -5,7 +5,7 @@
 
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
-import matplotlib
+import matplotlib.patches as mpatches # adopting scipy import conventions
 
 
 def draw_arrow(ax, t, r):
@@ -18,7 +18,7 @@ def draw_arrow(ax, t, r):
 def test_fancyarrow():
     # Added 0 to test division by zero error described in issue 3930
     r = [0.4, 0.3, 0.2, 0.1, 0]
-    t = ["fancy", "simple", matplotlib.patches.ArrowStyle.Fancy()]
+    t = ["fancy", "simple", mpatches.ArrowStyle.Fancy()]
 
     fig, axes = plt.subplots(len(t), len(r), squeeze=False,
                              subplot_kw=dict(aspect=True),
@@ -34,7 +34,7 @@ def test_fancyarrow():
 @image_comparison(baseline_images=['boxarrow_test_image'], extensions=['png'])
 def test_boxarrow():
 
-    styles = matplotlib.patches.BoxStyle.get_styles()
+    styles = mpatches.BoxStyle.get_styles()
 
     n = len(styles)
     spacing = 1.2
@@ -52,52 +52,49 @@ def test_boxarrow():
                   bbox=dict(boxstyle=stylename, fc="w", ec="k"))
 
 
-def prepare_fancyarrow_for_head_size_test():
+def prepare_fancyarrow_dpi_cor_test():
     """
     Convenience function that prepares and return a FancyArrowPatch. It aims
     at being used to test that the size of the arrow head does not depend on
-    the DPI value of the exported picture. 
+    the DPI value of the exported picture.
 
     NB: this function *is not* a test in itself!
     """
-    fig = plt.figure(figsize=(6, 4), dpi=50)
-    ax = fig.add_subplot(111)
+    fig2 = plt.figure("fancyarrow_dpi_cor_test", figsize=(4, 3), dpi=50)
+    ax = fig2.add_subplot(111)
     ax.set_xlim([0, 1])
     ax.set_ylim([0, 1])
     ax.add_patch(mpatches.FancyArrowPatch(posA=(0.3, 0.4), posB=(0.8, 0.6),
-                                          lw=3, arrowstyle=u'->', 
-                                          mutation_scale=150))    
-    return fig
+                                          lw=3, arrowstyle=u'->',
+                                          mutation_scale=100))
+    return fig2
 
 
-@image_comparison(baseline_images=['fancyarrow_head_size_100dpi'], 
-                  remove_text=True, extensions=['svg', 'pdf', 'png'], 
-                  savefig_kwarg=dict(dpi=100))    
-def test_fancy_arrow_patch_head_size_100dpi():
+@image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'],
+                  remove_text=True, extensions=['png'],
+                  savefig_kwarg=dict(dpi=100))
+def test_fancyarrow_dpi_cor_100dpi():
     """
-    Check the export of a FancyArrowPatch @ 100 DPI. The FancyArrowPatch 
-    is instanciated through a dedicated function because another similar test
-    checks the same export but with a different DPI value.
+    Check the export of a FancyArrowPatch @ 100 DPI. FancyArrowPatch is
+    instanciated through a dedicated function because another similar test
+    checks a similar export but with a different DPI value.
 
-    Remark: may be more explicit to create a dedicated test for SVG and PDF,
-    as a DPI value is not very relevant here...
+    Remark: test only a rasterized format.
     """
-    
-    prepare_fancyarrow_for_head_size_test()
 
+    prepare_fancyarrow_dpi_cor_test()
 
-@image_comparison(baseline_images=['fancyarrow_head_size_300dpi'], 
-                  remove_text=True, 
-                  extensions=['png'], # pdf and svg already tested @ 100 DPI
-                  savefig_kwarg=dict(dpi=300))    
-def test_fancy_arrow_patch_head_size_300dpi():
+
+@image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'],
+                  remove_text=True, extensions=['png'],
+                  savefig_kwarg=dict(dpi=200))
+def test_fancyarrow_dpi_cor_200dpi():
     """
-    Check the export of a FancyArrowPatch @ 300 DPI. The FancyArrowPatch 
-    is instanciated through a dedicated function because another similar test
-    checks the same export but with a different DPI value.
+    As test_fancyarrow_dpi_cor_100dpi, but exports @ 200 DPI. The relative size
+    of the arrow head should be the same.
     """
-    
-    prepare_fancyarrow_for_head_size_test()
+
+    prepare_fancyarrow_dpi_cor_test()
 
 
 if __name__ == '__main__':