matplotlib
diff --git a/‎lib/matplotlib/axes/_axes.py
Lines changed: 4 additions & 3 deletions b/‎lib/matplotlib/axes/_axes.py
Lines changed: 4 additions & 3 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist_vectorized_params_bar.png
-20.1 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/hist_vectorized_params_bar.png
-20.1 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/hist_vectorized_params_step.png
-20.7 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/hist_vectorized_params_step.png
-20.7 KB
diff --git a/‎lib/matplotlib/tests/test_axes.py
Lines changed: 25 additions & 20 deletions b/‎lib/matplotlib/tests/test_axes.py
Lines changed: 25 additions & 20 deletions
@@ -7214,11 +7214,12 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
         # cast each element to str, but keep a single str as it.
         labels = [] if label is None else np.atleast_1d(np.asarray(label, str))
 
-        if histtype.startswith('bar') or histtype == 'stepfilled':
-            edgecolors = itertools.cycle(np.atleast_1d(kwargs.get('edgecolor', None)))
-        else:
+        if histtype == "step":
             edgecolors = itertools.cycle(np.atleast_1d(kwargs.get('edgecolor',
                                                                   colors)))
+        else:
+            edgecolors = itertools.cycle(np.atleast_1d(kwargs.get("edgecolor", None)))
+
         facecolors = itertools.cycle(np.atleast_1d(kwargs.get('facecolor', colors)))
         hatches = itertools.cycle(np.atleast_1d(kwargs.get('hatch', None)))
         linewidths = itertools.cycle(np.atleast_1d(kwargs.get('linewidth', None)))
 
@@ -4603,29 +4603,34 @@ def test_hist_stacked_bar():
     ax.legend(loc='upper right', bbox_to_anchor=(1.0, 1.0), ncols=1)
 
 
-@image_comparison(['hist_vectorized_params_bar', 'hist_vectorized_params_step'],
-                   extensions=["png"], remove_text=True)
-def test_hist_vectorized_params():
+@pytest.mark.parametrize("histtype", ["step", "stepfilled"])
+@pytest.mark.parametrize("color", [["blue", "green", "brown"], [None]*3])
+@pytest.mark.parametrize("edgecolor", [["red", "black", "blue"], [None]*3])
+@pytest.mark.parametrize("facecolor", [["blue", "green", "brown"], [None]*3])
+@pytest.mark.parametrize("linewidth", [[1, 1.5, 2], [None]*3])
+@pytest.mark.parametrize("hatch", [["/", "\\", "."], [None]*3])
+@pytest.mark.parametrize("linestyle", [["-", "--", ":"], [None]*3])
+@check_figures_equal(extensions=["png"])
+def test_hist_vectorized_params(fig_test, fig_ref, histtype, color, edgecolor,
+                                facecolor, linewidth, hatch, linestyle):
     np.random.seed(19680801)
     x = [np.random.randn(n) for n in [2000, 5000, 10000]]
 
-    for histtype in ['bar', 'step']:
-        fig, axs = plt.subplots(2, 3, figsize=(8, 6))
-        fig.delaxes(axs[1, 1])
-        ax1, ax2, ax3, ax4, _, ax6 = axs.flatten()
-
-        # Only linestyle
-        ax1.hist(x, bins=10, histtype=histtype, linestyle=["-", "--", ":"])
-        # Only edgecolor
-        ax2.hist(x, bins=10, histtype=histtype,
-                 edgecolor=["red", "black", "blue"])
-        # Only facecolor
-        ax3.hist(x, bins=10, histtype=histtype,
-                 facecolor=["blue", "yellow", "brown"])
-        # Only linewidth
-        ax4.hist(x, bins=10, histtype=histtype, linewidth=[1, 1.5, 2])
-        # Only hatch
-        ax6.hist(x, bins=10, histtype=histtype, hatch=["/", "\\", "."])
+    facecolor = facecolor if facecolor[0] is not None else color
+    if histtype == "step":
+        edgecolor = edgecolor if edgecolor[0] is not None else color
+
+    _, bins, _ = fig_test.subplots().hist(x, bins=10, histtype=histtype, color=color,
+                                          edgecolor=edgecolor, facecolor=facecolor,
+                                          linewidth=linewidth, hatch=hatch,
+                                          linestyle=linestyle)
+    ref_ax = fig_ref.subplots()
+
+    for xi, c, ec, fc, lw, hs, ls in zip(x, color[::-1], edgecolor[::-1],
+                                         facecolor[::-1], linewidth[::-1],
+                                         hatch[::-1], linestyle[::-1]):
+        ref_ax.hist(xi, bins=bins, histtype=histtype, color=c, edgecolor=ec,
+                    facecolor=fc, linewidth=lw, hatch=hs, linestyle=ls)
 
 
 def test_hist_barstacked_bottom_unchanged():