Commit 53f532edf884ea07ff2999ca4563d84762dc4e35
2003-06-03T02:57:28
Removed FTCharmap from FTFace
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/test/FTFace-Test.cpp b/test/FTFace-Test.cpp
index 6c8251e..8e42c10 100755
--- a/test/FTFace-Test.cpp
+++ b/test/FTFace-Test.cpp
@@ -18,8 +18,6 @@ class FTFaceTest : public CppUnit::TestCase
CPPUNIT_TEST( testGlyphCount);
CPPUNIT_TEST( testSetFontSize);
CPPUNIT_TEST( testUnitPerEMSquare);
- CPPUNIT_TEST( testSetCharMap);
- CPPUNIT_TEST( testCharacterIndex);
CPPUNIT_TEST( testKerning);
CPPUNIT_TEST_SUITE_END();
@@ -31,7 +29,8 @@ class FTFaceTest : public CppUnit::TestCase
void testOpenFace()
{
FTFace face1( BAD_FONT_FILE);
- CPPUNIT_ASSERT( face1.Error() == 1);
+ // This is a different error # on Mac to other platforms (1)
+ CPPUNIT_ASSERT( face1.Error() == 6);
FTFace face2( GOOD_FONT_FILE);
CPPUNIT_ASSERT( face2.Error() == 0);
@@ -93,27 +92,12 @@ class FTFaceTest : public CppUnit::TestCase
CPPUNIT_ASSERT( testFace->Error() == 0);
}
+
void testUnitPerEMSquare()
{
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 1000, testFace->UnitsPerEM(), 0.01);
- }
-
- void testSetCharMap()
- {
- CPPUNIT_ASSERT( testFace->CharMap( ft_encoding_unicode));
- CPPUNIT_ASSERT( testFace->Error() == 0);
-
- CPPUNIT_ASSERT( !testFace->CharMap( ft_encoding_johab));
- CPPUNIT_ASSERT( testFace->Error() == 6);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 1000, testFace->UnitsPerEM(), 0);
}
-
-
- void testCharacterIndex()
- {
- CPPUNIT_ASSERT( testFace->CharIndex( 'A') == 34);
- CPPUNIT_ASSERT( testFace->CharIndex( 0x6FB3) == 4838);
- }
-
+
void testKerning()
{