Minor corrections to make dist after reports

[wxWidgets.git] / tests / fontmap / fontmaptest.cpp

diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp
index ea36961c174c80b74fb518441d9af69eea310e38..05607a901c978263d5b9c74804429d1dbdf7ec30 100644 (file)
--- a/tests/fontmap/fontmaptest.cpp
+++ b/tests/fontmap/fontmaptest.cpp
@@ -108,11 +108,12 @@ void FontMapperTestCase::NamesAndDesc()
         _T("Unknown encoding (-1)"             ),
     };
 
         _T("Unknown encoding (-1)"             ),
     };
 

+    wxFontMapperBase& fmap = *wxFontMapperBase::Get();

     for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
     {
     for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
     {

-        wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(charsets[n]);
-        CPPUNIT_ASSERT( wxFontMapperBase::Get()->GetEncodingName(enc).CmpNoCase(names[n]) == 0 );
-        CPPUNIT_ASSERT( wxFontMapperBase::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) );

     }
 }
 
     }
 }