Refactor tests to a reusable structure.

Tests that are common to some targets are not moved to
common_tests.py, with target-specific tests basically inheriting its
classes and modifying them.

The web tests are not refactored yet.

3 files changed, 228 insertions, 180 deletions

diff --git a/scripts/common_tests.py b/scripts/common_tests.py
new file mode 100644
index 0000000..8fff95c
--- /dev/null
+++ b/scripts/common_tests.py
@@ -0,0 +1,191 @@
+"""Common tests for different targets."""
+
+import glob
+import unittest
+
+from fontTools import ttLib
+from nototools import coverage
+from nototools import font_data
+
+import layout
+import roboto_data
+
+
+def load_fonts(patterns, expected_count=None):
+    """Load all fonts specified in the patterns.
+
+    Also assert that the number of the fonts found is exactly the same as
+    expected_count."""
+    all_font_files = []
+    for pattern in patterns:
+        all_font_files += glob.glob(pattern)
+    all_fonts = [ttLib.TTFont(font) for font in all_font_files]
+    if expected_count:
+        assert len(all_font_files) == expected_count
+    return all_font_files, all_fonts
+
+
+class FontTest(unittest.TestCase):
+    """Parent class for all font tests."""
+    loaded_fonts = None
+
+
+class TestItalicAngle(FontTest):
+    """Test the italic angle of fonts."""
+
+    def setUp(self):
+        _, self.fonts = self.loaded_fonts
+
+    def test_italic_angle(self):
+        """Tests the italic angle of fonts to be correct."""
+        for font in self.fonts:
+            post_table = font['post']
+            if 'Italic' in font_data.font_name(font):
+                expected_angle = -12.0
+            else:
+                expected_angle = 0.0
+            self.assertEqual(post_table.italicAngle, expected_angle)
+
+
+class TestMetaInfo(FontTest):
+    """Test various meta information."""
+
+    def setUp(self):
+        _, self.fonts = self.loaded_fonts
+
+    def test_mac_style(self):
+        """Tests the macStyle of the fonts to be correct.
+
+        Bug: https://code.google.com/a/google.com/p/roboto/issues/detail?id=8
+        """
+        for font in self.fonts:
+            font_name = font_data.font_name(font)
+            bold = ('Bold' in font_name) or ('Black' in font_name)
+            italic = 'Italic' in font_name
+            expected_mac_style = (italic << 1) | bold
+            self.assertEqual(font['head'].macStyle, expected_mac_style)
+
+    def test_fs_type(self):
+        """Tests the fsType of the fonts to be 0.
+
+        fsType of 0 marks the font free for installation, embedding, etc.
+
+        Bug: https://code.google.com/a/google.com/p/roboto/issues/detail?id=29
+        """
+        for font in self.fonts:
+            self.assertEqual(font['OS/2'].fsType, 0)
+
+    def test_vendor_id(self):
+        """Tests the vendor ID of the fonts to be 'GOOG'."""
+        for font in self.fonts:
+            self.assertEqual(font['OS/2'].achVendID, 'GOOG')
+
+    def test_us_weight(self):
+        "Tests the usWeight of the fonts to be correct."""
+        for font in self.fonts:
+            weight = roboto_data.extract_weight_name(font_data.font_name(font))
+            expected_numeric_weight = roboto_data.WEIGHTS[weight]
+            self.assertEqual(
+                font['OS/2'].usWeightClass,
+                expected_numeric_weight)
+
+    def test_version_numbers(self):
+        "Tests the two version numbers of the font to be correct."""
+        for font in self.fonts:
+            build_number = roboto_data.get_build_number()
+            expected_version = '2.' + build_number
+            version = font_data.font_version(font)
+            usable_part_of_version = version.split(';')[0]
+            self.assertEqual(usable_part_of_version,
+                             'Version ' + expected_version)
+
+            revision = font_data.printable_font_revision(font, accuracy=5)
+            self.assertEqual(revision, expected_version)
+
+
+class TestDigitWidths(FontTest):
+    """Tests the width of digits."""
+
+    def setUp(self):
+        _, self.fonts = self.loaded_fonts
+        self.digits = [
+            'zero', 'one', 'two', 'three', 'four',
+            'five', 'six', 'seven', 'eight', 'nine']
+
+    def test_digit_widths(self):
+        """Tests all decimal digits to make sure they have the same width."""
+        for font in self.fonts:
+            hmtx_table = font['hmtx']
+            widths = [hmtx_table[digit][0] for digit in self.digits]
+            self.assertEqual(len(set(widths)), 1)
+
+
+class TestCharacterCoverage(FontTest):
+    """Tests character coverage."""
+
+    def setUp(self):
+        _, self.fonts = self.loaded_fonts
+        self.LEGACY_PUA = frozenset({0xEE01, 0xEE02, 0xF6C3})
+
+    def test_inclusion_of_legacy_pua(self):
+        """Tests that legacy PUA characters remain in the fonts."""
+        for font in self.fonts:
+            charset = coverage.character_set(font)
+            for char in self.LEGACY_PUA:
+                self.assertIn(char, charset)
+
+    def test_non_inclusion_of_other_pua(self):
+        """Tests that there are not other PUA characters except legacy ones."""
+        for font in self.fonts:
+            charset = coverage.character_set(font)
+            pua_chars = {
+                char for char in charset
+                if 0xE000 <= char <= 0xF8FF or 0xF0000 <= char <= 0x10FFFF}
+            self.assertTrue(pua_chars <= self.LEGACY_PUA)
+
+    def test_lack_of_unassigned_chars(self):
+        """Tests that unassigned characters are not in the fonts."""
+        for font in self.fonts:
+            charset = coverage.character_set(font)
+            self.assertNotIn(0x2072, charset)
+            self.assertNotIn(0x2073, charset)
+            self.assertNotIn(0x208F, charset)
+
+    def test_inclusion_of_sound_recording_copyright(self):
+        """Tests that sound recording copyright symbol is in the fonts."""
+        for font in self.fonts:
+            charset = coverage.character_set(font)
+            self.assertIn(
+                0x2117, charset,  # SOUND RECORDING COPYRIGHT
+                'U+2117 not found in %s.' % font_data.font_name(font))
+
+
+class TestLigatures(FontTest):
+    """Tests formation or lack of formation of ligatures."""
+
+    def setUp(self):
+        self.fontfiles, _ = self.loaded_fonts
+
+    def test_lack_of_ff_ligature(self):
+        """Tests that the ff ligature is not formed by default."""
+        for fontfile in self.fontfiles:
+            advances = layout.get_advances('ff', fontfile)
+            self.assertEqual(len(advances), 2)
+
+
+class TestVerticalMetrics(FontTest):
+    """Test the vertical metrics of fonts."""
+
+    def setUp(self):
+        _, self.fonts = self.loaded_fonts
+
+    def test_ymin_ymax(self):
+        """Tests yMin and yMax to be equal to Roboto v1 values.
+
+        Android requires this, and web fonts expect this.
+        """
+        for font in self.fonts:
+            head_table = font['head']
+            self.assertEqual(head_table.yMin, -555)
+            self.assertEqual(head_table.yMax, 2163)
+
diff --git a/scripts/run_android_tests.py b/scripts/run_android_tests.py
index 077ebcb..060965b 100755
--- a/scripts/run_android_tests.py
+++ b/scripts/run_android_tests.py
@@ -1,75 +1,33 @@
 #!/usr/bin/python
 """Test assumptions that Android relies on."""
 
-import glob
 import unittest
 
-from fontTools import ttLib
 from nototools import coverage
-from nototools import font_data
 
-import roboto_data
+import common_tests
 
+FONTS = common_tests.load_fonts(
+    ['out/android/*.ttf'],
+    expected_count=18)
 
-def load_fonts():
-    """Load all fonts built for Android."""
-    all_font_files = glob.glob('out/android/*.ttf')
-    all_fonts = [ttLib.TTFont(font) for font in all_font_files]
-    assert len(all_font_files) == 18
-    return all_font_files, all_fonts
+class TestItalicAngle(common_tests.TestItalicAngle):
+    loaded_fonts = FONTS
 
 
-class TestMetaInfo(unittest.TestCase):
-    """Test various meta information."""
+class TestMetaInfo(common_tests.TestMetaInfo):
+    loaded_fonts = FONTS
 
-    def setUp(self):
-        _, self.fonts = load_fonts()
-
-    def test_us_weight(self):
-        "Tests the usWeight of the fonts to be correct."""
-        for font in self.fonts:
-            weight = roboto_data.extract_weight_name(font_data.font_name(font))
-            expected_numeric_weight = roboto_data.WEIGHTS[weight]
-            self.assertEqual(
-                font['OS/2'].usWeightClass,
-                expected_numeric_weight)
-
-    def test_version_numbers(self):
-        "Tests the two version numbers of the font to be correct."""
-        for font in self.fonts:
-            build_number = roboto_data.get_build_number()
-            expected_version = '2.' + build_number
-            version = font_data.font_version(font)
-            usable_part_of_version = version.split(';')[0]
-            self.assertEqual(usable_part_of_version,
-                             'Version ' + expected_version)
-
-            revision = font_data.printable_font_revision(font, accuracy=5)
-            self.assertEqual(revision, expected_version)
 
+class TestDigitWidths(common_tests.TestDigitWidths):
+    loaded_fonts = FONTS
 
-class TestVerticalMetrics(unittest.TestCase):
-    """Test the vertical metrics of fonts."""
-
-    def setUp(self):
-        _, self.fonts = load_fonts()
-
-    def test_ymin_ymax(self):
-        """Tests yMin and yMax to be equal to what Android expects."""
-        for font in self.fonts:
-            head_table = font['head']
-            self.assertEqual(head_table.yMin, -555)
-            self.assertEqual(head_table.yMax, 2163)
 
-
-class TestCharacterCoverage(unittest.TestCase):
-    """Tests character coverage."""
-
-    def setUp(self):
-        _, self.fonts = load_fonts()
+class TestCharacterCoverage(common_tests.TestCharacterCoverage):
+    loaded_fonts = FONTS
 
     def test_lack_of_arrows_and_combining_keycap(self):
-        """Tests that arrows and combining keycap are not in the fonts."""
+        """Tests that arrows and combining keycap are not in Android fonts."""
         for font in self.fonts:
             charset = coverage.character_set(font)
             self.assertNotIn(0x20E3, charset)  # COMBINING ENCLOSING KEYCAP
@@ -77,6 +35,14 @@ class TestCharacterCoverage(unittest.TestCase):
             self.assertNotIn(0x2193, charset)  # DOWNWARDS ARROW
 
 
+class TestLigatures(common_tests.TestLigatures):
+    loaded_fonts = FONTS
+
+
+class TestVerticalMetrics(common_tests.TestVerticalMetrics):
+    loaded_fonts = FONTS
+
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/scripts/run_general_tests.py b/scripts/run_general_tests.py
index 913eff2..8b56305 100755
--- a/scripts/run_general_tests.py
+++ b/scripts/run_general_tests.py
@@ -1,143 +1,34 @@
 #!/usr/bin/python
 """Test general health of the fonts."""
 
-import glob
 import unittest
 
-from fontTools import ttLib
-from nototools import coverage
-from nototools import font_data
+import common_tests
 
-import layout
+FONTS = common_tests.load_fonts(
+    ['out/RobotoTTF/*.ttf', 'out/RobotoCondensedTTF/*.ttf'],
+    expected_count=18)
 
-def load_fonts():
-    """Load all major fonts."""
-    all_font_files = (glob.glob('out/RobotoTTF/*.ttf')
-                      + glob.glob('out/RobotoCondensedTTF/*.ttf'))
-    all_fonts = [ttLib.TTFont(font) for font in all_font_files]
-    assert len(all_font_files) == 18
-    return all_font_files, all_fonts
+class TestItalicAngle(common_tests.TestItalicAngle):
+    loaded_fonts = FONTS
 
 
-class TestItalicAngle(unittest.TestCase):
-    """Test the italic angle of fonts."""
+class TestMetaInfo(common_tests.TestMetaInfo):
+    loaded_fonts = FONTS
+    test_us_weight = None
+    test_version_numbers = None
 
-    def setUp(self):
-        _, self.fonts = load_fonts()
 
-    def test_italic_angle(self):
-        """Tests the italic angle of fonts to be correct."""
-        for font in self.fonts:
-            post_table = font['post']
-            if 'Italic' in font_data.font_name(font):
-                expected_angle = -12.0
-            else:
-                expected_angle = 0.0
-            self.assertEqual(post_table.italicAngle, expected_angle)
+class TestDigitWidths(common_tests.TestDigitWidths):
+    loaded_fonts = FONTS
 
 
-class TestMetaInfo(unittest.TestCase):
-    """Test various meta information."""
+class TestCharacterCoverage(common_tests.TestCharacterCoverage):
+    loaded_fonts = FONTS
 
-    def setUp(self):
-        _, self.fonts = load_fonts()
 
-    def test_mac_style(self):
-        """Tests the macStyle of the fonts to be correct.
-
-        Bug: https://code.google.com/a/google.com/p/roboto/issues/detail?id=8
-        """
-        for font in self.fonts:
-            font_name = font_data.font_name(font)
-            bold = ('Bold' in font_name) or ('Black' in font_name)
-            italic = 'Italic' in font_name
-            expected_mac_style = (italic << 1) | bold
-            self.assertEqual(font['head'].macStyle, expected_mac_style)
-
-    def test_fs_type(self):
-        """Tests the fsType of the fonts to be 0.
-
-        fsType of 0 marks the font free for installation, embedding, etc.
-
-        Bug: https://code.google.com/a/google.com/p/roboto/issues/detail?id=29
-        """
-        for font in self.fonts:
-            self.assertEqual(font['OS/2'].fsType, 0)
-
-    def test_vendor_id(self):
-        """Tests the vendor ID of the fonts to be 'GOOG'."""
-        for font in self.fonts:
-            self.assertEqual(font['OS/2'].achVendID, 'GOOG')
-
-
-class TestDigitWidths(unittest.TestCase):
-    """Tests the width of digits."""
-
-    def setUp(self):
-        _, self.fonts = load_fonts()
-        self.digits = [
-            'zero', 'one', 'two', 'three', 'four',
-            'five', 'six', 'seven', 'eight', 'nine']
-
-    def test_digit_widths(self):
-        """Tests all decimal digits to make sure they have the same width."""
-        for font in self.fonts:
-            hmtx_table = font['hmtx']
-            widths = [hmtx_table[digit][0] for digit in self.digits]
-            self.assertEqual(len(set(widths)), 1)
-
-
-class TestCharacterCoverage(unittest.TestCase):
-    """Tests character coverage."""
-
-    def setUp(self):
-        _, self.fonts = load_fonts()
-        self.LEGACY_PUA = frozenset({0xEE01, 0xEE02, 0xF6C3})
-
-    def test_inclusion_of_legacy_pua(self):
-        """Tests that legacy PUA characters remain in the fonts."""
-        for font in self.fonts:
-            charset = coverage.character_set(font)
-            for char in self.LEGACY_PUA:
-                self.assertIn(char, charset)
-
-    def test_non_inclusion_of_other_pua(self):
-        """Tests that there are not other PUA characters except legacy ones."""
-        for font in self.fonts:
-            charset = coverage.character_set(font)
-            pua_chars = {
-                char for char in charset
-                if 0xE000 <= char <= 0xF8FF or 0xF0000 <= char <= 0x10FFFF}
-            self.assertTrue(pua_chars <= self.LEGACY_PUA)
-
-    def test_lack_of_unassigned_chars(self):
-        """Tests that unassigned characters are not in the fonts."""
-        for font in self.fonts:
-            charset = coverage.character_set(font)
-            self.assertNotIn(0x2072, charset)
-            self.assertNotIn(0x2073, charset)
-            self.assertNotIn(0x208F, charset)
-
-    def test_inclusion_of_sound_recording_copyright(self):
-        """Tests that sound recording copyright symbol is in the fonts."""
-        for font in self.fonts:
-            charset = coverage.character_set(font)
-            self.assertIn(
-                0x2117, charset,  # SOUND RECORDING COPYRIGHT
-                'U+2117 not found in %s.' % font_data.font_name(font))
-
-
-class TestLigatures(unittest.TestCase):
-    """Tests formation or lack of formation of ligatures."""
-
-    def setUp(self):
-        self.fontfiles, _ = load_fonts()
-
-    def test_lack_of_ff_ligature(self):
-        """Tests that the ff ligature is not formed by default."""
-        for fontfile in self.fontfiles:
-            advances = layout.get_advances('ff', fontfile)
-            self.assertEqual(len(advances), 2)
+class TestLigatures(common_tests.TestLigatures):
+    loaded_fonts = FONTS
 
 
 if __name__ == '__main__':