X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2229d9b30bce4dc4308d66d8dff15a0a7da6f04f..4f2511d706e5274a34e1521e11c1b95fed735b42:/tests/fontmap/fontmaptest.cpp diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp index ea36961c17..05607a901c 100644 --- a/tests/fontmap/fontmaptest.cpp +++ b/tests/fontmap/fontmaptest.cpp @@ -108,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 = 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) ); } }