Update tests

This commit is contained in:
Martin Hosken 2019-03-15 11:16:51 +07:00
parent 06ed699785
commit 27d8d1bda0
2 changed files with 34 additions and 40 deletions

View File

@ -40,8 +40,26 @@
<Lookup index="0"> <Lookup index="0">
<LookupType value="1"/> <LookupType value="1"/>
<LookupFlag value="0"/> <LookupFlag value="0"/>
<!-- SubTableCount=8 --> <!-- SubTableCount=7 -->
<SinglePos index="0" Format="1"> <SinglePos index="0" Format="2">
<Coverage>
<Glyph value="four"/>
<Glyph value="six"/>
<Glyph value="seven"/>
<Glyph value="eight"/>
<Glyph value="nine"/>
<Glyph value="four.oldstyle"/>
</Coverage>
<ValueFormat value="4"/>
<!-- ValueCount=6 -->
<Value index="0" XAdvance="400"/>
<Value index="1" XAdvance="-200"/>
<Value index="2" XAdvance="-100"/>
<Value index="3" XAdvance="-100"/>
<Value index="4" XAdvance="-100"/>
<Value index="5" XAdvance="401"/>
</SinglePos>
<SinglePos index="1" Format="1">
<Coverage> <Coverage>
<Glyph value="one"/> <Glyph value="one"/>
<Glyph value="two"/> <Glyph value="two"/>
@ -51,28 +69,7 @@
<ValueFormat value="5"/> <ValueFormat value="5"/>
<Value XPlacement="-80" XAdvance="-160"/> <Value XPlacement="-80" XAdvance="-160"/>
</SinglePos> </SinglePos>
<SinglePos index="1" Format="2"> <SinglePos index="2" Format="2">
<Coverage>
<Glyph value="four"/>
<Glyph value="six"/>
<Glyph value="four.oldstyle"/>
</Coverage>
<ValueFormat value="4"/>
<!-- ValueCount=3 -->
<Value index="0" XAdvance="400"/>
<Value index="1" XAdvance="-200"/>
<Value index="2" XAdvance="401"/>
</SinglePos>
<SinglePos index="2" Format="1">
<Coverage>
<Glyph value="seven"/>
<Glyph value="eight"/>
<Glyph value="nine"/>
</Coverage>
<ValueFormat value="4"/>
<Value XAdvance="-100"/>
</SinglePos>
<SinglePos index="3" Format="2">
<Coverage> <Coverage>
<Glyph value="P"/> <Glyph value="P"/>
<Glyph value="Q"/> <Glyph value="Q"/>
@ -84,7 +81,7 @@
<Value index="1" XPlacement="1" XAdvance="801"/> <Value index="1" XPlacement="1" XAdvance="801"/>
<Value index="2" XPlacement="1" XAdvance="802"/> <Value index="2" XPlacement="1" XAdvance="802"/>
</SinglePos> </SinglePos>
<SinglePos index="4" Format="2"> <SinglePos index="3" Format="2">
<Coverage> <Coverage>
<Glyph value="S"/> <Glyph value="S"/>
<Glyph value="T"/> <Glyph value="T"/>
@ -96,7 +93,7 @@
<Value index="1" XPlacement="1" YPlacement="1" XAdvance="804"/> <Value index="1" XPlacement="1" YPlacement="1" XAdvance="804"/>
<Value index="2" XPlacement="1" YPlacement="1" XAdvance="805"/> <Value index="2" XPlacement="1" YPlacement="1" XAdvance="805"/>
</SinglePos> </SinglePos>
<SinglePos index="5" Format="1"> <SinglePos index="4" Format="1">
<Coverage> <Coverage>
<Glyph value="A"/> <Glyph value="A"/>
<Glyph value="B"/> <Glyph value="B"/>
@ -123,13 +120,13 @@
</XAdvDevice> </XAdvDevice>
</Value> </Value>
</SinglePos> </SinglePos>
<SinglePos index="6" Format="1"> <SinglePos index="5" Format="1">
<Coverage> <Coverage>
<Glyph value="zero"/> <Glyph value="zero"/>
</Coverage> </Coverage>
<ValueFormat value="0"/> <ValueFormat value="0"/>
</SinglePos> </SinglePos>
<SinglePos index="7" Format="1"> <SinglePos index="6" Format="1">
<Coverage> <Coverage>
<Glyph value="C"/> <Glyph value="C"/>
</Coverage> </Coverage>

View File

@ -913,24 +913,21 @@ class BuilderTest(unittest.TestCase):
"six": builder.buildValue({"YPlacement": -6}), "six": builder.buildValue({"YPlacement": -6}),
}, self.GLYPHMAP) }, self.GLYPHMAP)
self.assertEqual(sum([getXML(t.toXML) for t in subtables], []), self.assertEqual(sum([getXML(t.toXML) for t in subtables], []),
['<SinglePos Format="1">', ['<SinglePos Format="2">',
' <Coverage>', ' <Coverage>',
' <Glyph value="one"/>', ' <Glyph value="one"/>',
' <Glyph value="two"/>', ' <Glyph value="two"/>',
' <Glyph value="three"/>',
' <Glyph value="four"/>',
' <Glyph value="five"/>', ' <Glyph value="five"/>',
' </Coverage>', ' </Coverage>',
' <ValueFormat value="1"/>', ' <ValueFormat value="1"/>',
' <Value XPlacement="500"/>', ' <!-- ValueCount=5 -->',
'</SinglePos>', ' <Value index="0" XPlacement="500"/>',
'<SinglePos Format="2">', ' <Value index="1" XPlacement="500"/>',
' <Coverage>', ' <Value index="2" XPlacement="200"/>',
' <Glyph value="three"/>', ' <Value index="3" XPlacement="400"/>',
' <Glyph value="four"/>', ' <Value index="4" XPlacement="500"/>',
' </Coverage>',
' <ValueFormat value="1"/>',
' <!-- ValueCount=2 -->',
' <Value index="0" XPlacement="200"/>',
' <Value index="1" XPlacement="400"/>',
'</SinglePos>', '</SinglePos>',
'<SinglePos Format="1">', '<SinglePos Format="1">',
' <Coverage>', ' <Coverage>',