diff --git a/core/tests/coretests/res/font/samplexmlfont.xml b/core/tests/coretests/res/font/samplexmlfont.xml index f1d14ff383fd6..dc2319ea0a802 100644 --- a/core/tests/coretests/res/font/samplexmlfont.xml +++ b/core/tests/coretests/res/font/samplexmlfont.xml @@ -1,10 +1,7 @@ - - - + + + diff --git a/core/tests/coretests/res/font/samplexmlfontforparsing.xml b/core/tests/coretests/res/font/samplexmlfontforparsing.xml new file mode 100644 index 0000000000000..98e3213954aa3 --- /dev/null +++ b/core/tests/coretests/res/font/samplexmlfontforparsing.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java b/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java index a12a0b8d125b7..42ff2e94a24ee 100644 --- a/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java +++ b/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java @@ -58,7 +58,7 @@ public class FontResourcesParserTest { @Test public void testParse() throws XmlPullParserException, IOException { - XmlResourceParser parser = mResources.getXml(R.font.samplexmlfont); + XmlResourceParser parser = mResources.getXml(R.font.samplexmlfontforparsing); FamilyResourceEntry result = FontResourcesParser.parse(parser, mResources); @@ -76,7 +76,7 @@ public class FontResourcesParserTest { assertEquals(400, font2.getWeight()); assertEquals(1, font2.getItalic()); assertEquals(1, font2.getTtcIndex()); - assertEquals("'contrast' 0.5", font2.getVariationSettings()); + assertEquals("'cntr' 0.5", font2.getVariationSettings()); assertEquals("res/font/samplefont2.ttf", font2.getFileName()); FontFileResourceEntry font3 = fileEntries[2]; assertEquals(800, font3.getWeight());