@@ -56,13 +56,13 @@ def test_fallback_smoke():
56
56
57
57
58
58
@pytest .mark .parametrize ('family_name, file_name' ,
59
- [("WenQuanYi Zen Hei" , "wqy-zenhei.ttc " ),
60
- ("Noto Sans CJK JP" , "NotoSansCJK-Regular.ttc " )]
59
+ [("WenQuanYi Zen Hei" , "wqy-zenhei" ),
60
+ ("Noto Sans CJK JP" , "NotoSansCJK" )]
61
61
)
62
62
@check_figures_equal (extensions = ["png" , "pdf" , "eps" , "svg" ])
63
63
def test_font_fallback_chinese (fig_test , fig_ref , family_name , file_name ):
64
64
fp = fm .FontProperties (family = [family_name ])
65
- if Path (fm .findfont (fp )).name != file_name :
65
+ if file_name not in Path (fm .findfont (fp )).name :
66
66
pytest .skip (f"Font { family_name } ({ file_name } ) is missing" )
67
67
68
68
text = ["There are" , "几个汉字" , "in between!" ]
@@ -81,13 +81,14 @@ def test_font_fallback_chinese(fig_test, fig_ref, family_name, file_name):
81
81
@pytest .mark .parametrize (
82
82
"family_name, file_name" ,
83
83
[
84
- ("WenQuanYi Zen Hei" , "wqy-zenhei.ttc " ),
85
- ("Noto Sans CJK JP" , "NotoSansCJK-Regular.ttc " ),
84
+ ("WenQuanYi Zen Hei" , "wqy-zenhei" ),
85
+ ("Noto Sans CJK JP" , "NotoSansCJK" ),
86
86
],
87
87
)
88
88
def test__get_fontmap (family_name , file_name ):
89
89
fp = fm .FontProperties (family = [family_name ])
90
- if Path (fm .findfont (fp )).name != file_name :
90
+ found_file_name = Path (fm .findfont (fp )).name
91
+ if file_name not in found_file_name :
91
92
pytest .skip (f"Font { family_name } ({ file_name } ) is missing" )
92
93
93
94
text = "There are 几个汉字 in between!"
@@ -100,6 +101,6 @@ def test__get_fontmap(family_name, file_name):
100
101
fontmap = ft ._get_fontmap (text )
101
102
for char , font in fontmap .items ():
102
103
if ord (char ) > 127 :
103
- assert Path (font .fname ).name == file_name
104
+ assert Path (font .fname ).name == found_file_name
104
105
else :
105
106
assert Path (font .fname ).name == "DejaVuSans.ttf"
0 commit comments