Skip to content

Commit fb2f393

Browse files
committed
TST : more testing on legend.{face,edge}color
1 parent 31313c6 commit fb2f393

File tree

1 file changed

+35
-9
lines changed

1 file changed

+35
-9
lines changed

lib/matplotlib/tests/test_rcparams.py

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import matplotlib.pyplot as plt
1313
from matplotlib.tests import assert_str_equal
1414
from matplotlib.testing.decorators import cleanup, knownfailureif
15+
import matplotlib.colors as mcolors
1516
from nose.tools import assert_true, assert_raises, assert_equal
1617
from nose.plugins.skip import SkipTest
1718
import nose
@@ -183,21 +184,46 @@ def test_Bug_2543_newer_python():
183184

184185

185186
@cleanup
186-
def test_legend_facecolor():
187-
with mpl.rc_context({'legend.facecolor': 'r'}):
187+
def _legend_rcparam_helper(param_dict, target, get_func):
188+
with mpl.rc_context(param_dict):
188189
_, ax = plt.subplots()
189190
ax.plot(range(3), label='test')
190191
leg = ax.legend()
191-
assert_equal(leg.legendPatch.get_facecolor(), (1, 0, 0, 1))
192+
assert_equal(getattr(leg.legendPatch, get_func)(), target)
193+
194+
195+
def test_legend_facecolor():
196+
get_func = 'get_facecolor'
197+
rcparam = 'legend.facecolor'
198+
test_values = [({rcparam: 'r'},
199+
mcolors.colorConverter.to_rgba('r')),
200+
({rcparam: 'inherit',
201+
'axes.facecolor': 'r'
202+
},
203+
mcolors.colorConverter.to_rgba('r')),
204+
({rcparam: 'g',
205+
'axes.facecolor': 'r'},
206+
mcolors.colorConverter.to_rgba('g'))
207+
]
208+
for rc_dict, target in test_values:
209+
yield _legend_rcparam_helper, rc_dict, target, get_func
192210

193211

194-
@cleanup
195212
def test_legend_edgecolor():
196-
with mpl.rc_context({'legend.edgecolor': 'r'}):
197-
_, ax = plt.subplots()
198-
ax.plot(range(3), label='test')
199-
leg = ax.legend()
200-
assert_equal(leg.legendPatch.get_edgecolor(), (1, 0, 0, 1))
213+
get_func = 'get_edgecolor'
214+
rcparam = 'legend.edgecolor'
215+
test_values = [({rcparam: 'r'},
216+
mcolors.colorConverter.to_rgba('r')),
217+
({rcparam: 'inherit',
218+
'axes.edgecolor': 'r'
219+
},
220+
mcolors.colorConverter.to_rgba('r')),
221+
({rcparam: 'g',
222+
'axes.facecolor': 'r'},
223+
mcolors.colorConverter.to_rgba('g'))
224+
]
225+
for rc_dict, target in test_values:
226+
yield _legend_rcparam_helper, rc_dict, target, get_func
201227

202228

203229
def test_Issue_1713():

0 commit comments

Comments
 (0)