X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e994615409e36d441135e4fa0761cf0398a2aa..f155075229d771430f0793700f5048ad4be00e9d:/tests/fontmap/fontmaptest.cpp

diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp
index b267f0d04e..b410ee374d 100644
--- a/tests/fontmap/fontmaptest.cpp
+++ b/tests/fontmap/fontmaptest.cpp
@@ -5,13 +5,14 @@
 // Created:     14.02.04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 TT-Solutions
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/wxprec.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -25,8 +26,6 @@
 
 #include "wx/fontmap.h"
 
-#include "wx/cppunit.h"
-
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
@@ -49,7 +48,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( FontMapperTestCase );
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FontMapperTestCase, "FontMapperTestCase" );
 
 
@@ -58,62 +57,63 @@ void FontMapperTestCase::NamesAndDesc()
     static const wxChar *charsets[] =
     {
         // some valid charsets
-        _T("us-ascii"    ),
-        _T("iso8859-1"   ),
-        _T("iso-8859-12" ),
-        _T("koi8-r"      ),
-        _T("utf-7"       ),
-        _T("cp1250"      ),
-        _T("windows-1252"),
+        wxT("us-ascii"    ),
+        wxT("iso8859-1"   ),
+        wxT("iso-8859-12" ),
+        wxT("koi8-r"      ),
+        wxT("utf-7"       ),
+        wxT("cp1250"      ),
+        wxT("windows-1252"),
 
         // and now some bogus ones
-        _T(""            ),
-        _T("cp1249"      ),
-        _T("iso--8859-1" ),
-        _T("iso-8859-19" ),
+        wxT(""            ),
+        wxT("cp1249"      ),
+        wxT("iso--8859-1" ),
+        wxT("iso-8859-19" ),
     };
 
     static const wxChar *names[] =
     {
         // some valid charsets
-        _T("default"     ),
-        _T("iso-8859-1"  ),
-        _T("iso-8859-12" ),
-        _T("koi8-r"      ),
-        _T("utf-7"       ),
-        _T("windows-1250"),
-        _T("windows-1252"),
+        wxT("default"     ),
+        wxT("iso-8859-1"  ),
+        wxT("iso-8859-12" ),
+        wxT("koi8-r"      ),
+        wxT("utf-7"       ),
+        wxT("windows-1250"),
+        wxT("windows-1252"),
 
         // and now some bogus ones
-        _T("default"     ),
-        _T("unknown--1"  ),
-        _T("unknown--1"  ),
-        _T("unknown--1"  ),
+        wxT("default"     ),
+        wxT("unknown--1"  ),
+        wxT("unknown--1"  ),
+        wxT("unknown--1"  ),
     };
 
     static const wxChar *descriptions[] =
     {
-        // some vali charsets
-        _T("Default encoding"                  ),
-        _T("Western European (ISO-8859-1)"     ),
-        _T("Indian (ISO-8859-12)"              ),
-        _T("KOI8-R"                            ),
-        _T("Unicode 7 bit (UTF-7)"             ),
-        _T("Windows Central European (CP 1250)"),
-        _T("Windows Western European (CP 1252)"),
+        // some valid charsets
+        wxT("Default encoding"                  ),
+        wxT("Western European (ISO-8859-1)"     ),
+        wxT("Indian (ISO-8859-12)"              ),
+        wxT("KOI8-R"                            ),
+        wxT("Unicode 7 bit (UTF-7)"             ),
+        wxT("Windows Central European (CP 1250)"),
+        wxT("Windows Western European (CP 1252)"),
 
         // and now some bogus ones
-        _T("Default encoding"                  ),
-        _T("Unknown encoding (-1)"             ),
-        _T("Unknown encoding (-1)"             ),
-        _T("Unknown encoding (-1)"             ),
+        wxT("Default encoding"                  ),
+        wxT("Unknown encoding (-1)"             ),
+        wxT("Unknown encoding (-1)"             ),
+        wxT("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) );
     }
 }