Skip to content

Commit 600ad50

Browse files
QuLogicQuLogic
committed
TST: Use text placeholders for empty legends
These tests use `remove_text=True` and set legend labels to empty strings. However, they are still affected by font metrics because even the empty string is as tall as the line height (which is calculated from the height of the "lp" string.)
1 parent f101e49 commit 600ad50

12 files changed

Lines changed: 331 additions & 355 deletions

File tree

‎lib/matplotlib/tests/baseline_images/test_axes/stem.png‎

-107 Bytes
Loading

‎lib/matplotlib/tests/baseline_images/test_backend_pdf/hatching_legend.pdf‎

-54 Bytes
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight.pdf‎

76 Bytes
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight.png‎

-1.83 KB
Loading

‎lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight.svg‎

Lines changed: 312 additions & 333 deletions
Loading

‎lib/matplotlib/tests/baseline_images/test_lines/striped_line.png‎

-98 Bytes
Loading

‎lib/matplotlib/tests/baseline_images/test_patheffects/tickedstroke.png‎

1.39 KB
Loading

‎lib/matplotlib/tests/test_axes.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4593,14 +4593,12 @@ def test_hist_stacked_weighted():
45934593

45944594

45954595
@image_comparison(['stem.png'], style='mpl20', remove_text=True)
4596-
def test_stem():
4596+
def test_stem(text_placeholders):
45974597
x = np.linspace(0.1, 2 * np.pi, 100)
45984598

45994599
fig, ax = plt.subplots()
4600-
# Label is a single space to force a legend to be drawn, but to avoid any
4601-
# text being drawn
46024600
ax.stem(x, np.cos(x),
4603-
linefmt='C2-.', markerfmt='k+', basefmt='C1-.', label=' ')
4601+
linefmt='C2-.', markerfmt='k+', basefmt='C1-.', label='stem')
46044602
ax.legend()
46054603

46064604

‎lib/matplotlib/tests/test_backend_pdf.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,15 +296,15 @@ def test_pdfpages_fspath():
296296
pdf.savefig(plt.figure())
297297

298298

299-
@image_comparison(['hatching_legend.pdf'])
300-
def test_hatching_legend():
299+
@image_comparison(['hatching_legend.pdf'], style='mpl20')
300+
def test_hatching_legend(text_placeholders):
301301
"""Test for correct hatching on patches in legend"""
302-
fig = plt.figure(figsize=(1, 2))
302+
fig = plt.figure(figsize=(1.5, 1))
303303

304304
a = Rectangle([0, 0], 0, 0, facecolor="green", hatch="XXXX")
305305
b = Rectangle([0, 0], 0, 0, facecolor="blue", hatch="XXXX")
306306

307-
fig.legend([a, b, a, b], ["", "", "", ""])
307+
fig.legend([a, b, a, b], ["green", "blue", "green", "blue"])
308308

309309

310310
@image_comparison(['grayscale_alpha.pdf'])

‎lib/matplotlib/tests/test_bbox_tight.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
from mpl_toolkits.axes_grid1.inset_locator import inset_axes
1212

1313

14-
@image_comparison(['bbox_inches_tight'], remove_text=True,
14+
@image_comparison(['bbox_inches_tight'], remove_text=True, style='mpl20',
1515
savefig_kwarg={'bbox_inches': 'tight'})
16-
def test_bbox_inches_tight():
16+
def test_bbox_inches_tight(text_placeholders):
1717
#: Test that a figure saved using bbox_inches='tight' is clipped correctly
1818
data = [[66386, 174296, 75131, 577908, 32015],
1919
[58230, 381139, 78045, 99308, 160454],
2020
[89135, 80552, 152558, 497981, 603535],
2121
[78415, 81858, 150656, 193263, 69638],
2222
[139361, 331509, 343164, 781380, 52269]]
2323

24-
col_labels = row_labels = [''] * 5
24+
col_labels = row_labels = ['a', 'b', 'c', 'd', 'e']
2525

2626
rows = len(data)
2727
ind = np.arange(len(col_labels)) + 0.3 # the x locations for the groups
@@ -33,11 +33,11 @@ def test_bbox_inches_tight():
3333
for row in range(rows):
3434
ax.bar(ind, data[row], width, bottom=yoff, align='edge', color='b')
3535
yoff = yoff + data[row]
36-
cell_text.append([''])
36+
cell_text.append(['x'])
3737
plt.xticks([])
3838
plt.xlim(0, 5)
39-
plt.legend([''] * 5, loc=(1.2, 0.2))
40-
fig.legend([''] * 5, bbox_to_anchor=(0, 0.2), loc='lower left')
39+
plt.legend(['a', 'b', 'c', 'd', 'e'], loc=(1.2, 0.2))
40+
fig.legend(['a', 'b', 'c', 'd', 'e'], bbox_to_anchor=(0, 0.2), loc='lower left')
4141
# Add a table at the bottom of the axes
4242
cell_text.reverse()
4343
plt.table(cellText=cell_text, rowLabels=row_labels, colLabels=col_labels,

0 commit comments

Comments
 (0)