Commit e04d19319f929ff8995cdc2333c1f9682c945daf

henry 2004-09-29T03:13:47

Improved error values for tests

diff --git a/test/FTCharmap-Test.cpp b/test/FTCharmap-Test.cpp
index d0a0787..19e1c91 100755
--- a/test/FTCharmap-Test.cpp
+++ b/test/FTCharmap-Test.cpp
@@ -56,7 +56,7 @@ class FTCharmapTest : public CppUnit::TestCase
             
             CPPUNIT_ASSERT( !charmap->CharMap( ft_encoding_johab));
             
-            CPPUNIT_ASSERT( charmap->Error() == 6);
+            CPPUNIT_ASSERT( charmap->Error() == 0x06); // invalid argument
             CPPUNIT_ASSERT( charmap->Encoding() == ft_encoding_none);
         }
         
@@ -72,7 +72,7 @@ class FTCharmapTest : public CppUnit::TestCase
             
             charmap->CharMap( ft_encoding_johab);
             
-            CPPUNIT_ASSERT( charmap->Error() == 6);
+            CPPUNIT_ASSERT( charmap->Error() == 0x06); // invalid argument
             CPPUNIT_ASSERT( charmap->GlyphListIndex( CHARACTER_CODE_A)    == 0);
             CPPUNIT_ASSERT( charmap->GlyphListIndex( BIG_CHARACTER_CODE)  == 0);
             CPPUNIT_ASSERT( charmap->GlyphListIndex( NULL_CHARACTER_CODE) == 0);
diff --git a/test/FTFace-Test.cpp b/test/FTFace-Test.cpp
index 31821b4..7ac98ad 100755
--- a/test/FTFace-Test.cpp
+++ b/test/FTFace-Test.cpp
@@ -49,7 +49,7 @@ class FTFaceTest : public CppUnit::TestCase
         void testAttachFile()
         {
             CPPUNIT_ASSERT( !testFace->Attach( TYPE1_AFM_FILE));
-            CPPUNIT_ASSERT( testFace->Error() == 0x07);
+            CPPUNIT_ASSERT( testFace->Error() == 0x07); // unimplemented feature
         
             FTFace test( TYPE1_FONT_FILE);
             CPPUNIT_ASSERT( test.Error() == 0);
@@ -62,7 +62,7 @@ class FTFaceTest : public CppUnit::TestCase
         void testAttachMemoryData()
         {
             CPPUNIT_ASSERT( !testFace->Attach((unsigned char*)100, 0));
-            CPPUNIT_ASSERT( testFace->Error() == 0x07);        
+            CPPUNIT_ASSERT( testFace->Error() == 0x07); // unimplemented feature
         
             FTFace test( TYPE1_FONT_FILE);
             CPPUNIT_ASSERT( test.Error() == 0);
diff --git a/test/FTFont-Test.cpp b/test/FTFont-Test.cpp
index 6ee5e9a..2109ad0 100755
--- a/test/FTFont-Test.cpp
+++ b/test/FTFont-Test.cpp
@@ -128,14 +128,14 @@ class FTFontTest : public CppUnit::TestCase
         void testAttachFile()
         {
             testFont->Attach( TYPE1_AFM_FILE);
-            CPPUNIT_ASSERT( testFont->Error() == 0x07);        
+            CPPUNIT_ASSERT( testFont->Error() == 0x07); // unimplemented feature
         }
         
         
         void testAttachData()
         {
             testFont->Attach( (unsigned char*)100, 0);
-            CPPUNIT_ASSERT( testFont->Error() == 0x07);        
+            CPPUNIT_ASSERT( testFont->Error() == 0x07); // unimplemented feature       
         }
         
         
@@ -173,7 +173,7 @@ class FTFontTest : public CppUnit::TestCase
             CPPUNIT_ASSERT( testFont->CharMap( ft_encoding_unicode));
             CPPUNIT_ASSERT( testFont->Error() == 0);        
             CPPUNIT_ASSERT( !testFont->CharMap( ft_encoding_johab));
-            CPPUNIT_ASSERT( testFont->Error() == 6);        
+            CPPUNIT_ASSERT( testFont->Error() == 0x06); // invalid argument
         }
         
         
diff --git a/test/FTGlyphContainer-Test.cpp b/test/FTGlyphContainer-Test.cpp
index ccf89c2..e02aee0 100755
--- a/test/FTGlyphContainer-Test.cpp
+++ b/test/FTGlyphContainer-Test.cpp
@@ -65,7 +65,7 @@ class FTGlyphContainerTest : public CppUnit::TestCase
             CPPUNIT_ASSERT( glyphContainer->Error() == 0);
     
             CPPUNIT_ASSERT( !glyphContainer->CharMap( ft_encoding_johab));
-            CPPUNIT_ASSERT( glyphContainer->Error() == 6);
+            CPPUNIT_ASSERT( glyphContainer->Error() == 0x06); // invalid argument
         }