From 3cdc8008739e4825a698fcbc7e635299b99936da Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Mon, 16 Jan 2017 09:36:10 +0000 Subject: [PATCH] [Tests] rename all 'testdata' folders to simply 'data' as it's now obvious what kind of data they are --- MANIFEST.in | 14 +++++++------- Tests/feaLib/builder_test.py | 4 ++-- Tests/feaLib/{testdata => data}/Attach.fea | 0 Tests/feaLib/{testdata => data}/Attach.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_1.fea | 0 Tests/feaLib/{testdata => data}/GPOS_1.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_1_zero.fea | 0 Tests/feaLib/{testdata => data}/GPOS_1_zero.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_2.fea | 0 Tests/feaLib/{testdata => data}/GPOS_2.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_2b.fea | 0 Tests/feaLib/{testdata => data}/GPOS_2b.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_3.fea | 0 Tests/feaLib/{testdata => data}/GPOS_3.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_4.fea | 0 Tests/feaLib/{testdata => data}/GPOS_4.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_5.fea | 0 Tests/feaLib/{testdata => data}/GPOS_5.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_6.fea | 0 Tests/feaLib/{testdata => data}/GPOS_6.ttx | 0 Tests/feaLib/{testdata => data}/GPOS_8.fea | 0 Tests/feaLib/{testdata => data}/GPOS_8.ttx | 0 Tests/feaLib/{testdata => data}/GSUB_2.fea | 0 Tests/feaLib/{testdata => data}/GSUB_2.ttx | 0 Tests/feaLib/{testdata => data}/GSUB_3.fea | 0 Tests/feaLib/{testdata => data}/GSUB_3.ttx | 0 Tests/feaLib/{testdata => data}/GSUB_6.fea | 0 Tests/feaLib/{testdata => data}/GSUB_6.ttx | 0 Tests/feaLib/{testdata => data}/GSUB_8.fea | 0 Tests/feaLib/{testdata => data}/GSUB_8.ttx | 0 Tests/feaLib/{testdata => data}/GlyphClassDef.fea | 0 Tests/feaLib/{testdata => data}/GlyphClassDef.ttx | 0 .../{testdata => data}/LigatureCaretByIndex.fea | 0 .../{testdata => data}/LigatureCaretByIndex.ttx | 0 .../{testdata => data}/LigatureCaretByPos.fea | 0 .../{testdata => data}/LigatureCaretByPos.ttx | 0 Tests/feaLib/{testdata => data}/baseClass.fea | 0 Tests/feaLib/{testdata => data}/baseClass.feax | 0 Tests/feaLib/{testdata => data}/bug453.fea | 0 Tests/feaLib/{testdata => data}/bug453.ttx | 0 Tests/feaLib/{testdata => data}/bug457.fea | 0 Tests/feaLib/{testdata => data}/bug457.ttx | 0 Tests/feaLib/{testdata => data}/bug463.fea | 0 Tests/feaLib/{testdata => data}/bug463.ttx | 0 Tests/feaLib/{testdata => data}/bug501.fea | 0 Tests/feaLib/{testdata => data}/bug501.ttx | 0 Tests/feaLib/{testdata => data}/bug502.fea | 0 Tests/feaLib/{testdata => data}/bug502.ttx | 0 Tests/feaLib/{testdata => data}/bug504.fea | 0 Tests/feaLib/{testdata => data}/bug504.ttx | 0 Tests/feaLib/{testdata => data}/bug505.fea | 0 Tests/feaLib/{testdata => data}/bug505.ttx | 0 Tests/feaLib/{testdata => data}/bug506.fea | 0 Tests/feaLib/{testdata => data}/bug506.ttx | 0 Tests/feaLib/{testdata => data}/bug509.fea | 0 Tests/feaLib/{testdata => data}/bug509.ttx | 0 Tests/feaLib/{testdata => data}/bug512.fea | 0 Tests/feaLib/{testdata => data}/bug512.ttx | 0 Tests/feaLib/{testdata => data}/bug568.fea | 0 Tests/feaLib/{testdata => data}/bug568.ttx | 0 Tests/feaLib/{testdata => data}/enum.fea | 0 Tests/feaLib/{testdata => data}/enum.ttx | 0 Tests/feaLib/{testdata => data}/feature_aalt.fea | 0 Tests/feaLib/{testdata => data}/feature_aalt.ttx | 0 Tests/feaLib/{testdata => data}/ignore_pos.fea | 0 Tests/feaLib/{testdata => data}/ignore_pos.ttx | 0 Tests/feaLib/{testdata => data}/include0.fea | 0 Tests/feaLib/{testdata => data}/include1.fea | 0 Tests/feaLib/{testdata => data}/include2.fea | 0 Tests/feaLib/{testdata => data}/include3.fea | 0 Tests/feaLib/{testdata => data}/include4.fea | 0 Tests/feaLib/{testdata => data}/include5.fea | 0 Tests/feaLib/{testdata => data}/include6.fea | 0 .../{testdata => data}/includemissingfile.fea | 0 Tests/feaLib/{testdata => data}/includeself.fea | 0 .../{testdata => data}/language_required.fea | 0 .../{testdata => data}/language_required.ttx | 0 Tests/feaLib/{testdata => data}/lookup.fea | 0 Tests/feaLib/{testdata => data}/lookup.ttx | 0 Tests/feaLib/{testdata => data}/lookupflag.fea | 0 Tests/feaLib/{testdata => data}/lookupflag.ttx | 0 Tests/feaLib/{testdata => data}/markClass.fea | 0 Tests/feaLib/{testdata => data}/markClass.ttx | 0 Tests/feaLib/{testdata => data}/mini.fea | 0 .../multiple_feature_blocks.fea | 0 .../multiple_feature_blocks.ttx | 0 Tests/feaLib/{testdata => data}/name.fea | 0 Tests/feaLib/{testdata => data}/name.ttx | 0 .../{testdata => data}/omitted_GlyphClassDef.fea | 0 .../{testdata => data}/omitted_GlyphClassDef.ttx | 0 Tests/feaLib/{testdata => data}/size.fea | 0 Tests/feaLib/{testdata => data}/size.ttx | 0 Tests/feaLib/{testdata => data}/size2.fea | 0 Tests/feaLib/{testdata => data}/size2.ttx | 0 Tests/feaLib/{testdata => data}/spec10.fea | 0 Tests/feaLib/{testdata => data}/spec10.ttx | 0 Tests/feaLib/{testdata => data}/spec4h1.fea | 0 Tests/feaLib/{testdata => data}/spec4h1.ttx | 0 Tests/feaLib/{testdata => data}/spec4h2.fea | 0 Tests/feaLib/{testdata => data}/spec4h2.ttx | 0 Tests/feaLib/{testdata => data}/spec5d1.fea | 0 Tests/feaLib/{testdata => data}/spec5d1.ttx | 0 Tests/feaLib/{testdata => data}/spec5d2.fea | 0 Tests/feaLib/{testdata => data}/spec5d2.ttx | 0 Tests/feaLib/{testdata => data}/spec5f_ii_1.fea | 0 Tests/feaLib/{testdata => data}/spec5f_ii_1.ttx | 0 Tests/feaLib/{testdata => data}/spec5f_ii_2.fea | 0 Tests/feaLib/{testdata => data}/spec5f_ii_2.ttx | 0 Tests/feaLib/{testdata => data}/spec5f_ii_3.fea | 0 Tests/feaLib/{testdata => data}/spec5f_ii_3.ttx | 0 Tests/feaLib/{testdata => data}/spec5f_ii_4.fea | 0 Tests/feaLib/{testdata => data}/spec5f_ii_4.ttx | 0 Tests/feaLib/{testdata => data}/spec5fi1.fea | 0 Tests/feaLib/{testdata => data}/spec5fi1.ttx | 0 Tests/feaLib/{testdata => data}/spec5fi2.fea | 0 Tests/feaLib/{testdata => data}/spec5fi2.ttx | 0 Tests/feaLib/{testdata => data}/spec5fi3.fea | 0 Tests/feaLib/{testdata => data}/spec5fi3.ttx | 0 Tests/feaLib/{testdata => data}/spec5fi4.fea | 0 Tests/feaLib/{testdata => data}/spec5fi4.ttx | 0 Tests/feaLib/{testdata => data}/spec5h1.fea | 0 Tests/feaLib/{testdata => data}/spec5h1.ttx | 0 Tests/feaLib/{testdata => data}/spec6b_ii.fea | 0 Tests/feaLib/{testdata => data}/spec6b_ii.ttx | 0 Tests/feaLib/{testdata => data}/spec6d2.fea | 0 Tests/feaLib/{testdata => data}/spec6d2.ttx | 0 Tests/feaLib/{testdata => data}/spec6e.fea | 0 Tests/feaLib/{testdata => data}/spec6e.ttx | 0 Tests/feaLib/{testdata => data}/spec6f.fea | 0 Tests/feaLib/{testdata => data}/spec6f.ttx | 0 Tests/feaLib/{testdata => data}/spec6h_ii.fea | 0 Tests/feaLib/{testdata => data}/spec6h_ii.ttx | 0 Tests/feaLib/{testdata => data}/spec6h_iii_1.fea | 0 Tests/feaLib/{testdata => data}/spec6h_iii_1.ttx | 0 Tests/feaLib/{testdata => data}/spec6h_iii_3d.fea | 0 Tests/feaLib/{testdata => data}/spec6h_iii_3d.ttx | 0 Tests/feaLib/{testdata => data}/spec8a.fea | 0 Tests/feaLib/{testdata => data}/spec8a.ttx | 0 Tests/feaLib/{testdata => data}/spec8b.fea | 0 Tests/feaLib/{testdata => data}/spec8b.ttx | 0 Tests/feaLib/{testdata => data}/spec8c.fea | 0 Tests/feaLib/{testdata => data}/spec8c.ttx | 0 Tests/feaLib/{testdata => data}/spec9a.fea | 0 Tests/feaLib/{testdata => data}/spec9a.ttx | 0 Tests/feaLib/{testdata => data}/spec9b.fea | 0 Tests/feaLib/{testdata => data}/spec9b.ttx | 0 Tests/feaLib/{testdata => data}/spec9c1.fea | 0 Tests/feaLib/{testdata => data}/spec9c1.ttx | 0 Tests/feaLib/{testdata => data}/spec9c2.fea | 0 Tests/feaLib/{testdata => data}/spec9c2.ttx | 0 Tests/feaLib/{testdata => data}/spec9c3.fea | 0 Tests/feaLib/{testdata => data}/spec9c3.ttx | 0 Tests/feaLib/{testdata => data}/spec9d.fea | 0 Tests/feaLib/{testdata => data}/spec9d.ttx | 0 Tests/feaLib/{testdata => data}/spec9e.fea | 0 Tests/feaLib/{testdata => data}/spec9e.ttx | 0 Tests/feaLib/{testdata => data}/spec9f.fea | 0 Tests/feaLib/{testdata => data}/spec9f.ttx | 0 Tests/feaLib/{testdata => data}/spec9g.fea | 0 Tests/feaLib/{testdata => data}/spec9g.ttx | 0 Tests/feaLib/lexer_test.py | 2 +- Tests/feaLib/parser_test.py | 2 +- .../featurename-backward.ttx.GSUB | 0 .../{testdata => data}/featurename-backward.txt | 0 .../featurename-forward.ttx.GSUB | 0 .../{testdata => data}/featurename-forward.txt | 0 .../lookupnames-backward.ttx.GSUB | 0 .../{testdata => data}/lookupnames-backward.txt | 0 .../lookupnames-forward.ttx.GSUB | 0 .../{testdata => data}/lookupnames-forward.txt | 0 .../{testdata => data}/mixed-toplevels.ttx.GSUB | 0 .../mtiLib/{testdata => data}/mixed-toplevels.txt | 0 Tests/mtiLib/{testdata => data}/mti/README | 0 .../{testdata => data}/mti/chained-glyph.ttx.GPOS | 0 .../{testdata => data}/mti/chained-glyph.ttx.GSUB | 0 .../{testdata => data}/mti/chained-glyph.txt | 0 .../{testdata => data}/mti/chainedclass.ttx.GSUB | 0 .../{testdata => data}/mti/chainedclass.txt | 0 .../mti/chainedcoverage.ttx.GSUB | 0 .../{testdata => data}/mti/chainedcoverage.txt | 0 Tests/mtiLib/{testdata => data}/mti/cmap.ttx | 0 Tests/mtiLib/{testdata => data}/mti/cmap.ttx.cmap | 0 Tests/mtiLib/{testdata => data}/mti/cmap.txt | 0 .../{testdata => data}/mti/context-glyph.txt | 0 .../{testdata => data}/mti/contextclass.txt | 0 .../{testdata => data}/mti/contextcoverage.txt | 0 .../{testdata => data}/mti/featuretable.txt | 0 .../{testdata => data}/mti/gdefattach.ttx.GDEF | 0 .../mtiLib/{testdata => data}/mti/gdefattach.txt | 0 .../{testdata => data}/mti/gdefclasses.ttx.GDEF | 0 .../mtiLib/{testdata => data}/mti/gdefclasses.txt | 0 .../{testdata => data}/mti/gdefligcaret.ttx.GDEF | 0 .../{testdata => data}/mti/gdefligcaret.txt | 0 .../mti/gdefmarkattach.ttx.GDEF | 0 .../{testdata => data}/mti/gdefmarkattach.txt | 0 .../mti/gdefmarkfilter.ttx.GDEF | 0 .../{testdata => data}/mti/gdefmarkfilter.txt | 0 .../{testdata => data}/mti/gposcursive.ttx.GPOS | 0 .../mtiLib/{testdata => data}/mti/gposcursive.txt | 0 .../{testdata => data}/mti/gposkernset.ttx.GPOS | 0 .../mtiLib/{testdata => data}/mti/gposkernset.txt | 0 .../mti/gposmarktobase.ttx.GPOS | 0 .../{testdata => data}/mti/gposmarktobase.txt | 0 .../{testdata => data}/mti/gpospairclass.ttx.GPOS | 0 .../{testdata => data}/mti/gpospairclass.txt | 0 .../{testdata => data}/mti/gpospairglyph.ttx.GPOS | 0 .../{testdata => data}/mti/gpospairglyph.txt | 0 .../{testdata => data}/mti/gpossingle.ttx.GPOS | 0 .../mtiLib/{testdata => data}/mti/gpossingle.txt | 0 .../{testdata => data}/mti/gsubalternate.ttx.GSUB | 0 .../{testdata => data}/mti/gsubalternate.txt | 0 .../{testdata => data}/mti/gsubligature.ttx.GSUB | 0 .../{testdata => data}/mti/gsubligature.txt | 0 .../{testdata => data}/mti/gsubmultiple.ttx.GSUB | 0 .../{testdata => data}/mti/gsubmultiple.txt | 0 .../mti/gsubreversechanined.ttx.GSUB | 0 .../mti/gsubreversechanined.txt | 0 .../{testdata => data}/mti/gsubsingle.ttx.GSUB | 0 .../mtiLib/{testdata => data}/mti/gsubsingle.txt | 0 .../mti/mark-to-ligature.ttx.GPOS | 0 .../{testdata => data}/mti/mark-to-ligature.txt | 0 .../{testdata => data}/mti/scripttable.ttx.GPOS | 0 .../{testdata => data}/mti/scripttable.ttx.GSUB | 0 .../mtiLib/{testdata => data}/mti/scripttable.txt | 0 Tests/mtiLib/mti_test.py | 4 ++-- Tests/pens/ttGlyphPen_test.py | 2 +- .../subset/{testdata => data}/TestCID-Regular.ttx | 0 .../subset/{testdata => data}/TestCLR-Regular.ttx | 0 Tests/subset/{testdata => data}/TestGVAR.ttx | 0 .../{testdata => data}/TestMATH-Regular.ttx | 0 .../subset/{testdata => data}/TestOTF-Regular.ttx | 0 .../subset/{testdata => data}/TestTTF-Regular.ttx | 0 .../TestTTF-Regular_non_BMP_char.ttx | 0 .../{testdata => data}/expect_keep_colr.ttx | 0 .../{testdata => data}/expect_keep_gvar.ttx | 0 .../expect_keep_gvar_notdef_outline.ttx | 0 .../{testdata => data}/expect_keep_math.ttx | 0 .../expect_no_notdef_outline_cid.ttx | 0 .../expect_no_notdef_outline_otf.ttx | 0 .../expect_no_notdef_outline_ttf.ttx | 0 Tests/subset/{testdata => data}/google_color.ttx | 0 Tests/subset/subset_test.py | 2 +- .../t1Lib/{testdata => data}/TestT1-Regular.lwfn | Bin Tests/t1Lib/{testdata => data}/TestT1-Regular.pfa | 0 Tests/t1Lib/{testdata => data}/TestT1-Regular.pfb | Bin Tests/t1Lib/t1Lib_test.py | 2 +- .../ttLib/{testdata => data}/TestOTF-Regular.otx | 0 .../ttLib/{testdata => data}/TestTTF-Regular.ttx | 0 .../{testdata => data}/TestTTFComplex-Regular.ttx | 0 .../{testdata => data}/test_woff2_metadata.xml | 0 Tests/ttLib/tables/C_F_F_test.py | 2 +- Tests/ttLib/tables/{testdata => data}/C_F_F_.bin | Bin Tests/ttLib/tables/{testdata => data}/C_F_F_.ttx | 0 Tests/ttLib/woff2_test.py | 2 +- .../{testdata => data}/VarLibTest.designspace | 0 Tests/varLib/designspace_test.py | 2 +- 256 files changed, 19 insertions(+), 19 deletions(-) rename Tests/feaLib/{testdata => data}/Attach.fea (100%) rename Tests/feaLib/{testdata => data}/Attach.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_1.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_1.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_1_zero.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_1_zero.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_2.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_2.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_2b.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_2b.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_3.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_3.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_4.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_4.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_5.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_5.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_6.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_6.ttx (100%) rename Tests/feaLib/{testdata => data}/GPOS_8.fea (100%) rename Tests/feaLib/{testdata => data}/GPOS_8.ttx (100%) rename Tests/feaLib/{testdata => data}/GSUB_2.fea (100%) rename Tests/feaLib/{testdata => data}/GSUB_2.ttx (100%) rename Tests/feaLib/{testdata => data}/GSUB_3.fea (100%) rename Tests/feaLib/{testdata => data}/GSUB_3.ttx (100%) rename Tests/feaLib/{testdata => data}/GSUB_6.fea (100%) rename Tests/feaLib/{testdata => data}/GSUB_6.ttx (100%) rename Tests/feaLib/{testdata => data}/GSUB_8.fea (100%) rename Tests/feaLib/{testdata => data}/GSUB_8.ttx (100%) rename Tests/feaLib/{testdata => data}/GlyphClassDef.fea (100%) rename Tests/feaLib/{testdata => data}/GlyphClassDef.ttx (100%) rename Tests/feaLib/{testdata => data}/LigatureCaretByIndex.fea (100%) rename Tests/feaLib/{testdata => data}/LigatureCaretByIndex.ttx (100%) rename Tests/feaLib/{testdata => data}/LigatureCaretByPos.fea (100%) rename Tests/feaLib/{testdata => data}/LigatureCaretByPos.ttx (100%) rename Tests/feaLib/{testdata => data}/baseClass.fea (100%) rename Tests/feaLib/{testdata => data}/baseClass.feax (100%) rename Tests/feaLib/{testdata => data}/bug453.fea (100%) rename Tests/feaLib/{testdata => data}/bug453.ttx (100%) rename Tests/feaLib/{testdata => data}/bug457.fea (100%) rename Tests/feaLib/{testdata => data}/bug457.ttx (100%) rename Tests/feaLib/{testdata => data}/bug463.fea (100%) rename Tests/feaLib/{testdata => data}/bug463.ttx (100%) rename Tests/feaLib/{testdata => data}/bug501.fea (100%) rename Tests/feaLib/{testdata => data}/bug501.ttx (100%) rename Tests/feaLib/{testdata => data}/bug502.fea (100%) rename Tests/feaLib/{testdata => data}/bug502.ttx (100%) rename Tests/feaLib/{testdata => data}/bug504.fea (100%) rename Tests/feaLib/{testdata => data}/bug504.ttx (100%) rename Tests/feaLib/{testdata => data}/bug505.fea (100%) rename Tests/feaLib/{testdata => data}/bug505.ttx (100%) rename Tests/feaLib/{testdata => data}/bug506.fea (100%) rename Tests/feaLib/{testdata => data}/bug506.ttx (100%) rename Tests/feaLib/{testdata => data}/bug509.fea (100%) rename Tests/feaLib/{testdata => data}/bug509.ttx (100%) rename Tests/feaLib/{testdata => data}/bug512.fea (100%) rename Tests/feaLib/{testdata => data}/bug512.ttx (100%) rename Tests/feaLib/{testdata => data}/bug568.fea (100%) rename Tests/feaLib/{testdata => data}/bug568.ttx (100%) rename Tests/feaLib/{testdata => data}/enum.fea (100%) rename Tests/feaLib/{testdata => data}/enum.ttx (100%) rename Tests/feaLib/{testdata => data}/feature_aalt.fea (100%) rename Tests/feaLib/{testdata => data}/feature_aalt.ttx (100%) rename Tests/feaLib/{testdata => data}/ignore_pos.fea (100%) rename Tests/feaLib/{testdata => data}/ignore_pos.ttx (100%) rename Tests/feaLib/{testdata => data}/include0.fea (100%) rename Tests/feaLib/{testdata => data}/include1.fea (100%) rename Tests/feaLib/{testdata => data}/include2.fea (100%) rename Tests/feaLib/{testdata => data}/include3.fea (100%) rename Tests/feaLib/{testdata => data}/include4.fea (100%) rename Tests/feaLib/{testdata => data}/include5.fea (100%) rename Tests/feaLib/{testdata => data}/include6.fea (100%) rename Tests/feaLib/{testdata => data}/includemissingfile.fea (100%) rename Tests/feaLib/{testdata => data}/includeself.fea (100%) rename Tests/feaLib/{testdata => data}/language_required.fea (100%) rename Tests/feaLib/{testdata => data}/language_required.ttx (100%) rename Tests/feaLib/{testdata => data}/lookup.fea (100%) rename Tests/feaLib/{testdata => data}/lookup.ttx (100%) rename Tests/feaLib/{testdata => data}/lookupflag.fea (100%) rename Tests/feaLib/{testdata => data}/lookupflag.ttx (100%) rename Tests/feaLib/{testdata => data}/markClass.fea (100%) rename Tests/feaLib/{testdata => data}/markClass.ttx (100%) rename Tests/feaLib/{testdata => data}/mini.fea (100%) rename Tests/feaLib/{testdata => data}/multiple_feature_blocks.fea (100%) rename Tests/feaLib/{testdata => data}/multiple_feature_blocks.ttx (100%) rename Tests/feaLib/{testdata => data}/name.fea (100%) rename Tests/feaLib/{testdata => data}/name.ttx (100%) rename Tests/feaLib/{testdata => data}/omitted_GlyphClassDef.fea (100%) rename Tests/feaLib/{testdata => data}/omitted_GlyphClassDef.ttx (100%) rename Tests/feaLib/{testdata => data}/size.fea (100%) rename Tests/feaLib/{testdata => data}/size.ttx (100%) rename Tests/feaLib/{testdata => data}/size2.fea (100%) rename Tests/feaLib/{testdata => data}/size2.ttx (100%) rename Tests/feaLib/{testdata => data}/spec10.fea (100%) rename Tests/feaLib/{testdata => data}/spec10.ttx (100%) rename Tests/feaLib/{testdata => data}/spec4h1.fea (100%) rename Tests/feaLib/{testdata => data}/spec4h1.ttx (100%) rename Tests/feaLib/{testdata => data}/spec4h2.fea (100%) rename Tests/feaLib/{testdata => data}/spec4h2.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5d1.fea (100%) rename Tests/feaLib/{testdata => data}/spec5d1.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5d2.fea (100%) rename Tests/feaLib/{testdata => data}/spec5d2.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_1.fea (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_1.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_2.fea (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_2.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_3.fea (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_3.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_4.fea (100%) rename Tests/feaLib/{testdata => data}/spec5f_ii_4.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5fi1.fea (100%) rename Tests/feaLib/{testdata => data}/spec5fi1.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5fi2.fea (100%) rename Tests/feaLib/{testdata => data}/spec5fi2.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5fi3.fea (100%) rename Tests/feaLib/{testdata => data}/spec5fi3.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5fi4.fea (100%) rename Tests/feaLib/{testdata => data}/spec5fi4.ttx (100%) rename Tests/feaLib/{testdata => data}/spec5h1.fea (100%) rename Tests/feaLib/{testdata => data}/spec5h1.ttx (100%) rename Tests/feaLib/{testdata => data}/spec6b_ii.fea (100%) rename Tests/feaLib/{testdata => data}/spec6b_ii.ttx (100%) rename Tests/feaLib/{testdata => data}/spec6d2.fea (100%) rename Tests/feaLib/{testdata => data}/spec6d2.ttx (100%) rename Tests/feaLib/{testdata => data}/spec6e.fea (100%) rename Tests/feaLib/{testdata => data}/spec6e.ttx (100%) rename Tests/feaLib/{testdata => data}/spec6f.fea (100%) rename Tests/feaLib/{testdata => data}/spec6f.ttx (100%) rename Tests/feaLib/{testdata => data}/spec6h_ii.fea (100%) rename Tests/feaLib/{testdata => data}/spec6h_ii.ttx (100%) rename Tests/feaLib/{testdata => data}/spec6h_iii_1.fea (100%) rename Tests/feaLib/{testdata => data}/spec6h_iii_1.ttx (100%) rename Tests/feaLib/{testdata => data}/spec6h_iii_3d.fea (100%) rename Tests/feaLib/{testdata => data}/spec6h_iii_3d.ttx (100%) rename Tests/feaLib/{testdata => data}/spec8a.fea (100%) rename Tests/feaLib/{testdata => data}/spec8a.ttx (100%) rename Tests/feaLib/{testdata => data}/spec8b.fea (100%) rename Tests/feaLib/{testdata => data}/spec8b.ttx (100%) rename Tests/feaLib/{testdata => data}/spec8c.fea (100%) rename Tests/feaLib/{testdata => data}/spec8c.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9a.fea (100%) rename Tests/feaLib/{testdata => data}/spec9a.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9b.fea (100%) rename Tests/feaLib/{testdata => data}/spec9b.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9c1.fea (100%) rename Tests/feaLib/{testdata => data}/spec9c1.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9c2.fea (100%) rename Tests/feaLib/{testdata => data}/spec9c2.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9c3.fea (100%) rename Tests/feaLib/{testdata => data}/spec9c3.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9d.fea (100%) rename Tests/feaLib/{testdata => data}/spec9d.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9e.fea (100%) rename Tests/feaLib/{testdata => data}/spec9e.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9f.fea (100%) rename Tests/feaLib/{testdata => data}/spec9f.ttx (100%) rename Tests/feaLib/{testdata => data}/spec9g.fea (100%) rename Tests/feaLib/{testdata => data}/spec9g.ttx (100%) rename Tests/mtiLib/{testdata => data}/featurename-backward.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/featurename-backward.txt (100%) rename Tests/mtiLib/{testdata => data}/featurename-forward.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/featurename-forward.txt (100%) rename Tests/mtiLib/{testdata => data}/lookupnames-backward.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/lookupnames-backward.txt (100%) rename Tests/mtiLib/{testdata => data}/lookupnames-forward.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/lookupnames-forward.txt (100%) rename Tests/mtiLib/{testdata => data}/mixed-toplevels.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mixed-toplevels.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/README (100%) rename Tests/mtiLib/{testdata => data}/mti/chained-glyph.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/chained-glyph.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/chained-glyph.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/chainedclass.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/chainedclass.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/chainedcoverage.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/chainedcoverage.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/cmap.ttx (100%) rename Tests/mtiLib/{testdata => data}/mti/cmap.ttx.cmap (100%) rename Tests/mtiLib/{testdata => data}/mti/cmap.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/context-glyph.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/contextclass.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/contextcoverage.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/featuretable.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefattach.ttx.GDEF (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefattach.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefclasses.ttx.GDEF (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefclasses.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefligcaret.ttx.GDEF (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefligcaret.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefmarkattach.ttx.GDEF (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefmarkattach.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefmarkfilter.ttx.GDEF (100%) rename Tests/mtiLib/{testdata => data}/mti/gdefmarkfilter.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gposcursive.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/gposcursive.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gposkernset.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/gposkernset.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gposmarktobase.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/gposmarktobase.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gpospairclass.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/gpospairclass.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gpospairglyph.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/gpospairglyph.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gpossingle.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/gpossingle.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubalternate.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubalternate.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubligature.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubligature.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubmultiple.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubmultiple.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubreversechanined.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubreversechanined.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubsingle.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/gsubsingle.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/mark-to-ligature.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/mark-to-ligature.txt (100%) rename Tests/mtiLib/{testdata => data}/mti/scripttable.ttx.GPOS (100%) rename Tests/mtiLib/{testdata => data}/mti/scripttable.ttx.GSUB (100%) rename Tests/mtiLib/{testdata => data}/mti/scripttable.txt (100%) rename Tests/subset/{testdata => data}/TestCID-Regular.ttx (100%) rename Tests/subset/{testdata => data}/TestCLR-Regular.ttx (100%) rename Tests/subset/{testdata => data}/TestGVAR.ttx (100%) rename Tests/subset/{testdata => data}/TestMATH-Regular.ttx (100%) rename Tests/subset/{testdata => data}/TestOTF-Regular.ttx (100%) rename Tests/subset/{testdata => data}/TestTTF-Regular.ttx (100%) rename Tests/subset/{testdata => data}/TestTTF-Regular_non_BMP_char.ttx (100%) rename Tests/subset/{testdata => data}/expect_keep_colr.ttx (100%) rename Tests/subset/{testdata => data}/expect_keep_gvar.ttx (100%) rename Tests/subset/{testdata => data}/expect_keep_gvar_notdef_outline.ttx (100%) rename Tests/subset/{testdata => data}/expect_keep_math.ttx (100%) rename Tests/subset/{testdata => data}/expect_no_notdef_outline_cid.ttx (100%) rename Tests/subset/{testdata => data}/expect_no_notdef_outline_otf.ttx (100%) rename Tests/subset/{testdata => data}/expect_no_notdef_outline_ttf.ttx (100%) rename Tests/subset/{testdata => data}/google_color.ttx (100%) rename Tests/t1Lib/{testdata => data}/TestT1-Regular.lwfn (100%) rename Tests/t1Lib/{testdata => data}/TestT1-Regular.pfa (100%) rename Tests/t1Lib/{testdata => data}/TestT1-Regular.pfb (100%) rename Tests/ttLib/{testdata => data}/TestOTF-Regular.otx (100%) rename Tests/ttLib/{testdata => data}/TestTTF-Regular.ttx (100%) rename Tests/ttLib/{testdata => data}/TestTTFComplex-Regular.ttx (100%) rename Tests/ttLib/{testdata => data}/test_woff2_metadata.xml (100%) rename Tests/ttLib/tables/{testdata => data}/C_F_F_.bin (100%) rename Tests/ttLib/tables/{testdata => data}/C_F_F_.ttx (100%) rename Tests/varLib/{testdata => data}/VarLibTest.designspace (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 68fa1cf56..88234ff5c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -13,10 +13,10 @@ include run-tests.sh recursive-include Doc/man/man1 *.1 recursive-include Tests *.py -recursive-include Tests testdata/*.ttx testdata/*.otx testdata/*.fea -recursive-include Tests testdata/*.feax -recursive-include Tests testdata/*.txt testdata/*.ttx.* -recursive-include Tests testdata/mti/*.txt testdata/mti/*.ttx.* -recursive-include Tests testdata/mti/*.ttx testdata/mti/README -recursive-include Tests testdata/*.lwfn testdata/*.pfa testdata/*.pfb -recursive-include Tests testdata/*.xml testdata/*.designspace testdata/*.bin +recursive-include Tests data/*.ttx data/*.otx data/*.fea +recursive-include Tests data/*.feax +recursive-include Tests data/*.txt data/*.ttx.* +recursive-include Tests data/mti/*.txt data/mti/*.ttx.* +recursive-include Tests data/mti/*.ttx data/mti/README +recursive-include Tests data/*.lwfn data/*.pfa data/*.pfb +recursive-include Tests data/*.xml data/*.designspace data/*.bin diff --git a/Tests/feaLib/builder_test.py b/Tests/feaLib/builder_test.py index 7cd972099..8f3e3eea7 100644 --- a/Tests/feaLib/builder_test.py +++ b/Tests/feaLib/builder_test.py @@ -49,7 +49,7 @@ def makeTTFont(): class BuilderTest(unittest.TestCase): - # Feature files in testdata/*.fea; output gets compared to testdata/*.ttx. + # Feature files in data/*.fea; output gets compared to data/*.ttx. TEST_FEATURE_FILES = """ Attach enum markClass language_required GlyphClassDef LigatureCaretByIndex LigatureCaretByPos @@ -86,7 +86,7 @@ class BuilderTest(unittest.TestCase): @staticmethod def getpath(testfile): path, _ = os.path.split(__file__) - return os.path.join(path, "testdata", testfile) + return os.path.join(path, "data", testfile) def temp_path(self, suffix): if not self.tempdir: diff --git a/Tests/feaLib/testdata/Attach.fea b/Tests/feaLib/data/Attach.fea similarity index 100% rename from Tests/feaLib/testdata/Attach.fea rename to Tests/feaLib/data/Attach.fea diff --git a/Tests/feaLib/testdata/Attach.ttx b/Tests/feaLib/data/Attach.ttx similarity index 100% rename from Tests/feaLib/testdata/Attach.ttx rename to Tests/feaLib/data/Attach.ttx diff --git a/Tests/feaLib/testdata/GPOS_1.fea b/Tests/feaLib/data/GPOS_1.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_1.fea rename to Tests/feaLib/data/GPOS_1.fea diff --git a/Tests/feaLib/testdata/GPOS_1.ttx b/Tests/feaLib/data/GPOS_1.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_1.ttx rename to Tests/feaLib/data/GPOS_1.ttx diff --git a/Tests/feaLib/testdata/GPOS_1_zero.fea b/Tests/feaLib/data/GPOS_1_zero.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_1_zero.fea rename to Tests/feaLib/data/GPOS_1_zero.fea diff --git a/Tests/feaLib/testdata/GPOS_1_zero.ttx b/Tests/feaLib/data/GPOS_1_zero.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_1_zero.ttx rename to Tests/feaLib/data/GPOS_1_zero.ttx diff --git a/Tests/feaLib/testdata/GPOS_2.fea b/Tests/feaLib/data/GPOS_2.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_2.fea rename to Tests/feaLib/data/GPOS_2.fea diff --git a/Tests/feaLib/testdata/GPOS_2.ttx b/Tests/feaLib/data/GPOS_2.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_2.ttx rename to Tests/feaLib/data/GPOS_2.ttx diff --git a/Tests/feaLib/testdata/GPOS_2b.fea b/Tests/feaLib/data/GPOS_2b.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_2b.fea rename to Tests/feaLib/data/GPOS_2b.fea diff --git a/Tests/feaLib/testdata/GPOS_2b.ttx b/Tests/feaLib/data/GPOS_2b.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_2b.ttx rename to Tests/feaLib/data/GPOS_2b.ttx diff --git a/Tests/feaLib/testdata/GPOS_3.fea b/Tests/feaLib/data/GPOS_3.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_3.fea rename to Tests/feaLib/data/GPOS_3.fea diff --git a/Tests/feaLib/testdata/GPOS_3.ttx b/Tests/feaLib/data/GPOS_3.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_3.ttx rename to Tests/feaLib/data/GPOS_3.ttx diff --git a/Tests/feaLib/testdata/GPOS_4.fea b/Tests/feaLib/data/GPOS_4.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_4.fea rename to Tests/feaLib/data/GPOS_4.fea diff --git a/Tests/feaLib/testdata/GPOS_4.ttx b/Tests/feaLib/data/GPOS_4.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_4.ttx rename to Tests/feaLib/data/GPOS_4.ttx diff --git a/Tests/feaLib/testdata/GPOS_5.fea b/Tests/feaLib/data/GPOS_5.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_5.fea rename to Tests/feaLib/data/GPOS_5.fea diff --git a/Tests/feaLib/testdata/GPOS_5.ttx b/Tests/feaLib/data/GPOS_5.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_5.ttx rename to Tests/feaLib/data/GPOS_5.ttx diff --git a/Tests/feaLib/testdata/GPOS_6.fea b/Tests/feaLib/data/GPOS_6.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_6.fea rename to Tests/feaLib/data/GPOS_6.fea diff --git a/Tests/feaLib/testdata/GPOS_6.ttx b/Tests/feaLib/data/GPOS_6.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_6.ttx rename to Tests/feaLib/data/GPOS_6.ttx diff --git a/Tests/feaLib/testdata/GPOS_8.fea b/Tests/feaLib/data/GPOS_8.fea similarity index 100% rename from Tests/feaLib/testdata/GPOS_8.fea rename to Tests/feaLib/data/GPOS_8.fea diff --git a/Tests/feaLib/testdata/GPOS_8.ttx b/Tests/feaLib/data/GPOS_8.ttx similarity index 100% rename from Tests/feaLib/testdata/GPOS_8.ttx rename to Tests/feaLib/data/GPOS_8.ttx diff --git a/Tests/feaLib/testdata/GSUB_2.fea b/Tests/feaLib/data/GSUB_2.fea similarity index 100% rename from Tests/feaLib/testdata/GSUB_2.fea rename to Tests/feaLib/data/GSUB_2.fea diff --git a/Tests/feaLib/testdata/GSUB_2.ttx b/Tests/feaLib/data/GSUB_2.ttx similarity index 100% rename from Tests/feaLib/testdata/GSUB_2.ttx rename to Tests/feaLib/data/GSUB_2.ttx diff --git a/Tests/feaLib/testdata/GSUB_3.fea b/Tests/feaLib/data/GSUB_3.fea similarity index 100% rename from Tests/feaLib/testdata/GSUB_3.fea rename to Tests/feaLib/data/GSUB_3.fea diff --git a/Tests/feaLib/testdata/GSUB_3.ttx b/Tests/feaLib/data/GSUB_3.ttx similarity index 100% rename from Tests/feaLib/testdata/GSUB_3.ttx rename to Tests/feaLib/data/GSUB_3.ttx diff --git a/Tests/feaLib/testdata/GSUB_6.fea b/Tests/feaLib/data/GSUB_6.fea similarity index 100% rename from Tests/feaLib/testdata/GSUB_6.fea rename to Tests/feaLib/data/GSUB_6.fea diff --git a/Tests/feaLib/testdata/GSUB_6.ttx b/Tests/feaLib/data/GSUB_6.ttx similarity index 100% rename from Tests/feaLib/testdata/GSUB_6.ttx rename to Tests/feaLib/data/GSUB_6.ttx diff --git a/Tests/feaLib/testdata/GSUB_8.fea b/Tests/feaLib/data/GSUB_8.fea similarity index 100% rename from Tests/feaLib/testdata/GSUB_8.fea rename to Tests/feaLib/data/GSUB_8.fea diff --git a/Tests/feaLib/testdata/GSUB_8.ttx b/Tests/feaLib/data/GSUB_8.ttx similarity index 100% rename from Tests/feaLib/testdata/GSUB_8.ttx rename to Tests/feaLib/data/GSUB_8.ttx diff --git a/Tests/feaLib/testdata/GlyphClassDef.fea b/Tests/feaLib/data/GlyphClassDef.fea similarity index 100% rename from Tests/feaLib/testdata/GlyphClassDef.fea rename to Tests/feaLib/data/GlyphClassDef.fea diff --git a/Tests/feaLib/testdata/GlyphClassDef.ttx b/Tests/feaLib/data/GlyphClassDef.ttx similarity index 100% rename from Tests/feaLib/testdata/GlyphClassDef.ttx rename to Tests/feaLib/data/GlyphClassDef.ttx diff --git a/Tests/feaLib/testdata/LigatureCaretByIndex.fea b/Tests/feaLib/data/LigatureCaretByIndex.fea similarity index 100% rename from Tests/feaLib/testdata/LigatureCaretByIndex.fea rename to Tests/feaLib/data/LigatureCaretByIndex.fea diff --git a/Tests/feaLib/testdata/LigatureCaretByIndex.ttx b/Tests/feaLib/data/LigatureCaretByIndex.ttx similarity index 100% rename from Tests/feaLib/testdata/LigatureCaretByIndex.ttx rename to Tests/feaLib/data/LigatureCaretByIndex.ttx diff --git a/Tests/feaLib/testdata/LigatureCaretByPos.fea b/Tests/feaLib/data/LigatureCaretByPos.fea similarity index 100% rename from Tests/feaLib/testdata/LigatureCaretByPos.fea rename to Tests/feaLib/data/LigatureCaretByPos.fea diff --git a/Tests/feaLib/testdata/LigatureCaretByPos.ttx b/Tests/feaLib/data/LigatureCaretByPos.ttx similarity index 100% rename from Tests/feaLib/testdata/LigatureCaretByPos.ttx rename to Tests/feaLib/data/LigatureCaretByPos.ttx diff --git a/Tests/feaLib/testdata/baseClass.fea b/Tests/feaLib/data/baseClass.fea similarity index 100% rename from Tests/feaLib/testdata/baseClass.fea rename to Tests/feaLib/data/baseClass.fea diff --git a/Tests/feaLib/testdata/baseClass.feax b/Tests/feaLib/data/baseClass.feax similarity index 100% rename from Tests/feaLib/testdata/baseClass.feax rename to Tests/feaLib/data/baseClass.feax diff --git a/Tests/feaLib/testdata/bug453.fea b/Tests/feaLib/data/bug453.fea similarity index 100% rename from Tests/feaLib/testdata/bug453.fea rename to Tests/feaLib/data/bug453.fea diff --git a/Tests/feaLib/testdata/bug453.ttx b/Tests/feaLib/data/bug453.ttx similarity index 100% rename from Tests/feaLib/testdata/bug453.ttx rename to Tests/feaLib/data/bug453.ttx diff --git a/Tests/feaLib/testdata/bug457.fea b/Tests/feaLib/data/bug457.fea similarity index 100% rename from Tests/feaLib/testdata/bug457.fea rename to Tests/feaLib/data/bug457.fea diff --git a/Tests/feaLib/testdata/bug457.ttx b/Tests/feaLib/data/bug457.ttx similarity index 100% rename from Tests/feaLib/testdata/bug457.ttx rename to Tests/feaLib/data/bug457.ttx diff --git a/Tests/feaLib/testdata/bug463.fea b/Tests/feaLib/data/bug463.fea similarity index 100% rename from Tests/feaLib/testdata/bug463.fea rename to Tests/feaLib/data/bug463.fea diff --git a/Tests/feaLib/testdata/bug463.ttx b/Tests/feaLib/data/bug463.ttx similarity index 100% rename from Tests/feaLib/testdata/bug463.ttx rename to Tests/feaLib/data/bug463.ttx diff --git a/Tests/feaLib/testdata/bug501.fea b/Tests/feaLib/data/bug501.fea similarity index 100% rename from Tests/feaLib/testdata/bug501.fea rename to Tests/feaLib/data/bug501.fea diff --git a/Tests/feaLib/testdata/bug501.ttx b/Tests/feaLib/data/bug501.ttx similarity index 100% rename from Tests/feaLib/testdata/bug501.ttx rename to Tests/feaLib/data/bug501.ttx diff --git a/Tests/feaLib/testdata/bug502.fea b/Tests/feaLib/data/bug502.fea similarity index 100% rename from Tests/feaLib/testdata/bug502.fea rename to Tests/feaLib/data/bug502.fea diff --git a/Tests/feaLib/testdata/bug502.ttx b/Tests/feaLib/data/bug502.ttx similarity index 100% rename from Tests/feaLib/testdata/bug502.ttx rename to Tests/feaLib/data/bug502.ttx diff --git a/Tests/feaLib/testdata/bug504.fea b/Tests/feaLib/data/bug504.fea similarity index 100% rename from Tests/feaLib/testdata/bug504.fea rename to Tests/feaLib/data/bug504.fea diff --git a/Tests/feaLib/testdata/bug504.ttx b/Tests/feaLib/data/bug504.ttx similarity index 100% rename from Tests/feaLib/testdata/bug504.ttx rename to Tests/feaLib/data/bug504.ttx diff --git a/Tests/feaLib/testdata/bug505.fea b/Tests/feaLib/data/bug505.fea similarity index 100% rename from Tests/feaLib/testdata/bug505.fea rename to Tests/feaLib/data/bug505.fea diff --git a/Tests/feaLib/testdata/bug505.ttx b/Tests/feaLib/data/bug505.ttx similarity index 100% rename from Tests/feaLib/testdata/bug505.ttx rename to Tests/feaLib/data/bug505.ttx diff --git a/Tests/feaLib/testdata/bug506.fea b/Tests/feaLib/data/bug506.fea similarity index 100% rename from Tests/feaLib/testdata/bug506.fea rename to Tests/feaLib/data/bug506.fea diff --git a/Tests/feaLib/testdata/bug506.ttx b/Tests/feaLib/data/bug506.ttx similarity index 100% rename from Tests/feaLib/testdata/bug506.ttx rename to Tests/feaLib/data/bug506.ttx diff --git a/Tests/feaLib/testdata/bug509.fea b/Tests/feaLib/data/bug509.fea similarity index 100% rename from Tests/feaLib/testdata/bug509.fea rename to Tests/feaLib/data/bug509.fea diff --git a/Tests/feaLib/testdata/bug509.ttx b/Tests/feaLib/data/bug509.ttx similarity index 100% rename from Tests/feaLib/testdata/bug509.ttx rename to Tests/feaLib/data/bug509.ttx diff --git a/Tests/feaLib/testdata/bug512.fea b/Tests/feaLib/data/bug512.fea similarity index 100% rename from Tests/feaLib/testdata/bug512.fea rename to Tests/feaLib/data/bug512.fea diff --git a/Tests/feaLib/testdata/bug512.ttx b/Tests/feaLib/data/bug512.ttx similarity index 100% rename from Tests/feaLib/testdata/bug512.ttx rename to Tests/feaLib/data/bug512.ttx diff --git a/Tests/feaLib/testdata/bug568.fea b/Tests/feaLib/data/bug568.fea similarity index 100% rename from Tests/feaLib/testdata/bug568.fea rename to Tests/feaLib/data/bug568.fea diff --git a/Tests/feaLib/testdata/bug568.ttx b/Tests/feaLib/data/bug568.ttx similarity index 100% rename from Tests/feaLib/testdata/bug568.ttx rename to Tests/feaLib/data/bug568.ttx diff --git a/Tests/feaLib/testdata/enum.fea b/Tests/feaLib/data/enum.fea similarity index 100% rename from Tests/feaLib/testdata/enum.fea rename to Tests/feaLib/data/enum.fea diff --git a/Tests/feaLib/testdata/enum.ttx b/Tests/feaLib/data/enum.ttx similarity index 100% rename from Tests/feaLib/testdata/enum.ttx rename to Tests/feaLib/data/enum.ttx diff --git a/Tests/feaLib/testdata/feature_aalt.fea b/Tests/feaLib/data/feature_aalt.fea similarity index 100% rename from Tests/feaLib/testdata/feature_aalt.fea rename to Tests/feaLib/data/feature_aalt.fea diff --git a/Tests/feaLib/testdata/feature_aalt.ttx b/Tests/feaLib/data/feature_aalt.ttx similarity index 100% rename from Tests/feaLib/testdata/feature_aalt.ttx rename to Tests/feaLib/data/feature_aalt.ttx diff --git a/Tests/feaLib/testdata/ignore_pos.fea b/Tests/feaLib/data/ignore_pos.fea similarity index 100% rename from Tests/feaLib/testdata/ignore_pos.fea rename to Tests/feaLib/data/ignore_pos.fea diff --git a/Tests/feaLib/testdata/ignore_pos.ttx b/Tests/feaLib/data/ignore_pos.ttx similarity index 100% rename from Tests/feaLib/testdata/ignore_pos.ttx rename to Tests/feaLib/data/ignore_pos.ttx diff --git a/Tests/feaLib/testdata/include0.fea b/Tests/feaLib/data/include0.fea similarity index 100% rename from Tests/feaLib/testdata/include0.fea rename to Tests/feaLib/data/include0.fea diff --git a/Tests/feaLib/testdata/include1.fea b/Tests/feaLib/data/include1.fea similarity index 100% rename from Tests/feaLib/testdata/include1.fea rename to Tests/feaLib/data/include1.fea diff --git a/Tests/feaLib/testdata/include2.fea b/Tests/feaLib/data/include2.fea similarity index 100% rename from Tests/feaLib/testdata/include2.fea rename to Tests/feaLib/data/include2.fea diff --git a/Tests/feaLib/testdata/include3.fea b/Tests/feaLib/data/include3.fea similarity index 100% rename from Tests/feaLib/testdata/include3.fea rename to Tests/feaLib/data/include3.fea diff --git a/Tests/feaLib/testdata/include4.fea b/Tests/feaLib/data/include4.fea similarity index 100% rename from Tests/feaLib/testdata/include4.fea rename to Tests/feaLib/data/include4.fea diff --git a/Tests/feaLib/testdata/include5.fea b/Tests/feaLib/data/include5.fea similarity index 100% rename from Tests/feaLib/testdata/include5.fea rename to Tests/feaLib/data/include5.fea diff --git a/Tests/feaLib/testdata/include6.fea b/Tests/feaLib/data/include6.fea similarity index 100% rename from Tests/feaLib/testdata/include6.fea rename to Tests/feaLib/data/include6.fea diff --git a/Tests/feaLib/testdata/includemissingfile.fea b/Tests/feaLib/data/includemissingfile.fea similarity index 100% rename from Tests/feaLib/testdata/includemissingfile.fea rename to Tests/feaLib/data/includemissingfile.fea diff --git a/Tests/feaLib/testdata/includeself.fea b/Tests/feaLib/data/includeself.fea similarity index 100% rename from Tests/feaLib/testdata/includeself.fea rename to Tests/feaLib/data/includeself.fea diff --git a/Tests/feaLib/testdata/language_required.fea b/Tests/feaLib/data/language_required.fea similarity index 100% rename from Tests/feaLib/testdata/language_required.fea rename to Tests/feaLib/data/language_required.fea diff --git a/Tests/feaLib/testdata/language_required.ttx b/Tests/feaLib/data/language_required.ttx similarity index 100% rename from Tests/feaLib/testdata/language_required.ttx rename to Tests/feaLib/data/language_required.ttx diff --git a/Tests/feaLib/testdata/lookup.fea b/Tests/feaLib/data/lookup.fea similarity index 100% rename from Tests/feaLib/testdata/lookup.fea rename to Tests/feaLib/data/lookup.fea diff --git a/Tests/feaLib/testdata/lookup.ttx b/Tests/feaLib/data/lookup.ttx similarity index 100% rename from Tests/feaLib/testdata/lookup.ttx rename to Tests/feaLib/data/lookup.ttx diff --git a/Tests/feaLib/testdata/lookupflag.fea b/Tests/feaLib/data/lookupflag.fea similarity index 100% rename from Tests/feaLib/testdata/lookupflag.fea rename to Tests/feaLib/data/lookupflag.fea diff --git a/Tests/feaLib/testdata/lookupflag.ttx b/Tests/feaLib/data/lookupflag.ttx similarity index 100% rename from Tests/feaLib/testdata/lookupflag.ttx rename to Tests/feaLib/data/lookupflag.ttx diff --git a/Tests/feaLib/testdata/markClass.fea b/Tests/feaLib/data/markClass.fea similarity index 100% rename from Tests/feaLib/testdata/markClass.fea rename to Tests/feaLib/data/markClass.fea diff --git a/Tests/feaLib/testdata/markClass.ttx b/Tests/feaLib/data/markClass.ttx similarity index 100% rename from Tests/feaLib/testdata/markClass.ttx rename to Tests/feaLib/data/markClass.ttx diff --git a/Tests/feaLib/testdata/mini.fea b/Tests/feaLib/data/mini.fea similarity index 100% rename from Tests/feaLib/testdata/mini.fea rename to Tests/feaLib/data/mini.fea diff --git a/Tests/feaLib/testdata/multiple_feature_blocks.fea b/Tests/feaLib/data/multiple_feature_blocks.fea similarity index 100% rename from Tests/feaLib/testdata/multiple_feature_blocks.fea rename to Tests/feaLib/data/multiple_feature_blocks.fea diff --git a/Tests/feaLib/testdata/multiple_feature_blocks.ttx b/Tests/feaLib/data/multiple_feature_blocks.ttx similarity index 100% rename from Tests/feaLib/testdata/multiple_feature_blocks.ttx rename to Tests/feaLib/data/multiple_feature_blocks.ttx diff --git a/Tests/feaLib/testdata/name.fea b/Tests/feaLib/data/name.fea similarity index 100% rename from Tests/feaLib/testdata/name.fea rename to Tests/feaLib/data/name.fea diff --git a/Tests/feaLib/testdata/name.ttx b/Tests/feaLib/data/name.ttx similarity index 100% rename from Tests/feaLib/testdata/name.ttx rename to Tests/feaLib/data/name.ttx diff --git a/Tests/feaLib/testdata/omitted_GlyphClassDef.fea b/Tests/feaLib/data/omitted_GlyphClassDef.fea similarity index 100% rename from Tests/feaLib/testdata/omitted_GlyphClassDef.fea rename to Tests/feaLib/data/omitted_GlyphClassDef.fea diff --git a/Tests/feaLib/testdata/omitted_GlyphClassDef.ttx b/Tests/feaLib/data/omitted_GlyphClassDef.ttx similarity index 100% rename from Tests/feaLib/testdata/omitted_GlyphClassDef.ttx rename to Tests/feaLib/data/omitted_GlyphClassDef.ttx diff --git a/Tests/feaLib/testdata/size.fea b/Tests/feaLib/data/size.fea similarity index 100% rename from Tests/feaLib/testdata/size.fea rename to Tests/feaLib/data/size.fea diff --git a/Tests/feaLib/testdata/size.ttx b/Tests/feaLib/data/size.ttx similarity index 100% rename from Tests/feaLib/testdata/size.ttx rename to Tests/feaLib/data/size.ttx diff --git a/Tests/feaLib/testdata/size2.fea b/Tests/feaLib/data/size2.fea similarity index 100% rename from Tests/feaLib/testdata/size2.fea rename to Tests/feaLib/data/size2.fea diff --git a/Tests/feaLib/testdata/size2.ttx b/Tests/feaLib/data/size2.ttx similarity index 100% rename from Tests/feaLib/testdata/size2.ttx rename to Tests/feaLib/data/size2.ttx diff --git a/Tests/feaLib/testdata/spec10.fea b/Tests/feaLib/data/spec10.fea similarity index 100% rename from Tests/feaLib/testdata/spec10.fea rename to Tests/feaLib/data/spec10.fea diff --git a/Tests/feaLib/testdata/spec10.ttx b/Tests/feaLib/data/spec10.ttx similarity index 100% rename from Tests/feaLib/testdata/spec10.ttx rename to Tests/feaLib/data/spec10.ttx diff --git a/Tests/feaLib/testdata/spec4h1.fea b/Tests/feaLib/data/spec4h1.fea similarity index 100% rename from Tests/feaLib/testdata/spec4h1.fea rename to Tests/feaLib/data/spec4h1.fea diff --git a/Tests/feaLib/testdata/spec4h1.ttx b/Tests/feaLib/data/spec4h1.ttx similarity index 100% rename from Tests/feaLib/testdata/spec4h1.ttx rename to Tests/feaLib/data/spec4h1.ttx diff --git a/Tests/feaLib/testdata/spec4h2.fea b/Tests/feaLib/data/spec4h2.fea similarity index 100% rename from Tests/feaLib/testdata/spec4h2.fea rename to Tests/feaLib/data/spec4h2.fea diff --git a/Tests/feaLib/testdata/spec4h2.ttx b/Tests/feaLib/data/spec4h2.ttx similarity index 100% rename from Tests/feaLib/testdata/spec4h2.ttx rename to Tests/feaLib/data/spec4h2.ttx diff --git a/Tests/feaLib/testdata/spec5d1.fea b/Tests/feaLib/data/spec5d1.fea similarity index 100% rename from Tests/feaLib/testdata/spec5d1.fea rename to Tests/feaLib/data/spec5d1.fea diff --git a/Tests/feaLib/testdata/spec5d1.ttx b/Tests/feaLib/data/spec5d1.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5d1.ttx rename to Tests/feaLib/data/spec5d1.ttx diff --git a/Tests/feaLib/testdata/spec5d2.fea b/Tests/feaLib/data/spec5d2.fea similarity index 100% rename from Tests/feaLib/testdata/spec5d2.fea rename to Tests/feaLib/data/spec5d2.fea diff --git a/Tests/feaLib/testdata/spec5d2.ttx b/Tests/feaLib/data/spec5d2.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5d2.ttx rename to Tests/feaLib/data/spec5d2.ttx diff --git a/Tests/feaLib/testdata/spec5f_ii_1.fea b/Tests/feaLib/data/spec5f_ii_1.fea similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_1.fea rename to Tests/feaLib/data/spec5f_ii_1.fea diff --git a/Tests/feaLib/testdata/spec5f_ii_1.ttx b/Tests/feaLib/data/spec5f_ii_1.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_1.ttx rename to Tests/feaLib/data/spec5f_ii_1.ttx diff --git a/Tests/feaLib/testdata/spec5f_ii_2.fea b/Tests/feaLib/data/spec5f_ii_2.fea similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_2.fea rename to Tests/feaLib/data/spec5f_ii_2.fea diff --git a/Tests/feaLib/testdata/spec5f_ii_2.ttx b/Tests/feaLib/data/spec5f_ii_2.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_2.ttx rename to Tests/feaLib/data/spec5f_ii_2.ttx diff --git a/Tests/feaLib/testdata/spec5f_ii_3.fea b/Tests/feaLib/data/spec5f_ii_3.fea similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_3.fea rename to Tests/feaLib/data/spec5f_ii_3.fea diff --git a/Tests/feaLib/testdata/spec5f_ii_3.ttx b/Tests/feaLib/data/spec5f_ii_3.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_3.ttx rename to Tests/feaLib/data/spec5f_ii_3.ttx diff --git a/Tests/feaLib/testdata/spec5f_ii_4.fea b/Tests/feaLib/data/spec5f_ii_4.fea similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_4.fea rename to Tests/feaLib/data/spec5f_ii_4.fea diff --git a/Tests/feaLib/testdata/spec5f_ii_4.ttx b/Tests/feaLib/data/spec5f_ii_4.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5f_ii_4.ttx rename to Tests/feaLib/data/spec5f_ii_4.ttx diff --git a/Tests/feaLib/testdata/spec5fi1.fea b/Tests/feaLib/data/spec5fi1.fea similarity index 100% rename from Tests/feaLib/testdata/spec5fi1.fea rename to Tests/feaLib/data/spec5fi1.fea diff --git a/Tests/feaLib/testdata/spec5fi1.ttx b/Tests/feaLib/data/spec5fi1.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5fi1.ttx rename to Tests/feaLib/data/spec5fi1.ttx diff --git a/Tests/feaLib/testdata/spec5fi2.fea b/Tests/feaLib/data/spec5fi2.fea similarity index 100% rename from Tests/feaLib/testdata/spec5fi2.fea rename to Tests/feaLib/data/spec5fi2.fea diff --git a/Tests/feaLib/testdata/spec5fi2.ttx b/Tests/feaLib/data/spec5fi2.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5fi2.ttx rename to Tests/feaLib/data/spec5fi2.ttx diff --git a/Tests/feaLib/testdata/spec5fi3.fea b/Tests/feaLib/data/spec5fi3.fea similarity index 100% rename from Tests/feaLib/testdata/spec5fi3.fea rename to Tests/feaLib/data/spec5fi3.fea diff --git a/Tests/feaLib/testdata/spec5fi3.ttx b/Tests/feaLib/data/spec5fi3.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5fi3.ttx rename to Tests/feaLib/data/spec5fi3.ttx diff --git a/Tests/feaLib/testdata/spec5fi4.fea b/Tests/feaLib/data/spec5fi4.fea similarity index 100% rename from Tests/feaLib/testdata/spec5fi4.fea rename to Tests/feaLib/data/spec5fi4.fea diff --git a/Tests/feaLib/testdata/spec5fi4.ttx b/Tests/feaLib/data/spec5fi4.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5fi4.ttx rename to Tests/feaLib/data/spec5fi4.ttx diff --git a/Tests/feaLib/testdata/spec5h1.fea b/Tests/feaLib/data/spec5h1.fea similarity index 100% rename from Tests/feaLib/testdata/spec5h1.fea rename to Tests/feaLib/data/spec5h1.fea diff --git a/Tests/feaLib/testdata/spec5h1.ttx b/Tests/feaLib/data/spec5h1.ttx similarity index 100% rename from Tests/feaLib/testdata/spec5h1.ttx rename to Tests/feaLib/data/spec5h1.ttx diff --git a/Tests/feaLib/testdata/spec6b_ii.fea b/Tests/feaLib/data/spec6b_ii.fea similarity index 100% rename from Tests/feaLib/testdata/spec6b_ii.fea rename to Tests/feaLib/data/spec6b_ii.fea diff --git a/Tests/feaLib/testdata/spec6b_ii.ttx b/Tests/feaLib/data/spec6b_ii.ttx similarity index 100% rename from Tests/feaLib/testdata/spec6b_ii.ttx rename to Tests/feaLib/data/spec6b_ii.ttx diff --git a/Tests/feaLib/testdata/spec6d2.fea b/Tests/feaLib/data/spec6d2.fea similarity index 100% rename from Tests/feaLib/testdata/spec6d2.fea rename to Tests/feaLib/data/spec6d2.fea diff --git a/Tests/feaLib/testdata/spec6d2.ttx b/Tests/feaLib/data/spec6d2.ttx similarity index 100% rename from Tests/feaLib/testdata/spec6d2.ttx rename to Tests/feaLib/data/spec6d2.ttx diff --git a/Tests/feaLib/testdata/spec6e.fea b/Tests/feaLib/data/spec6e.fea similarity index 100% rename from Tests/feaLib/testdata/spec6e.fea rename to Tests/feaLib/data/spec6e.fea diff --git a/Tests/feaLib/testdata/spec6e.ttx b/Tests/feaLib/data/spec6e.ttx similarity index 100% rename from Tests/feaLib/testdata/spec6e.ttx rename to Tests/feaLib/data/spec6e.ttx diff --git a/Tests/feaLib/testdata/spec6f.fea b/Tests/feaLib/data/spec6f.fea similarity index 100% rename from Tests/feaLib/testdata/spec6f.fea rename to Tests/feaLib/data/spec6f.fea diff --git a/Tests/feaLib/testdata/spec6f.ttx b/Tests/feaLib/data/spec6f.ttx similarity index 100% rename from Tests/feaLib/testdata/spec6f.ttx rename to Tests/feaLib/data/spec6f.ttx diff --git a/Tests/feaLib/testdata/spec6h_ii.fea b/Tests/feaLib/data/spec6h_ii.fea similarity index 100% rename from Tests/feaLib/testdata/spec6h_ii.fea rename to Tests/feaLib/data/spec6h_ii.fea diff --git a/Tests/feaLib/testdata/spec6h_ii.ttx b/Tests/feaLib/data/spec6h_ii.ttx similarity index 100% rename from Tests/feaLib/testdata/spec6h_ii.ttx rename to Tests/feaLib/data/spec6h_ii.ttx diff --git a/Tests/feaLib/testdata/spec6h_iii_1.fea b/Tests/feaLib/data/spec6h_iii_1.fea similarity index 100% rename from Tests/feaLib/testdata/spec6h_iii_1.fea rename to Tests/feaLib/data/spec6h_iii_1.fea diff --git a/Tests/feaLib/testdata/spec6h_iii_1.ttx b/Tests/feaLib/data/spec6h_iii_1.ttx similarity index 100% rename from Tests/feaLib/testdata/spec6h_iii_1.ttx rename to Tests/feaLib/data/spec6h_iii_1.ttx diff --git a/Tests/feaLib/testdata/spec6h_iii_3d.fea b/Tests/feaLib/data/spec6h_iii_3d.fea similarity index 100% rename from Tests/feaLib/testdata/spec6h_iii_3d.fea rename to Tests/feaLib/data/spec6h_iii_3d.fea diff --git a/Tests/feaLib/testdata/spec6h_iii_3d.ttx b/Tests/feaLib/data/spec6h_iii_3d.ttx similarity index 100% rename from Tests/feaLib/testdata/spec6h_iii_3d.ttx rename to Tests/feaLib/data/spec6h_iii_3d.ttx diff --git a/Tests/feaLib/testdata/spec8a.fea b/Tests/feaLib/data/spec8a.fea similarity index 100% rename from Tests/feaLib/testdata/spec8a.fea rename to Tests/feaLib/data/spec8a.fea diff --git a/Tests/feaLib/testdata/spec8a.ttx b/Tests/feaLib/data/spec8a.ttx similarity index 100% rename from Tests/feaLib/testdata/spec8a.ttx rename to Tests/feaLib/data/spec8a.ttx diff --git a/Tests/feaLib/testdata/spec8b.fea b/Tests/feaLib/data/spec8b.fea similarity index 100% rename from Tests/feaLib/testdata/spec8b.fea rename to Tests/feaLib/data/spec8b.fea diff --git a/Tests/feaLib/testdata/spec8b.ttx b/Tests/feaLib/data/spec8b.ttx similarity index 100% rename from Tests/feaLib/testdata/spec8b.ttx rename to Tests/feaLib/data/spec8b.ttx diff --git a/Tests/feaLib/testdata/spec8c.fea b/Tests/feaLib/data/spec8c.fea similarity index 100% rename from Tests/feaLib/testdata/spec8c.fea rename to Tests/feaLib/data/spec8c.fea diff --git a/Tests/feaLib/testdata/spec8c.ttx b/Tests/feaLib/data/spec8c.ttx similarity index 100% rename from Tests/feaLib/testdata/spec8c.ttx rename to Tests/feaLib/data/spec8c.ttx diff --git a/Tests/feaLib/testdata/spec9a.fea b/Tests/feaLib/data/spec9a.fea similarity index 100% rename from Tests/feaLib/testdata/spec9a.fea rename to Tests/feaLib/data/spec9a.fea diff --git a/Tests/feaLib/testdata/spec9a.ttx b/Tests/feaLib/data/spec9a.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9a.ttx rename to Tests/feaLib/data/spec9a.ttx diff --git a/Tests/feaLib/testdata/spec9b.fea b/Tests/feaLib/data/spec9b.fea similarity index 100% rename from Tests/feaLib/testdata/spec9b.fea rename to Tests/feaLib/data/spec9b.fea diff --git a/Tests/feaLib/testdata/spec9b.ttx b/Tests/feaLib/data/spec9b.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9b.ttx rename to Tests/feaLib/data/spec9b.ttx diff --git a/Tests/feaLib/testdata/spec9c1.fea b/Tests/feaLib/data/spec9c1.fea similarity index 100% rename from Tests/feaLib/testdata/spec9c1.fea rename to Tests/feaLib/data/spec9c1.fea diff --git a/Tests/feaLib/testdata/spec9c1.ttx b/Tests/feaLib/data/spec9c1.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9c1.ttx rename to Tests/feaLib/data/spec9c1.ttx diff --git a/Tests/feaLib/testdata/spec9c2.fea b/Tests/feaLib/data/spec9c2.fea similarity index 100% rename from Tests/feaLib/testdata/spec9c2.fea rename to Tests/feaLib/data/spec9c2.fea diff --git a/Tests/feaLib/testdata/spec9c2.ttx b/Tests/feaLib/data/spec9c2.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9c2.ttx rename to Tests/feaLib/data/spec9c2.ttx diff --git a/Tests/feaLib/testdata/spec9c3.fea b/Tests/feaLib/data/spec9c3.fea similarity index 100% rename from Tests/feaLib/testdata/spec9c3.fea rename to Tests/feaLib/data/spec9c3.fea diff --git a/Tests/feaLib/testdata/spec9c3.ttx b/Tests/feaLib/data/spec9c3.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9c3.ttx rename to Tests/feaLib/data/spec9c3.ttx diff --git a/Tests/feaLib/testdata/spec9d.fea b/Tests/feaLib/data/spec9d.fea similarity index 100% rename from Tests/feaLib/testdata/spec9d.fea rename to Tests/feaLib/data/spec9d.fea diff --git a/Tests/feaLib/testdata/spec9d.ttx b/Tests/feaLib/data/spec9d.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9d.ttx rename to Tests/feaLib/data/spec9d.ttx diff --git a/Tests/feaLib/testdata/spec9e.fea b/Tests/feaLib/data/spec9e.fea similarity index 100% rename from Tests/feaLib/testdata/spec9e.fea rename to Tests/feaLib/data/spec9e.fea diff --git a/Tests/feaLib/testdata/spec9e.ttx b/Tests/feaLib/data/spec9e.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9e.ttx rename to Tests/feaLib/data/spec9e.ttx diff --git a/Tests/feaLib/testdata/spec9f.fea b/Tests/feaLib/data/spec9f.fea similarity index 100% rename from Tests/feaLib/testdata/spec9f.fea rename to Tests/feaLib/data/spec9f.fea diff --git a/Tests/feaLib/testdata/spec9f.ttx b/Tests/feaLib/data/spec9f.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9f.ttx rename to Tests/feaLib/data/spec9f.ttx diff --git a/Tests/feaLib/testdata/spec9g.fea b/Tests/feaLib/data/spec9g.fea similarity index 100% rename from Tests/feaLib/testdata/spec9g.fea rename to Tests/feaLib/data/spec9g.fea diff --git a/Tests/feaLib/testdata/spec9g.ttx b/Tests/feaLib/data/spec9g.ttx similarity index 100% rename from Tests/feaLib/testdata/spec9g.ttx rename to Tests/feaLib/data/spec9g.ttx diff --git a/Tests/feaLib/lexer_test.py b/Tests/feaLib/lexer_test.py index 31e3c1015..7e4c249f9 100644 --- a/Tests/feaLib/lexer_test.py +++ b/Tests/feaLib/lexer_test.py @@ -130,7 +130,7 @@ class IncludingLexerTest(unittest.TestCase): @staticmethod def getpath(filename): path, _ = os.path.split(__file__) - return os.path.join(path, "testdata", filename) + return os.path.join(path, "data", filename) def test_include(self): lexer = IncludingLexer(self.getpath("include4.fea")) diff --git a/Tests/feaLib/parser_test.py b/Tests/feaLib/parser_test.py index ebfd52452..4fa22371a 100644 --- a/Tests/feaLib/parser_test.py +++ b/Tests/feaLib/parser_test.py @@ -1281,7 +1281,7 @@ class ParserTest(unittest.TestCase): @staticmethod def getpath(testfile): path, _ = os.path.split(__file__) - return os.path.join(path, "testdata", testfile) + return os.path.join(path, "data", testfile) class SymbolTableTest(unittest.TestCase): diff --git a/Tests/mtiLib/testdata/featurename-backward.ttx.GSUB b/Tests/mtiLib/data/featurename-backward.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/featurename-backward.ttx.GSUB rename to Tests/mtiLib/data/featurename-backward.ttx.GSUB diff --git a/Tests/mtiLib/testdata/featurename-backward.txt b/Tests/mtiLib/data/featurename-backward.txt similarity index 100% rename from Tests/mtiLib/testdata/featurename-backward.txt rename to Tests/mtiLib/data/featurename-backward.txt diff --git a/Tests/mtiLib/testdata/featurename-forward.ttx.GSUB b/Tests/mtiLib/data/featurename-forward.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/featurename-forward.ttx.GSUB rename to Tests/mtiLib/data/featurename-forward.ttx.GSUB diff --git a/Tests/mtiLib/testdata/featurename-forward.txt b/Tests/mtiLib/data/featurename-forward.txt similarity index 100% rename from Tests/mtiLib/testdata/featurename-forward.txt rename to Tests/mtiLib/data/featurename-forward.txt diff --git a/Tests/mtiLib/testdata/lookupnames-backward.ttx.GSUB b/Tests/mtiLib/data/lookupnames-backward.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/lookupnames-backward.ttx.GSUB rename to Tests/mtiLib/data/lookupnames-backward.ttx.GSUB diff --git a/Tests/mtiLib/testdata/lookupnames-backward.txt b/Tests/mtiLib/data/lookupnames-backward.txt similarity index 100% rename from Tests/mtiLib/testdata/lookupnames-backward.txt rename to Tests/mtiLib/data/lookupnames-backward.txt diff --git a/Tests/mtiLib/testdata/lookupnames-forward.ttx.GSUB b/Tests/mtiLib/data/lookupnames-forward.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/lookupnames-forward.ttx.GSUB rename to Tests/mtiLib/data/lookupnames-forward.ttx.GSUB diff --git a/Tests/mtiLib/testdata/lookupnames-forward.txt b/Tests/mtiLib/data/lookupnames-forward.txt similarity index 100% rename from Tests/mtiLib/testdata/lookupnames-forward.txt rename to Tests/mtiLib/data/lookupnames-forward.txt diff --git a/Tests/mtiLib/testdata/mixed-toplevels.ttx.GSUB b/Tests/mtiLib/data/mixed-toplevels.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mixed-toplevels.ttx.GSUB rename to Tests/mtiLib/data/mixed-toplevels.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mixed-toplevels.txt b/Tests/mtiLib/data/mixed-toplevels.txt similarity index 100% rename from Tests/mtiLib/testdata/mixed-toplevels.txt rename to Tests/mtiLib/data/mixed-toplevels.txt diff --git a/Tests/mtiLib/testdata/mti/README b/Tests/mtiLib/data/mti/README similarity index 100% rename from Tests/mtiLib/testdata/mti/README rename to Tests/mtiLib/data/mti/README diff --git a/Tests/mtiLib/testdata/mti/chained-glyph.ttx.GPOS b/Tests/mtiLib/data/mti/chained-glyph.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/chained-glyph.ttx.GPOS rename to Tests/mtiLib/data/mti/chained-glyph.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/chained-glyph.ttx.GSUB b/Tests/mtiLib/data/mti/chained-glyph.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/chained-glyph.ttx.GSUB rename to Tests/mtiLib/data/mti/chained-glyph.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/chained-glyph.txt b/Tests/mtiLib/data/mti/chained-glyph.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/chained-glyph.txt rename to Tests/mtiLib/data/mti/chained-glyph.txt diff --git a/Tests/mtiLib/testdata/mti/chainedclass.ttx.GSUB b/Tests/mtiLib/data/mti/chainedclass.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/chainedclass.ttx.GSUB rename to Tests/mtiLib/data/mti/chainedclass.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/chainedclass.txt b/Tests/mtiLib/data/mti/chainedclass.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/chainedclass.txt rename to Tests/mtiLib/data/mti/chainedclass.txt diff --git a/Tests/mtiLib/testdata/mti/chainedcoverage.ttx.GSUB b/Tests/mtiLib/data/mti/chainedcoverage.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/chainedcoverage.ttx.GSUB rename to Tests/mtiLib/data/mti/chainedcoverage.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/chainedcoverage.txt b/Tests/mtiLib/data/mti/chainedcoverage.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/chainedcoverage.txt rename to Tests/mtiLib/data/mti/chainedcoverage.txt diff --git a/Tests/mtiLib/testdata/mti/cmap.ttx b/Tests/mtiLib/data/mti/cmap.ttx similarity index 100% rename from Tests/mtiLib/testdata/mti/cmap.ttx rename to Tests/mtiLib/data/mti/cmap.ttx diff --git a/Tests/mtiLib/testdata/mti/cmap.ttx.cmap b/Tests/mtiLib/data/mti/cmap.ttx.cmap similarity index 100% rename from Tests/mtiLib/testdata/mti/cmap.ttx.cmap rename to Tests/mtiLib/data/mti/cmap.ttx.cmap diff --git a/Tests/mtiLib/testdata/mti/cmap.txt b/Tests/mtiLib/data/mti/cmap.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/cmap.txt rename to Tests/mtiLib/data/mti/cmap.txt diff --git a/Tests/mtiLib/testdata/mti/context-glyph.txt b/Tests/mtiLib/data/mti/context-glyph.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/context-glyph.txt rename to Tests/mtiLib/data/mti/context-glyph.txt diff --git a/Tests/mtiLib/testdata/mti/contextclass.txt b/Tests/mtiLib/data/mti/contextclass.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/contextclass.txt rename to Tests/mtiLib/data/mti/contextclass.txt diff --git a/Tests/mtiLib/testdata/mti/contextcoverage.txt b/Tests/mtiLib/data/mti/contextcoverage.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/contextcoverage.txt rename to Tests/mtiLib/data/mti/contextcoverage.txt diff --git a/Tests/mtiLib/testdata/mti/featuretable.txt b/Tests/mtiLib/data/mti/featuretable.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/featuretable.txt rename to Tests/mtiLib/data/mti/featuretable.txt diff --git a/Tests/mtiLib/testdata/mti/gdefattach.ttx.GDEF b/Tests/mtiLib/data/mti/gdefattach.ttx.GDEF similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefattach.ttx.GDEF rename to Tests/mtiLib/data/mti/gdefattach.ttx.GDEF diff --git a/Tests/mtiLib/testdata/mti/gdefattach.txt b/Tests/mtiLib/data/mti/gdefattach.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefattach.txt rename to Tests/mtiLib/data/mti/gdefattach.txt diff --git a/Tests/mtiLib/testdata/mti/gdefclasses.ttx.GDEF b/Tests/mtiLib/data/mti/gdefclasses.ttx.GDEF similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefclasses.ttx.GDEF rename to Tests/mtiLib/data/mti/gdefclasses.ttx.GDEF diff --git a/Tests/mtiLib/testdata/mti/gdefclasses.txt b/Tests/mtiLib/data/mti/gdefclasses.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefclasses.txt rename to Tests/mtiLib/data/mti/gdefclasses.txt diff --git a/Tests/mtiLib/testdata/mti/gdefligcaret.ttx.GDEF b/Tests/mtiLib/data/mti/gdefligcaret.ttx.GDEF similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefligcaret.ttx.GDEF rename to Tests/mtiLib/data/mti/gdefligcaret.ttx.GDEF diff --git a/Tests/mtiLib/testdata/mti/gdefligcaret.txt b/Tests/mtiLib/data/mti/gdefligcaret.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefligcaret.txt rename to Tests/mtiLib/data/mti/gdefligcaret.txt diff --git a/Tests/mtiLib/testdata/mti/gdefmarkattach.ttx.GDEF b/Tests/mtiLib/data/mti/gdefmarkattach.ttx.GDEF similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefmarkattach.ttx.GDEF rename to Tests/mtiLib/data/mti/gdefmarkattach.ttx.GDEF diff --git a/Tests/mtiLib/testdata/mti/gdefmarkattach.txt b/Tests/mtiLib/data/mti/gdefmarkattach.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefmarkattach.txt rename to Tests/mtiLib/data/mti/gdefmarkattach.txt diff --git a/Tests/mtiLib/testdata/mti/gdefmarkfilter.ttx.GDEF b/Tests/mtiLib/data/mti/gdefmarkfilter.ttx.GDEF similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefmarkfilter.ttx.GDEF rename to Tests/mtiLib/data/mti/gdefmarkfilter.ttx.GDEF diff --git a/Tests/mtiLib/testdata/mti/gdefmarkfilter.txt b/Tests/mtiLib/data/mti/gdefmarkfilter.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gdefmarkfilter.txt rename to Tests/mtiLib/data/mti/gdefmarkfilter.txt diff --git a/Tests/mtiLib/testdata/mti/gposcursive.ttx.GPOS b/Tests/mtiLib/data/mti/gposcursive.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/gposcursive.ttx.GPOS rename to Tests/mtiLib/data/mti/gposcursive.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/gposcursive.txt b/Tests/mtiLib/data/mti/gposcursive.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gposcursive.txt rename to Tests/mtiLib/data/mti/gposcursive.txt diff --git a/Tests/mtiLib/testdata/mti/gposkernset.ttx.GPOS b/Tests/mtiLib/data/mti/gposkernset.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/gposkernset.ttx.GPOS rename to Tests/mtiLib/data/mti/gposkernset.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/gposkernset.txt b/Tests/mtiLib/data/mti/gposkernset.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gposkernset.txt rename to Tests/mtiLib/data/mti/gposkernset.txt diff --git a/Tests/mtiLib/testdata/mti/gposmarktobase.ttx.GPOS b/Tests/mtiLib/data/mti/gposmarktobase.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/gposmarktobase.ttx.GPOS rename to Tests/mtiLib/data/mti/gposmarktobase.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/gposmarktobase.txt b/Tests/mtiLib/data/mti/gposmarktobase.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gposmarktobase.txt rename to Tests/mtiLib/data/mti/gposmarktobase.txt diff --git a/Tests/mtiLib/testdata/mti/gpospairclass.ttx.GPOS b/Tests/mtiLib/data/mti/gpospairclass.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/gpospairclass.ttx.GPOS rename to Tests/mtiLib/data/mti/gpospairclass.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/gpospairclass.txt b/Tests/mtiLib/data/mti/gpospairclass.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gpospairclass.txt rename to Tests/mtiLib/data/mti/gpospairclass.txt diff --git a/Tests/mtiLib/testdata/mti/gpospairglyph.ttx.GPOS b/Tests/mtiLib/data/mti/gpospairglyph.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/gpospairglyph.ttx.GPOS rename to Tests/mtiLib/data/mti/gpospairglyph.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/gpospairglyph.txt b/Tests/mtiLib/data/mti/gpospairglyph.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gpospairglyph.txt rename to Tests/mtiLib/data/mti/gpospairglyph.txt diff --git a/Tests/mtiLib/testdata/mti/gpossingle.ttx.GPOS b/Tests/mtiLib/data/mti/gpossingle.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/gpossingle.ttx.GPOS rename to Tests/mtiLib/data/mti/gpossingle.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/gpossingle.txt b/Tests/mtiLib/data/mti/gpossingle.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gpossingle.txt rename to Tests/mtiLib/data/mti/gpossingle.txt diff --git a/Tests/mtiLib/testdata/mti/gsubalternate.ttx.GSUB b/Tests/mtiLib/data/mti/gsubalternate.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubalternate.ttx.GSUB rename to Tests/mtiLib/data/mti/gsubalternate.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/gsubalternate.txt b/Tests/mtiLib/data/mti/gsubalternate.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubalternate.txt rename to Tests/mtiLib/data/mti/gsubalternate.txt diff --git a/Tests/mtiLib/testdata/mti/gsubligature.ttx.GSUB b/Tests/mtiLib/data/mti/gsubligature.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubligature.ttx.GSUB rename to Tests/mtiLib/data/mti/gsubligature.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/gsubligature.txt b/Tests/mtiLib/data/mti/gsubligature.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubligature.txt rename to Tests/mtiLib/data/mti/gsubligature.txt diff --git a/Tests/mtiLib/testdata/mti/gsubmultiple.ttx.GSUB b/Tests/mtiLib/data/mti/gsubmultiple.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubmultiple.ttx.GSUB rename to Tests/mtiLib/data/mti/gsubmultiple.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/gsubmultiple.txt b/Tests/mtiLib/data/mti/gsubmultiple.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubmultiple.txt rename to Tests/mtiLib/data/mti/gsubmultiple.txt diff --git a/Tests/mtiLib/testdata/mti/gsubreversechanined.ttx.GSUB b/Tests/mtiLib/data/mti/gsubreversechanined.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubreversechanined.ttx.GSUB rename to Tests/mtiLib/data/mti/gsubreversechanined.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/gsubreversechanined.txt b/Tests/mtiLib/data/mti/gsubreversechanined.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubreversechanined.txt rename to Tests/mtiLib/data/mti/gsubreversechanined.txt diff --git a/Tests/mtiLib/testdata/mti/gsubsingle.ttx.GSUB b/Tests/mtiLib/data/mti/gsubsingle.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubsingle.ttx.GSUB rename to Tests/mtiLib/data/mti/gsubsingle.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/gsubsingle.txt b/Tests/mtiLib/data/mti/gsubsingle.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/gsubsingle.txt rename to Tests/mtiLib/data/mti/gsubsingle.txt diff --git a/Tests/mtiLib/testdata/mti/mark-to-ligature.ttx.GPOS b/Tests/mtiLib/data/mti/mark-to-ligature.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/mark-to-ligature.ttx.GPOS rename to Tests/mtiLib/data/mti/mark-to-ligature.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/mark-to-ligature.txt b/Tests/mtiLib/data/mti/mark-to-ligature.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/mark-to-ligature.txt rename to Tests/mtiLib/data/mti/mark-to-ligature.txt diff --git a/Tests/mtiLib/testdata/mti/scripttable.ttx.GPOS b/Tests/mtiLib/data/mti/scripttable.ttx.GPOS similarity index 100% rename from Tests/mtiLib/testdata/mti/scripttable.ttx.GPOS rename to Tests/mtiLib/data/mti/scripttable.ttx.GPOS diff --git a/Tests/mtiLib/testdata/mti/scripttable.ttx.GSUB b/Tests/mtiLib/data/mti/scripttable.ttx.GSUB similarity index 100% rename from Tests/mtiLib/testdata/mti/scripttable.ttx.GSUB rename to Tests/mtiLib/data/mti/scripttable.ttx.GSUB diff --git a/Tests/mtiLib/testdata/mti/scripttable.txt b/Tests/mtiLib/data/mti/scripttable.txt similarity index 100% rename from Tests/mtiLib/testdata/mti/scripttable.txt rename to Tests/mtiLib/data/mti/scripttable.txt diff --git a/Tests/mtiLib/mti_test.py b/Tests/mtiLib/mti_test.py index ce9e6e67b..491682868 100644 --- a/Tests/mtiLib/mti_test.py +++ b/Tests/mtiLib/mti_test.py @@ -75,7 +75,7 @@ class MtiTest(unittest.TestCase): 'exclam', 'quotedbl', 'numbersign', ] - # Feature files in testdata/*.txt; output gets compared to testdata/*.ttx. + # Feature files in data/*.txt; output gets compared to data/*.ttx. TESTS = { None: ( 'mti/cmap', @@ -143,7 +143,7 @@ class MtiTest(unittest.TestCase): @staticmethod def getpath(testfile): path, _ = os.path.split(__file__) - return os.path.join(path, "testdata", testfile) + return os.path.join(path, "data", testfile) def expect_ttx(self, expected_ttx, actual_ttx, fromfile=None, tofile=None): expected = [l+'\n' for l in expected_ttx.split('\n')] diff --git a/Tests/pens/ttGlyphPen_test.py b/Tests/pens/ttGlyphPen_test.py index 024fa4e21..328773eff 100644 --- a/Tests/pens/ttGlyphPen_test.py +++ b/Tests/pens/ttGlyphPen_test.py @@ -14,7 +14,7 @@ class TTGlyphPenTest(unittest.TestCase): font = ttLib.TTFont() ttx_path = os.path.join( os.path.abspath(os.path.dirname(os.path.realpath(__file__))), - '..', 'ttLib', 'testdata', filename) + '..', 'ttLib', 'data', filename) font.importXML(ttx_path) glyphSet = font.getGlyphSet() diff --git a/Tests/subset/testdata/TestCID-Regular.ttx b/Tests/subset/data/TestCID-Regular.ttx similarity index 100% rename from Tests/subset/testdata/TestCID-Regular.ttx rename to Tests/subset/data/TestCID-Regular.ttx diff --git a/Tests/subset/testdata/TestCLR-Regular.ttx b/Tests/subset/data/TestCLR-Regular.ttx similarity index 100% rename from Tests/subset/testdata/TestCLR-Regular.ttx rename to Tests/subset/data/TestCLR-Regular.ttx diff --git a/Tests/subset/testdata/TestGVAR.ttx b/Tests/subset/data/TestGVAR.ttx similarity index 100% rename from Tests/subset/testdata/TestGVAR.ttx rename to Tests/subset/data/TestGVAR.ttx diff --git a/Tests/subset/testdata/TestMATH-Regular.ttx b/Tests/subset/data/TestMATH-Regular.ttx similarity index 100% rename from Tests/subset/testdata/TestMATH-Regular.ttx rename to Tests/subset/data/TestMATH-Regular.ttx diff --git a/Tests/subset/testdata/TestOTF-Regular.ttx b/Tests/subset/data/TestOTF-Regular.ttx similarity index 100% rename from Tests/subset/testdata/TestOTF-Regular.ttx rename to Tests/subset/data/TestOTF-Regular.ttx diff --git a/Tests/subset/testdata/TestTTF-Regular.ttx b/Tests/subset/data/TestTTF-Regular.ttx similarity index 100% rename from Tests/subset/testdata/TestTTF-Regular.ttx rename to Tests/subset/data/TestTTF-Regular.ttx diff --git a/Tests/subset/testdata/TestTTF-Regular_non_BMP_char.ttx b/Tests/subset/data/TestTTF-Regular_non_BMP_char.ttx similarity index 100% rename from Tests/subset/testdata/TestTTF-Regular_non_BMP_char.ttx rename to Tests/subset/data/TestTTF-Regular_non_BMP_char.ttx diff --git a/Tests/subset/testdata/expect_keep_colr.ttx b/Tests/subset/data/expect_keep_colr.ttx similarity index 100% rename from Tests/subset/testdata/expect_keep_colr.ttx rename to Tests/subset/data/expect_keep_colr.ttx diff --git a/Tests/subset/testdata/expect_keep_gvar.ttx b/Tests/subset/data/expect_keep_gvar.ttx similarity index 100% rename from Tests/subset/testdata/expect_keep_gvar.ttx rename to Tests/subset/data/expect_keep_gvar.ttx diff --git a/Tests/subset/testdata/expect_keep_gvar_notdef_outline.ttx b/Tests/subset/data/expect_keep_gvar_notdef_outline.ttx similarity index 100% rename from Tests/subset/testdata/expect_keep_gvar_notdef_outline.ttx rename to Tests/subset/data/expect_keep_gvar_notdef_outline.ttx diff --git a/Tests/subset/testdata/expect_keep_math.ttx b/Tests/subset/data/expect_keep_math.ttx similarity index 100% rename from Tests/subset/testdata/expect_keep_math.ttx rename to Tests/subset/data/expect_keep_math.ttx diff --git a/Tests/subset/testdata/expect_no_notdef_outline_cid.ttx b/Tests/subset/data/expect_no_notdef_outline_cid.ttx similarity index 100% rename from Tests/subset/testdata/expect_no_notdef_outline_cid.ttx rename to Tests/subset/data/expect_no_notdef_outline_cid.ttx diff --git a/Tests/subset/testdata/expect_no_notdef_outline_otf.ttx b/Tests/subset/data/expect_no_notdef_outline_otf.ttx similarity index 100% rename from Tests/subset/testdata/expect_no_notdef_outline_otf.ttx rename to Tests/subset/data/expect_no_notdef_outline_otf.ttx diff --git a/Tests/subset/testdata/expect_no_notdef_outline_ttf.ttx b/Tests/subset/data/expect_no_notdef_outline_ttf.ttx similarity index 100% rename from Tests/subset/testdata/expect_no_notdef_outline_ttf.ttx rename to Tests/subset/data/expect_no_notdef_outline_ttf.ttx diff --git a/Tests/subset/testdata/google_color.ttx b/Tests/subset/data/google_color.ttx similarity index 100% rename from Tests/subset/testdata/google_color.ttx rename to Tests/subset/data/google_color.ttx diff --git a/Tests/subset/subset_test.py b/Tests/subset/subset_test.py index 70e6a123d..d0dd320a1 100644 --- a/Tests/subset/subset_test.py +++ b/Tests/subset/subset_test.py @@ -31,7 +31,7 @@ class SubsetTest(unittest.TestCase): @staticmethod def getpath(testfile): path, _ = os.path.split(__file__) - return os.path.join(path, "testdata", testfile) + return os.path.join(path, "data", testfile) def temp_path(self, suffix): if not self.tempdir: diff --git a/Tests/t1Lib/testdata/TestT1-Regular.lwfn b/Tests/t1Lib/data/TestT1-Regular.lwfn similarity index 100% rename from Tests/t1Lib/testdata/TestT1-Regular.lwfn rename to Tests/t1Lib/data/TestT1-Regular.lwfn diff --git a/Tests/t1Lib/testdata/TestT1-Regular.pfa b/Tests/t1Lib/data/TestT1-Regular.pfa similarity index 100% rename from Tests/t1Lib/testdata/TestT1-Regular.pfa rename to Tests/t1Lib/data/TestT1-Regular.pfa diff --git a/Tests/t1Lib/testdata/TestT1-Regular.pfb b/Tests/t1Lib/data/TestT1-Regular.pfb similarity index 100% rename from Tests/t1Lib/testdata/TestT1-Regular.pfb rename to Tests/t1Lib/data/TestT1-Regular.pfb diff --git a/Tests/t1Lib/t1Lib_test.py b/Tests/t1Lib/t1Lib_test.py index b07eb127b..0e0fcbe35 100644 --- a/Tests/t1Lib/t1Lib_test.py +++ b/Tests/t1Lib/t1Lib_test.py @@ -8,7 +8,7 @@ import random CWD = os.path.abspath(os.path.dirname(__file__)) -DATADIR = os.path.join(CWD, 'testdata') +DATADIR = os.path.join(CWD, 'data') # I used `tx` to convert PFA to LWFN (stored in the data fork) LWFN = os.path.join(DATADIR, 'TestT1-Regular.lwfn') PFA = os.path.join(DATADIR, 'TestT1-Regular.pfa') diff --git a/Tests/ttLib/testdata/TestOTF-Regular.otx b/Tests/ttLib/data/TestOTF-Regular.otx similarity index 100% rename from Tests/ttLib/testdata/TestOTF-Regular.otx rename to Tests/ttLib/data/TestOTF-Regular.otx diff --git a/Tests/ttLib/testdata/TestTTF-Regular.ttx b/Tests/ttLib/data/TestTTF-Regular.ttx similarity index 100% rename from Tests/ttLib/testdata/TestTTF-Regular.ttx rename to Tests/ttLib/data/TestTTF-Regular.ttx diff --git a/Tests/ttLib/testdata/TestTTFComplex-Regular.ttx b/Tests/ttLib/data/TestTTFComplex-Regular.ttx similarity index 100% rename from Tests/ttLib/testdata/TestTTFComplex-Regular.ttx rename to Tests/ttLib/data/TestTTFComplex-Regular.ttx diff --git a/Tests/ttLib/testdata/test_woff2_metadata.xml b/Tests/ttLib/data/test_woff2_metadata.xml similarity index 100% rename from Tests/ttLib/testdata/test_woff2_metadata.xml rename to Tests/ttLib/data/test_woff2_metadata.xml diff --git a/Tests/ttLib/tables/C_F_F_test.py b/Tests/ttLib/tables/C_F_F_test.py index 26781940b..63f767cc0 100644 --- a/Tests/ttLib/tables/C_F_F_test.py +++ b/Tests/ttLib/tables/C_F_F_test.py @@ -10,7 +10,7 @@ import unittest CURR_DIR = os.path.abspath(os.path.dirname(os.path.realpath(__file__))) -DATA_DIR = os.path.join(CURR_DIR, 'testdata') +DATA_DIR = os.path.join(CURR_DIR, 'data') CFF_TTX = os.path.join(DATA_DIR, "C_F_F_.ttx") CFF_BIN = os.path.join(DATA_DIR, "C_F_F_.bin") diff --git a/Tests/ttLib/tables/testdata/C_F_F_.bin b/Tests/ttLib/tables/data/C_F_F_.bin similarity index 100% rename from Tests/ttLib/tables/testdata/C_F_F_.bin rename to Tests/ttLib/tables/data/C_F_F_.bin diff --git a/Tests/ttLib/tables/testdata/C_F_F_.ttx b/Tests/ttLib/tables/data/C_F_F_.ttx similarity index 100% rename from Tests/ttLib/tables/testdata/C_F_F_.ttx rename to Tests/ttLib/tables/data/C_F_F_.ttx diff --git a/Tests/ttLib/woff2_test.py b/Tests/ttLib/woff2_test.py index d12b876d7..e441898b3 100644 --- a/Tests/ttLib/woff2_test.py +++ b/Tests/ttLib/woff2_test.py @@ -29,7 +29,7 @@ if not hasattr(unittest.TestCase, 'assertRaisesRegex'): current_dir = os.path.abspath(os.path.dirname(os.path.realpath(__file__))) -data_dir = os.path.join(current_dir, 'testdata') +data_dir = os.path.join(current_dir, 'data') TTX = os.path.join(data_dir, 'TestTTF-Regular.ttx') OTX = os.path.join(data_dir, 'TestOTF-Regular.otx') METADATA = os.path.join(data_dir, 'test_woff2_metadata.xml') diff --git a/Tests/varLib/testdata/VarLibTest.designspace b/Tests/varLib/data/VarLibTest.designspace similarity index 100% rename from Tests/varLib/testdata/VarLibTest.designspace rename to Tests/varLib/data/VarLibTest.designspace diff --git a/Tests/varLib/designspace_test.py b/Tests/varLib/designspace_test.py index 7e51693ae..54136309f 100644 --- a/Tests/varLib/designspace_test.py +++ b/Tests/varLib/designspace_test.py @@ -29,7 +29,7 @@ class DesignspaceTest(unittest.TestCase): def _getpath(testfile): path, _ = os.path.split(__file__) - return os.path.join(path, "testdata", testfile) + return os.path.join(path, "data", testfile) if __name__ == "__main__":