1 files changed, 33 insertions, 4 deletions
diff --git a/scripts/run_general_tests.py b/scripts/run_general_tests.py
index ddfae17..494651d 100755
--- a/scripts/run_general_tests.py
+++ b/scripts/run_general_tests.py
@@ -24,7 +24,7 @@ from nototools.unittests import font_tests
 import roboto_data
 
 FONTS = font_tests.load_fonts(
-    ['hinted/*.ttf'],
+    ['out/RobotoTTF/*.ttf', 'out/RobotoCondensedTTF/*.ttf'],
     expected_count=18)
 
 UFOS = font_tests.load_fonts(
@@ -44,12 +44,13 @@ class TestItalicAngle(font_tests.TestItalicAngle):
 
 class TestMetaInfo(font_tests.TestMetaInfo):
     """Bugs:
+    https://github.com/google/roboto/issues/142
     https://code.google.com/a/google.com/p/roboto/issues/detail?id=8
     https://code.google.com/a/google.com/p/roboto/issues/detail?id=29
     """
 
     loaded_fonts = FONTS
-    mark_heavier_as_bold = True
+    mark_heavier_as_bold = False
     test_us_weight = None
 
     #expected_version = '2.' + roboto_data.get_build_number()
@@ -60,6 +61,20 @@ class TestMetaInfo(font_tests.TestMetaInfo):
     expected_os2_achVendID = 'GOOG'
 
 
+class TestNames(font_tests.TestNames):
+    """Bugs:
+    https://github.com/google/roboto/issues/37
+    """
+
+    loaded_fonts = FONTS
+    family_name = 'Roboto'
+    mark_heavier_as_bold = False
+    expected_copyright = 'Copyright 2011 Google Inc. All Rights Reserved.'
+
+    def expected_unique_id(self, family, style):
+        return 'Google:%s:2015' % family
+
+
 class TestDigitWidths(font_tests.TestDigitWidths):
     loaded_fonts = FONTS
 
@@ -96,8 +111,22 @@ class TestVerticalMetrics(font_tests.TestVerticalMetrics):
 
 
 class TestGlyphAreas(font_tests.TestGlyphAreas):
-    loaded_fonts = UFOS
-    masters = UFO_MASTERS
+    master_weights_to_test = ['Thin', 'Bold']
+    instance_weights_to_test = ['Thin', 'Regular', 'Bold']
+    exclude = ['Condensed', 'Italic']
+
+    master_glyph_sets = [
+        f.replace('_', '-') for f in UFO_MASTERS[0]], UFO_MASTERS[1]
+    instance_glyph_sets = FONTS[0], [f.getGlyphSet() for f in FONTS[1]]
+
+    master_glyphs_to_test = UFO_MASTERS[1][0].keys()
+    instance_glyphs_to_test = FONTS[1][0].getGlyphOrder()
+
+    #TODO maybe fix masters so that whitelisting isn't necessary
+    whitelist = [
+        'uni0488',  # offset 20 units b/w masters, interpolated points are off
+        'uni2050'  # has flipped component, so contour is backwards in master
+    ]
 
 
 if __name__ == '__main__':