moved wxFontMapper tests to its own file and testcase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 26df18762cdddadb96af022ae8b4b3190cf07cfc..86b8dd9281c9f72bc5c9e06beafac28df210ca22 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -53,7 +53,8 @@ TEST_OBJECTS =  \
        test_ffilestream.o \
        test_filestream.o \
        test_memstream.o \
-       test_zlibstream.o
+       test_zlibstream.o \
+       test_fontmap.o
 
 ### Conditionally set variables: ###
 
@@ -182,6 +183,9 @@ test_memstream.o: $(srcdir)/streams/memstream.cpp
 test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
+test_fontmap.o: $(srcdir)/fontmap/fontmap.cpp
+       $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d

diff --git a/tests/fontmap/fontmap.cpp b/tests/fontmap/fontmap.cpp
new file mode 100644 (file)
index 0000000..b267f0d
--- /dev/null
+++ b/tests/fontmap/fontmap.cpp
@@ -0,0 +1,120 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/fontmap/fontmap.cpp
+// Purpose:     wxFontMapper unit test
+// Author:      Vadim Zeitlin
+// Created:     14.02.04
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 TT-Solutions
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+
+#if wxUSE_FONTMAP
+
+#include "wx/fontmap.h"
+
+#include "wx/cppunit.h"
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class FontMapperTestCase : public CppUnit::TestCase
+{
+public:
+    FontMapperTestCase() { }
+
+private:
+    CPPUNIT_TEST_SUITE( FontMapperTestCase );
+        CPPUNIT_TEST( NamesAndDesc );
+    CPPUNIT_TEST_SUITE_END();
+
+    void NamesAndDesc();
+
+    DECLARE_NO_COPY_CLASS(FontMapperTestCase)
+};
+
+// 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
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FontMapperTestCase, "FontMapperTestCase" );
+
+
+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"),
+
+        // and now some bogus ones
+        _T(""            ),
+        _T("cp1249"      ),
+        _T("iso--8859-1" ),
+        _T("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"),
+
+        // and now some bogus ones
+        _T("default"     ),
+        _T("unknown--1"  ),
+        _T("unknown--1"  ),
+        _T("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)"),
+
+        // and now some bogus ones
+        _T("Default encoding"                  ),
+        _T("Unknown encoding (-1)"             ),
+        _T("Unknown encoding (-1)"             ),
+        _T("Unknown encoding (-1)"             ),
+    };
+
+    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] );
+    }
+}
+
+#endif // wxUSE_FONTMAP

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 286725c4aaca2e50cd0d1df30b12a5d3fc97ad24..eb83942a466c38089e8a6ab6a0539d13bb43992e 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -47,7 +47,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ffilestream.obj \
        $(OBJS)\test_filestream.obj \
        $(OBJS)\test_memstream.obj \
-       $(OBJS)\test_zlibstream.obj
+       $(OBJS)\test_zlibstream.obj \
+       $(OBJS)\test_fontmap.obj
 
 ### Conditionally set variables: ###
 
@@ -224,3 +225,6 @@ $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
 
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index bd6e8e83640443479f262f83e3717b5bbfccd507..e66d425be3a8cefe4df3d63aa278394dc01560f7 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -38,7 +38,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ffilestream.o \
        $(OBJS)\test_filestream.o \
        $(OBJS)\test_memstream.o \
-       $(OBJS)\test_zlibstream.o
+       $(OBJS)\test_zlibstream.o \
+       $(OBJS)\test_fontmap.o
 
 ### Conditionally set variables: ###
 
@@ -219,4 +220,7 @@ $(OBJS)\test_memstream.o: ./streams/memstream.cpp
 $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 .PHONY: all clean data

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 17fb23c43889a9c2208e2eee994fb19fbee98963..88a81a75d24cee1a4c82d4e08f0ebde7daf5c54f 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -40,7 +40,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ffilestream.obj \
        $(OBJS)\test_filestream.obj \
        $(OBJS)\test_memstream.obj \
-       $(OBJS)\test_zlibstream.obj
+       $(OBJS)\test_zlibstream.obj \
+       $(OBJS)\test_fontmap.obj
 
 ### Conditionally set variables: ###
 
@@ -280,3 +281,6 @@ $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
 
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

diff --git a/tests/makefile.wat b/tests/makefile.wat
index c86e9acc7c7fa46a5f88a513492376cfb0c734fd..007cc5f8c065eef7ab022a7fec0fb7544a54003a 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -195,7 +195,8 @@ TEST_OBJECTS =  &
        $(OBJS)\test_ffilestream.obj &
        $(OBJS)\test_filestream.obj &
        $(OBJS)\test_memstream.obj &
-       $(OBJS)\test_zlibstream.obj
+       $(OBJS)\test_zlibstream.obj &
+       $(OBJS)\test_fontmap.obj
 
 
 all : $(OBJS)
@@ -281,3 +282,6 @@ $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp
 
 $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp
        $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_fontmap.obj :  .AUTODEPEND .\fontmap\fontmap.cpp
+       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<

diff --git a/tests/mbconv/main.cpp b/tests/mbconv/main.cpp
index d5689628629ec5375a23560a63fceb9c5d2c53a4..5eb0ecf30fd83b9dace89bebbb34a44b425619e8 100644 (file)
--- a/tests/mbconv/main.cpp
+++ b/tests/mbconv/main.cpp
@@ -24,10 +24,6 @@
 #include "wx/strconv.h"
 #include "wx/string.h"
 
-#if wxUSE_FONTMAP
-    #include "wx/fontmap.h"
-#endif // wxUSE_FONTMAP
-
 #include "wx/cppunit.h"
 
 // ----------------------------------------------------------------------------
@@ -42,11 +38,9 @@ public:
 private:
     CPPUNIT_TEST_SUITE( MBConvTestCase );
         CPPUNIT_TEST( WC2CP1250 );
-        CPPUNIT_TEST( Charsets );
     CPPUNIT_TEST_SUITE_END();
 
     void WC2CP1250();
-    void Charsets();
 
     DECLARE_NO_COPY_CLASS(MBConvTestCase)
 };
@@ -83,71 +77,3 @@ void MBConvTestCase::WC2CP1250()
         }
     }
 }
-
-void MBConvTestCase::Charsets()
-{
-#if wxUSE_FONTMAP
-
-    static const wxChar *charsets[] =
-    {
-        // some vali charsets
-        _T("us-ascii"    ),
-        _T("iso8859-1"   ),
-        _T("iso-8859-12" ),
-        _T("koi8-r"      ),
-        _T("utf-7"       ),
-        _T("cp1250"      ),
-        _T("windows-1252"),
-
-        // and now some bogus ones
-        _T(""            ),
-        _T("cp1249"      ),
-        _T("iso--8859-1" ),
-        _T("iso-8859-19" ),
-    };
-
-    static const wxChar *names[] =
-    {
-        // some vali charsets
-        _T("default"     ),
-        _T("iso-8859-1"  ),
-        _T("iso-8859-12" ),
-        _T("koi8-r"      ),
-        _T("utf-7"       ),
-        _T("windows-1250"),
-        _T("windows-1252"),
-
-        // and now some bogus ones
-        _T("default"     ),
-        _T("unknown--1"  ),
-        _T("unknown--1"  ),
-        _T("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)"),
-
-        // and now some bogus ones
-        _T("Default encoding"                  ),
-        _T("Unknown encoding (-1)"             ),
-        _T("Unknown encoding (-1)"             ),
-        _T("Unknown encoding (-1)"             ),
-    };
-
-    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] );
-    }
-
-#endif // wxUSE_FONTMAP
-}

diff --git a/tests/test.bkl b/tests/test.bkl
index 0d0102281eec861280d37e8789b0d0765437c932..0e3d19300784ff5bc2e681ef8dbd8bc0eb979202 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -26,6 +26,7 @@
             streams/filestream.cpp
             streams/memstream.cpp
             streams/zlibstream.cpp
+            fontmap/fontmap.cpp
         </sources>
         <wx-lib>base</wx-lib>
     </exe>

diff --git a/tests/test.dsp b/tests/test.dsp
index 785d40170a908d477ee664b0f4bba61f9acbe333..0508af6d98954c06fc41a510517cb476e031cca9 100644 (file)
--- a/tests/test.dsp
+++ b/tests/test.dsp
@@ -459,6 +459,10 @@ SOURCE=.\filesys\filesys.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\fontmap\fontmap.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\formatconverter\formatconverter.cpp
 # End Source File
 # Begin Source File