Merge "Add test for ascent and descent of serif and mono fonts"
diff --git a/graphics/tests/graphicstests/src/android/graphics/TypefaceTest.java b/core/tests/coretests/src/android/graphics/TypefaceTest.java
similarity index 99%
rename from graphics/tests/graphicstests/src/android/graphics/TypefaceTest.java
rename to core/tests/coretests/src/android/graphics/TypefaceTest.java
index 334fddf..c8ce884 100644
--- a/graphics/tests/graphicstests/src/android/graphics/TypefaceTest.java
+++ b/core/tests/coretests/src/android/graphics/TypefaceTest.java
@@ -20,6 +20,7 @@
import android.graphics.Typeface;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
+
import junit.framework.TestCase;
diff --git a/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java b/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java
index 8d01ea7..70f5976 100644
--- a/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java
+++ b/graphics/tests/graphicstests/src/android/graphics/GraphicsTests.java
@@ -23,7 +23,6 @@
TestSuite suite = new TestSuite(GraphicsTests.class.getName());
suite.addTestSuite(BitmapTest.class);
- suite.addTestSuite(TypefaceTest.class);
return suite;
}
}
diff --git a/tools/fonts/fontchain_lint.py b/tools/fonts/fontchain_lint.py
index b6f46a2..072a4a7 100755
--- a/tools/fonts/fontchain_lint.py
+++ b/tools/fonts/fontchain_lint.py
@@ -558,9 +558,13 @@
for record in _fallback_chain:
if record.name in ['sans-serif', 'sans-serif-condensed']:
font = open_font(record.font)
- assert (font['head'].yMax == 2163 and font['head'].yMin == -555 and
- font['hhea'].ascent == 1900 and font['hhea'].descent == -500), (
- 'Vertical metrics of %s do not match expected Roboto metrics.' % (record.font,))
+ assert font['head'].yMax == 2163 and font['head'].yMin == -555, (
+ 'yMax and yMin of %s do not match expected values.' % (record.font,))
+
+ if record.name in ['sans-serif', 'sans-serif-condensed', 'serif', 'monospace']:
+ font = open_font(record.font)
+ assert font['hhea'].ascent == 1900 and font['hhea'].descent == -500, (
+ 'ascent and descent of %s do not match expected values.' % (record.font,))
def main():