aboutsummaryrefslogtreecommitdiff
path: root/Tests/feaLib
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2022-08-31 23:38:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-08-31 23:38:02 +0000
commitae308ea7c829db90134cf1e0fb9ba2a071c385f4 (patch)
treee2eb0b9f93f0a8cb6705199d2f738f35cba28e7f /Tests/feaLib
parent2f76e5ea08a08dc7ffef910e066da6777a3c829f (diff)
parentae8de171b84d09142c6303a8d04dfb89af956964 (diff)
downloadfonttools-ae308ea7c829db90134cf1e0fb9ba2a071c385f4.tar.gz
Upgrade fonttools to 4.37.1 am: ae8de171b8
Original change: https://android-review.googlesource.com/c/platform/external/fonttools/+/2193410 Change-Id: Ie14f835d5c1bfa9c694add56e92aa3c9775c0e51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'Tests/feaLib')
-rw-r--r--Tests/feaLib/data/name.fea12
-rw-r--r--Tests/feaLib/data/name.ttx18
-rw-r--r--Tests/feaLib/parser_test.py2
3 files changed, 25 insertions, 7 deletions
diff --git a/Tests/feaLib/data/name.fea b/Tests/feaLib/data/name.fea
index 17727ed9..7c94b87f 100644
--- a/Tests/feaLib/data/name.fea
+++ b/Tests/feaLib/data/name.fea
@@ -1,16 +1,16 @@
table name {
#test-fea2fea:
- nameid 1 "Ignored-1";
+ nameid 1 "Test1";
#test-fea2fea:
- nameid 2 "Ignored-2";
+ nameid 2 "Test2";
#test-fea2fea:
- nameid 3 "Ignored-3";
+ nameid 3 "Test3";
#test-fea2fea:
- nameid 4 "Ignored-4";
+ nameid 4 "Test4";
#test-fea2fea:
- nameid 5 "Ignored-5";
+ nameid 5 "Test5";
#test-fea2fea:
- nameid 6 "Ignored-6";
+ nameid 6 "Test6";
#test-fea2fea: nameid 7 "Test7";
nameid 7 3 "Test7";
nameid 8 1 "Test8";
diff --git a/Tests/feaLib/data/name.ttx b/Tests/feaLib/data/name.ttx
index cdb60382..5014b251 100644
--- a/Tests/feaLib/data/name.ttx
+++ b/Tests/feaLib/data/name.ttx
@@ -2,6 +2,24 @@
<ttFont>
<name>
+ <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+ Test1
+ </namerecord>
+ <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+ Test2
+ </namerecord>
+ <namerecord nameID="3" platformID="3" platEncID="1" langID="0x409">
+ Test3
+ </namerecord>
+ <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+ Test4
+ </namerecord>
+ <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
+ Test5
+ </namerecord>
+ <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+ Test6
+ </namerecord>
<namerecord nameID="7" platformID="3" platEncID="1" langID="0x409">
Test7
</namerecord>
diff --git a/Tests/feaLib/parser_test.py b/Tests/feaLib/parser_test.py
index fd9dea70..b281e8ac 100644
--- a/Tests/feaLib/parser_test.py
+++ b/Tests/feaLib/parser_test.py
@@ -316,7 +316,7 @@ class ParserTest(unittest.TestCase):
def test_strict_glyph_name_check(self):
self.parse("@bad = [a b ccc];", glyphNames=("a", "b", "ccc"))
- with self.assertRaisesRegex(FeatureLibError, "missing from the glyph set: ccc"):
+ with self.assertRaisesRegex(FeatureLibError, "(?s)missing from the glyph set:.*ccc"):
self.parse("@bad = [a b ccc];", glyphNames=("a", "b"))
def test_glyphclass(self):