From 788257c0a4887eb4e0c2fb1f7aa94aaee54f96dd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 May 2008 22:57:32 +0000 Subject: [PATCH] make assertion failure messages more useful by using WX_ASSERT_STR_EQUAL instead of just CPPUNIT_ASSERT git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/fontmap/fontmaptest.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp index ea36961c17..ea40742fc3 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]); + WX_ASSERT_STR_EQUAL( names[n], fmap.GetEncodingName(enc).Lower() ); + WX_ASSERT_STR_EQUAL( descriptions[n], fmap.GetEncodingDescription(enc) ); } } -- 2.50.0