rename various gsock* files to sock* (except for MSW where this will be done later)

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

diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp
index 0f3e562227af2f88599eb790149e01e713ba8ae4..05607a901c978263d5b9c74804429d1dbdf7ec30 100644 (file)
--- a/tests/fontmap/fontmaptest.cpp
+++ b/tests/fontmap/fontmaptest.cpp
@@ -5,6 +5,7 @@
 // Created:     14.02.04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 TT-Solutions
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
@@ -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 = 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) );
     }
 }