Added color semantics test and modified vectorized parameters test

Edited expected facecolors for step

Changed blue to C0

Author: Impaler343

lib/matplotlib/tests/test_axes.py

@@ -4603,56 +4603,62 @@ def test_hist_stacked_bar():
     ax.legend(loc='upper right', bbox_to_anchor=(1.0, 1.0), ncols=1)
 
 
+@pytest.mark.parametrize('kwargs', ({'facecolor': ["b", "g", "r"]},
+                                    {'edgecolor': ["b", "g", "r"]},
+                                    {'hatch': ["/", "\\", "."]},
+                                    {'linestyle': ["-", "--", ":"]},
+                                    {'linewidth': [1, 1.5, 2]},
+                                    {'color': ["b", "g", "r"]}))
 @check_figures_equal(extensions=["png"])
-def test_hist_vectorized_params(fig_test, fig_ref):
+def test_hist_vectorized_params(fig_test, fig_ref, kwargs):
     np.random.seed(19680801)
     x = [np.random.randn(n) for n in [2000, 5000, 10000]]
 
-    facecolor = ["b", "g", "r"]
-    edgecolor = ["b", "g", "r"]
-    hatch = ["/", "\\", "."]
-    linestyle = ["-", "--", ":"]
-    linewidth = [1, 1.5, 2]
-    colors = ["b", "g", "r"]
-    ((axt1, axt2, axt3), (axt4, axt5, axt6)) = fig_test.subplots(2, 3)
-    ((axr1, axr2, axr3), (axr4, axr5, axr6)) = fig_ref.subplots(2, 3)
-
-    _, bins, _ = axt1.hist(x, bins=10, histtype="stepfilled", facecolor=facecolor)
-
-    for i, (xi, fc) in enumerate(zip(x, facecolor)):
-        axr1.hist(xi, bins=bins, histtype="stepfilled", facecolor=fc,
-                  zorder=(len(x)-i)/2)
-
-    _, bins, _ = axt2.hist(x, bins=10, histtype="step", edgecolor=edgecolor)
-
-    for i, (xi, ec) in enumerate(zip(x, edgecolor)):
-        axr2.hist(xi, bins=bins, histtype="step", edgecolor=ec, zorder=(len(x)-i)/2)
-
-    _, bins, _ = axt3.hist(x, bins=10, histtype="stepfilled", hatch=hatch,
-                            facecolor=facecolor)
-
-    for i, (xi, fc, ht) in enumerate(zip(x, facecolor, hatch)):
-        axr3.hist(xi, bins=bins, histtype="stepfilled", hatch=ht, facecolor=fc,
-                  zorder=(len(x)-i)/2)
-
-    _, bins, _ = axt4.hist(x, bins=10, histtype="step", linestyle=linestyle,
-                           edgecolor=edgecolor)
-
-    for i, (xi, ec, ls) in enumerate(zip(x, edgecolor, linestyle)):
-        axr4.hist(xi, bins=bins, histtype="step", linestyle=ls, edgecolor=ec,
-                  zorder=(len(x)-i)/2)
-
-    _, bins, _ = axt5.hist(x, bins=10, histtype="step", linewidth=linewidth,
-                           edgecolor=edgecolor)
-
-    for i, (xi, ec, lw) in enumerate(zip(x, edgecolor, linewidth)):
-        axr5.hist(xi, bins=bins, histtype="step", linewidth=lw, edgecolor=ec,
-                  zorder=(len(x)-i)/2)
-
-    _, bins, _ = axt6.hist(x, bins=10, histtype="stepfilled", color=colors)
-
-    for i, (xi, c) in enumerate(zip(x, colors)):
-        axr6.hist(xi, bins=bins, histtype="stepfilled", color=c, zorder=(len(x)-i)/2)
+    (axt1, axt2) = fig_test.subplots(2)
+    (axr1, axr2) = fig_ref.subplots(2)
+
+    for histtype, axt, axr in [("stepfilled", axt1, axr1), ("step", axt2, axr2)]:
+        _, bins, _ = axt.hist(x, bins=10, histtype=histtype, **kwargs)
+
+        kw, values = next(iter(kwargs.items()))
+        for i, (xi, value) in enumerate(zip(x, values)):
+            axr.hist(xi, bins=bins, histtype=histtype, **{kw: value},
+                     zorder=(len(x)-i)/2)
+
+
+@pytest.mark.parametrize('kwargs, patch_face, patch_edge',
+                         [({'histtype': 'stepfilled', 'color': 'r',
+                            'facecolor': 'y', 'edgecolor': 'g'}, 'y', 'g'),
+                          ({'histtype': 'step', 'color': 'r',
+                            'facecolor': 'y', 'edgecolor': 'g'}, ('y', 0), 'g'),
+                          ({'histtype': 'stepfilled', 'color': 'r',
+                            'edgecolor': 'g'}, 'r', 'g'),
+                          ({'histtype': 'step', 'color': 'r',
+                            'edgecolor': 'g'}, ('r', 0), 'g'),
+                          ({'histtype': 'stepfilled', 'color': 'r',
+                            'facecolor': 'y'}, 'y', 'k'),
+                          ({'histtype': 'step', 'color': 'r',
+                            'facecolor': 'y'}, ('y', 0), 'r'),
+                          ({'histtype': 'stepfilled',
+                            'facecolor': 'y', 'edgecolor': 'g'}, 'y', 'g'),
+                          ({'histtype': 'step', 'facecolor': 'y',
+                            'edgecolor': 'g'}, ('y', 0), 'g'),
+                          ({'histtype': 'stepfilled', 'color': 'r'}, 'r', 'k'),
+                          ({'histtype': 'step', 'color': 'r'}, ('r', 0), 'r'),
+                          ({'histtype': 'stepfilled', 'facecolor': 'y'}, 'y', 'k'),
+                          ({'histtype': 'step', 'facecolor': 'y'}, ('y', 0), 'C0'),
+                          ({'histtype': 'stepfilled', 'edgecolor': 'g'}, 'C0', 'g'),
+                          ({'histtype': 'step', 'edgecolor': 'g'}, ('C0', 0), 'g'),
+                          ({'histtype': 'stepfilled'}, 'C0', 'k'),
+                          ({'histtype': 'step'}, ('C0', 0), 'C0')])
+def test_hist_color_semantics(kwargs, patch_face, patch_edge):
+    _, _, patches = plt.figure().subplots().hist([1, 2, 3], **kwargs)
+    # 'C0'(blue) stands for the first color of the default color cycle
+    # as well as the patch.facecolor rcParam
+    # When the expected edgecolor is 'k'(black), it corresponds to the
+    # patch.edgecolor rcParam
+    assert all(mcolors.same_color([p.get_facecolor(), p.get_edgecolor()],
+                                  [patch_face, patch_edge]) for p in patches)
 
 
 def test_hist_barstacked_bottom_unchanged():