]> git.saurik.com Git - wxWidgets.git/blobdiff - tests/fontmap/fontmaptest.cpp
Minor corrections to make dist after reports
[wxWidgets.git] / tests / fontmap / fontmaptest.cpp
index 212f64c4344f403673f87996a1e5ec7c91f01721..05607a901c978263d5b9c74804429d1dbdf7ec30 100644 (file)
@@ -5,6 +5,7 @@
 // Created:     14.02.04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 TT-Solutions
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
@@ -91,7 +92,7 @@ void FontMapperTestCase::NamesAndDesc()
 
     static const wxChar *descriptions[] =
     {
-        // some vali charsets
+        // some valid charsets
         _T("Default encoding"                  ),
         _T("Western European (ISO-8859-1)"     ),
         _T("Indian (ISO-8859-12)"              ),
@@ -107,11 +108,12 @@ void FontMapperTestCase::NamesAndDesc()
         _T("Unknown encoding (-1)"             ),
     };
 
+    wxFontMapperBase& fmap = *wxFontMapperBase::Get();
     for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
     {
-        wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charsets[n]);
-        CPPUNIT_ASSERT( wxFontMapper::Get()->GetEncodingName(enc) == names[n] );
-        CPPUNIT_ASSERT( wxFontMapper::Get()->GetEncodingDescription(enc) == descriptions[n] );
+        wxFontEncoding enc = fmap.CharsetToEncoding(charsets[n]);
+        CPPUNIT_ASSERT_EQUAL( names[n], fmap.GetEncodingName(enc).Lower() );
+        CPPUNIT_ASSERT_EQUAL( descriptions[n], fmap.GetEncodingDescription(enc) );
     }
 }