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
This commit is contained in:
parent
b325f27f23
commit
816b59debf
@ -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
|
||||
|
120
tests/fontmap/fontmap.cpp
Normal file
120
tests/fontmap/fontmap.cpp
Normal file
@ -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
|
@ -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) $**
|
||||
|
@ -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
|
||||
|
@ -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) $**
|
||||
|
@ -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) $<
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -26,6 +26,7 @@
|
||||
streams/filestream.cpp
|
||||
streams/memstream.cpp
|
||||
streams/zlibstream.cpp
|
||||
fontmap/fontmap.cpp
|
||||
</sources>
|
||||
<wx-lib>base</wx-lib>
|
||||
</exe>
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user