Merge pull request #111 from jamesgk/add-tests

Add family name tests

1 files changed, 10 insertions, 4 deletions

diff --git a/scripts/run_web_tests.py b/scripts/run_web_tests.py
index 3ff483a..f201114 100755
--- a/scripts/run_web_tests.py
+++ b/scripts/run_web_tests.py
@@ -32,6 +32,7 @@ class TestItalicAngle(common_tests.TestItalicAngle):
 
 class TestMetaInfo(common_tests.TestMetaInfo):
     loaded_fonts = FONTS
+    mark_heavier_as_bold = True
     # Since different font files are hinted at different times, the actual
     # outlines differ slightly. So we are keeping the version numbers as a hint.
     test_version_numbers = None
@@ -40,19 +41,24 @@ class TestMetaInfo(common_tests.TestMetaInfo):
 class TestNames(common_tests.TestNames):
     loaded_fonts = FONTS
     family_name = 'Roboto'
+    mark_heavier_as_bold = True
 
     def test_unique_identifier_and_full_name(self):
         """Tests the unique identifier and full name."""
-        for records in self.names:
-            expected_name = records[1] + ' ' + records[2]
+        for font_file, records in zip(self.font_files, self.names):
+            family, weight, slope = self.parse_filename(font_file)
+            style = self.build_style(weight, slope)
+            expected_name = family + ' ' + style
             self.assertEqual(records[3], expected_name)
             self.assertEqual(records[4], expected_name)
             self.assertFalse(records.has_key(18))
 
     def test_postscript_name(self):
         """Tests the postscript name."""
-        for records in self.names:
-            expected_name = (records[1] + '-' + records[2]).replace(' ', '')
+        for font_file, records in zip(self.font_files, self.names):
+            family, weight, slope = self.parse_filename(font_file)
+            style = self.build_style(weight, slope)
+            expected_name = (family + '-' + style).replace(' ', '')
             self.assertEqual(records[6], expected_name)