Skip to content

Commit ec897ba

Browse files
committed
Fix rename tests.
1 parent 913baf7 commit ec897ba

File tree

2 files changed

+41
-12
lines changed

2 files changed

+41
-12
lines changed

tests/test_rename.py

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ class RenameTestCase(AbstractTestCase):
99

1010
def test_rename_with_family_name_and_style_name(self):
1111
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
12-
font.rename("Roboto Mono New", "Bold Italic")
12+
font.rename(
13+
family_name="Roboto Mono New",
14+
style_name="Bold Italic",
15+
)
1316
names = font.get_names()
1417
self.assertEqual(names[Font.NAME_FAMILY_NAME], "Roboto Mono New")
1518
self.assertEqual(names[Font.NAME_SUBFAMILY_NAME], "Bold Italic")
@@ -20,7 +23,9 @@ def test_rename_with_family_name_and_style_name(self):
2023

2124
def test_rename_with_family_name_only(self):
2225
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
23-
font.rename("Roboto Mono New", "")
26+
font.rename(
27+
family_name="Roboto Mono New",
28+
)
2429
names = font.get_names()
2530
self.assertEqual(names[Font.NAME_FAMILY_NAME], "Roboto Mono New")
2631
self.assertEqual(names[Font.NAME_SUBFAMILY_NAME], "Regular")
@@ -33,7 +38,9 @@ def test_rename_update_unique_identifier(self):
3338
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
3439
family_name = font.get_name(key=Font.NAME_FAMILY_NAME)
3540
family_name = family_name.replace("Mono", "Multi")
36-
font.rename(family_name=family_name)
41+
font.rename(
42+
family_name=family_name,
43+
)
3744
font_uid = font.get_name(Font.NAME_UNIQUE_IDENTIFIER)
3845
self.assertEqual(font_uid, "3.000;GOOG;RobotoMulti-Regular")
3946

@@ -56,7 +63,9 @@ def test_rename_with_family_name_only_issue_0062(self):
5663
)
5764
family_name = font.get_name(key=Font.NAME_TYPOGRAPHIC_FAMILY_NAME)
5865
family_name = family_name.replace("ABC", "Hugo")
59-
font.rename(family_name=family_name)
66+
font.rename(
67+
family_name=family_name,
68+
)
6069
# self._print(font.get_names())
6170
self.assertEqual(
6271
font.get_names(),
@@ -78,7 +87,9 @@ def test_rename_with_family_name_only_issue_0062(self):
7887

7988
def test_rename_with_style_name_only(self):
8089
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
81-
font.rename("", "Bold Italic")
90+
font.rename(
91+
style_name="Bold Italic",
92+
)
8293
names = font.get_names()
8394
self.assertEqual(names[Font.NAME_FAMILY_NAME], "Roboto Mono")
8495
self.assertEqual(names[Font.NAME_SUBFAMILY_NAME], "Bold Italic")
@@ -89,7 +100,10 @@ def test_rename_with_style_name_only(self):
89100

90101
def test_rename_without_family_name_and_style_name(self):
91102
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
92-
font.rename("", "")
103+
font.rename(
104+
family_name="",
105+
style_name="",
106+
)
93107
names = font.get_names()
94108
self.assertEqual(names[Font.NAME_FAMILY_NAME], "Roboto Mono")
95109
self.assertEqual(names[Font.NAME_SUBFAMILY_NAME], "Regular")
@@ -102,15 +116,18 @@ def test_rename_with_final_postscript_name_too_long(self):
102116
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
103117
with self.assertRaises(ValueError):
104118
font.rename(
105-
"Roboto Mono New Name Too Long For PostScript Name So Expect Exception",
106-
"Bold Italic",
119+
family_name="Roboto Mono New Name Too Long For PostScript Name So Expect Exception",
120+
style_name="Bold Italic",
107121
)
108122

109123
def test_rename_with_style_name_containing_characters_not_allowed_in_postscript_name(
110124
self,
111125
):
112126
font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")
113-
font.rename(" Tourney Custom ", " [wdth-wght] ")
127+
font.rename(
128+
family_name=" Tourney Custom ",
129+
style_name=" [wdth-wght] ",
130+
)
114131
names = font.get_names()
115132
self.assertEqual(names[Font.NAME_FAMILY_NAME], "Tourney Custom [wdth-wght]")
116133
self.assertEqual(names[Font.NAME_SUBFAMILY_NAME], "Regular")
@@ -122,7 +139,11 @@ def test_rename_with_style_name_containing_characters_not_allowed_in_postscript_
122139
def test_rename_with_style_flags_disabled(self):
123140
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
124141
font.set_style_flags(regular=False, bold=False, italic=False)
125-
font.rename("Roboto Mono New", "Bold Italic", update_style_flags=False)
142+
font.rename(
143+
family_name="Roboto Mono New",
144+
style_name="Bold Italic",
145+
update_style_flags=False,
146+
)
126147
style_flags = font.get_style_flags()
127148
self.assertFalse(style_flags["regular"])
128149
self.assertFalse(style_flags["bold"])
@@ -131,7 +152,11 @@ def test_rename_with_style_flags_disabled(self):
131152
def test_rename_with_style_flags_enabled(self):
132153
font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
133154
font.set_style_flags(regular=False, bold=False, italic=False)
134-
font.rename("Roboto Mono New", "Bold Italic", update_style_flags=True)
155+
font.rename(
156+
family_name="Roboto Mono New",
157+
style_name="Bold Italic",
158+
update_style_flags=True,
159+
)
135160
style_flags = font.get_style_flags()
136161
self.assertFalse(style_flags["regular"])
137162
self.assertTrue(style_flags["bold"])

tests/test_style_flags.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,11 @@ def test_set_style_flags_by_subfamily_name(self):
124124
self.assertFalse(style_flags["regular"])
125125
self.assertFalse(style_flags["bold"])
126126
self.assertFalse(style_flags["italic"])
127-
font.rename("Roboto Mono New", "Bold Italic", update_style_flags=False)
127+
font.rename(
128+
family_name="Roboto Mono New",
129+
style_name="Bold Italic",
130+
update_style_flags=False,
131+
)
128132
font.set_style_flags_by_subfamily_name()
129133
style_flags = font.get_style_flags()
130134
self.assertFalse(style_flags["regular"])

0 commit comments

Comments
 (0)