FIX: Use correct path to the default font (#931)

* FIX: Use correct path to the default font * Add regression tests. Co-authored-by: Corran Webster <cwebster@enthought.com>
enthought · Apr 20, 2022 · 129299b · 129299b
1 parent fa865d8
commit 129299b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/kiva/fonttools/font_manager.py b/kiva/fonttools/font_manager.py
@@ -120,7 +120,7 @@ def __init__(self):
                 data_dir = pkg_resources.resource_filename(
                     "kiva.fonttools", "data"
                 )
-                path = os.path.join(data_dir, " Montserrat-Regular.ttf")
+                path = os.path.join(data_dir, "Montserrat-Regular.ttf")
                 self.default_font["ttf"] = path
 
         self.ttf_db = create_font_database(ttffiles, fontext="ttf")

diff --git a/kiva/fonttools/tests/test_font_manager.py b/kiva/fonttools/tests/test_font_manager.py
@@ -94,13 +94,40 @@ def test_no_available_fonts(self):
                 with patch_font_cache(self.temp_dir, []):
                     pass
 
+    def test_default_font(self):
+        with change_ets_app_dir(self.temp_dir) as cache_file:
+            # ensure we get predictable list of system .ttf files
+            with patch_global_font_manager(None), \
+                    patch_system_fonts(self.ttf_files):
+                font_manager = FontManager()
+                self.assertEqual(
+                    font_manager.default_font["ttf"],
+                    self.ttf_files[0],
+                )
+
+    # regression test for enthought/enable#930
+    def test_default_font_fallback_fonts(self):
+        with change_ets_app_dir(self.temp_dir) as cache_file:
+            # ensure we get empty list of system .ttf files
+            with patch_global_font_manager(None), patch_system_fonts([]):
+                with self.assertWarns(UserWarning):
+                    font_manager = FontManager()
+                self.assertTrue("ttf" in font_manager.default_font)
+                self.assertEqual(
+                    os.path.basename(font_manager.default_font["ttf"]),
+                    "Montserrat-Regular.ttf",
+                )
+                self.assertTrue(
+                    os.path.exists(font_manager.default_font["ttf"]),
+                )
+
 
 class TestFontManager(unittest.TestCase):
     """ Test API of the font manager module."""
 
     def test_default_font_manager(self):
-        font_manager = default_font_manager()
-        self.assertIsInstance(font_manager, FontManager)
+       font_manager = default_font_manager()
+       self.assertIsInstance(font_manager, FontManager)
 
 
 @contextlib.contextmanager