diff --git a/Tests/varLib/data/BuildTest.designspace b/Tests/varLib/data/Build.designspace similarity index 100% rename from Tests/varLib/data/BuildTest.designspace rename to Tests/varLib/data/Build.designspace diff --git a/Tests/varLib/data/BuildTest.ttx b/Tests/varLib/data/Build.ttx similarity index 100% rename from Tests/varLib/data/BuildTest.ttx rename to Tests/varLib/data/Build.ttx diff --git a/Tests/varLib/data/DesignspaceTest.designspace b/Tests/varLib/data/Designspace.designspace similarity index 100% rename from Tests/varLib/data/DesignspaceTest.designspace rename to Tests/varLib/data/Designspace.designspace diff --git a/Tests/varLib/data/DesignspaceTest2.designspace b/Tests/varLib/data/Designspace2.designspace similarity index 100% rename from Tests/varLib/data/DesignspaceTest2.designspace rename to Tests/varLib/data/Designspace2.designspace diff --git a/Tests/varLib/data/InterpolateLayoutTest.designspace b/Tests/varLib/data/InterpolateLayout.designspace similarity index 100% rename from Tests/varLib/data/InterpolateLayoutTest.designspace rename to Tests/varLib/data/InterpolateLayout.designspace diff --git a/Tests/varLib/data/InterpolateLayoutTest.ttx b/Tests/varLib/data/InterpolateLayout.ttx similarity index 100% rename from Tests/varLib/data/InterpolateLayoutTest.ttx rename to Tests/varLib/data/InterpolateLayout.ttx diff --git a/Tests/varLib/data/MutatorTest.ttx b/Tests/varLib/data/Mutator.ttx similarity index 100% rename from Tests/varLib/data/MutatorTest.ttx rename to Tests/varLib/data/Mutator.ttx diff --git a/Tests/varLib/designspace_test.py b/Tests/varLib/designspace_test.py index daa7e8868..fbdaab37a 100644 --- a/Tests/varLib/designspace_test.py +++ b/Tests/varLib/designspace_test.py @@ -9,7 +9,7 @@ class DesignspaceTest(unittest.TestCase): def test_load(self): self.maxDiff = None self.assertEqual( - designspace.load(_getpath("DesignspaceTest.designspace")), + designspace.load(_getpath("Designspace.designspace")), {'sources': [{'location': {'weight': 0.0}, @@ -55,7 +55,7 @@ class DesignspaceTest(unittest.TestCase): def test_load2(self): self.assertEqual( - designspace.load(_getpath("DesignspaceTest2.designspace")), + designspace.load(_getpath("Designspace2.designspace")), {'sources': [], 'instances': [{}]}) diff --git a/Tests/varLib/interpolate_layout_test.py b/Tests/varLib/interpolate_layout_test.py index d6718b9ea..a54094e72 100644 --- a/Tests/varLib/interpolate_layout_test.py +++ b/Tests/varLib/interpolate_layout_test.py @@ -95,7 +95,7 @@ class InterpolateLayoutTest(unittest.TestCase): base master. """ suffix = '.ttf' - ds_path = self.get_test_input('InterpolateLayoutTest.designspace') + ds_path = self.get_test_input('InterpolateLayout.designspace') ufo_dir = self.get_test_input('master_ufo') ttx_dir = self.get_test_input('master_ttx_interpolatable_ttf') diff --git a/Tests/varLib/mutator_test.py b/Tests/varLib/mutator_test.py index 3da5d1a03..7ee916547 100644 --- a/Tests/varLib/mutator_test.py +++ b/Tests/varLib/mutator_test.py @@ -85,7 +85,7 @@ class MutatorTest(unittest.TestCase): def test_varlib_mutator_ttf(self): suffix = '.ttf' - ds_path = self.get_test_input('BuildTest.designspace') + ds_path = self.get_test_input('Build.designspace') ufo_dir = self.get_test_input('master_ufo') ttx_dir = self.get_test_input('master_ttx_interpolatable_ttf') @@ -96,7 +96,7 @@ class MutatorTest(unittest.TestCase): finder = lambda s: s.replace(ufo_dir, self.tempdir).replace('.ufo', suffix) varfont, _, _ = build(ds_path, finder) - varfont_path = os.path.join(self.tempdir, 'MutatorTest' + suffix) + varfont_path = os.path.join(self.tempdir, 'Mutator' + suffix) varfont.save(varfont_path) args = [varfont_path, 'wght=500', 'cntr=50'] @@ -105,7 +105,7 @@ class MutatorTest(unittest.TestCase): instfont_path = os.path.splitext(varfont_path)[0] + '-instance' + suffix instfont = TTFont(instfont_path) tables = [table_tag for table_tag in instfont.keys() if table_tag != 'head'] - expected_ttx = self.get_test_input('MutatorTest.ttx') + expected_ttx = self.get_test_input('Mutator.ttx') self.expect_ttx(instfont, expected_ttx, tables) diff --git a/Tests/varLib/varLib_test.py b/Tests/varLib/varLib_test.py index 199224b7e..1e531b46d 100644 --- a/Tests/varLib/varLib_test.py +++ b/Tests/varLib/varLib_test.py @@ -84,7 +84,7 @@ class BuildTest(unittest.TestCase): def test_varlib_build_ttf(self): suffix = '.ttf' - ds_path = self.get_test_input('BuildTest.designspace') + ds_path = self.get_test_input('Build.designspace') ufo_dir = self.get_test_input('master_ufo') ttx_dir = self.get_test_input('master_ttx_interpolatable_ttf') @@ -97,11 +97,11 @@ class BuildTest(unittest.TestCase): varfont, model, _ = build(ds_path, finder) tables = ['GDEF', 'HVAR', 'fvar', 'gvar'] - expected_ttx = self.get_test_input('BuildTest.ttx') + expected_ttx = self.get_test_input('Build.ttx') self.expect_ttx(varfont, expected_ttx, tables) # ensure the TTX dump is the same after saving and reloading font - varfont_path = os.path.join(self.tempdir, 'BuildTest.ttf') + varfont_path = os.path.join(self.tempdir, 'Build.ttf') varfont.save(varfont_path) self.expect_ttx(TTFont(varfont_path), expected_ttx, tables)