#include "wx/wx.h"
#endif // WX_PRECOMP
+#include "wx/encconv.h"
+
+// ----------------------------------------------------------------------------
// helper class holding the matching MB and WC strings
-//
-// either str or wcs (but not both) may be NULL, this means that the conversion
-// to it should fail
+// ----------------------------------------------------------------------------
+
struct StringConversionData
{
- const char *str;
- const wchar_t *wcs;
+ // either str or wcs (but not both) may be NULL, this means that the conversion
+ // to it should fail
+ StringConversionData(const char *str_, const wchar_t *wcs_, int flags_ = 0)
+ : str(str_), wcs(wcs_), flags(flags_)
+ {
+ }
+
+ const char * const str;
+ const wchar_t * const wcs;
enum
{
ONLY_MB2WC = 1 // only test str -> wcs conversion
};
- int flags;
+ const int flags;
// test that the conversion between str and wcs (subject to flags) succeeds
//
CPPUNIT_TEST_SUITE( UnicodeTestCase );
CPPUNIT_TEST( ToFromAscii );
CPPUNIT_TEST( ConstructorsWithConversion );
- CPPUNIT_TEST( ConversionEmpty );
+ CPPUNIT_TEST( ConversionFixed );
CPPUNIT_TEST( ConversionWithNULs );
CPPUNIT_TEST( ConversionUTF7 );
CPPUNIT_TEST( ConversionUTF8 );
void ToFromAscii();
void ConstructorsWithConversion();
- void ConversionEmpty();
+ void ConversionFixed();
void ConversionWithNULs();
void ConversionUTF7();
void ConversionUTF8();
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( UnicodeTestCase );
-// 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( UnicodeTestCase, "UnicodeTestCase" );
UnicodeTestCase::UnicodeTestCase()
void UnicodeTestCase::ConstructorsWithConversion()
{
- // the string "Déjà" in UTF-8 and wchar_t:
+ // the string "Déjà" in UTF-8 and wchar_t:
const unsigned char utf8Buf[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0};
- const unsigned char utf8subBuf[] = {0x44,0xC3,0xA9,0x6A,0}; // just "Déj"
+ const unsigned char utf8subBuf[] = {0x44,0xC3,0xA9,0x6A,0}; // just "Déj"
const char *utf8 = (char *)utf8Buf;
const char *utf8sub = (char *)utf8subBuf;
#if wxUSE_UNICODE
const wchar_t wchar[] = {0x44,0xE9,0x6A,0xE0,0};
- WX_ASSERT_STR_EQUAL( wchar, s1 );
+ CPPUNIT_ASSERT_EQUAL( wchar, s1 );
wxString s2(wchar);
- WX_ASSERT_STR_EQUAL( wchar, s2 );
- WX_ASSERT_STR_EQUAL( utf8, s2 );
+ CPPUNIT_ASSERT_EQUAL( wchar, s2 );
+ CPPUNIT_ASSERT_EQUAL( wxString::FromUTF8(utf8), s2 );
#else
- WX_ASSERT_STR_EQUAL( utf8, s1 );
+ CPPUNIT_ASSERT_EQUAL( utf8, s1 );
#endif
wxString sub(utf8sub, wxConvUTF8); // "Dej" substring
CPPUNIT_ASSERT_EQUAL( sub, s4 );
// conversion should stop with failure at pos 35
- wxString s("\t[pl]open.format.Sformatuj dyskietkê=gfloppy %f", wxConvUTF8);
+ wxString s("\t[pl]open.format.Sformatuj dyskietk\xea=gfloppy %f", wxConvUTF8);
CPPUNIT_ASSERT( s.empty() );
#endif // wxUSE_UNICODE
// test using Unicode strings together with char* strings (this must work
// in ANSI mode as well, of course):
wxString s5("ascii");
- WX_ASSERT_STR_EQUAL( "ascii", s5 );
+ CPPUNIT_ASSERT_EQUAL( "ascii", s5 );
s5 += " value";
CPPUNIT_ASSERT( strcmp(s5.mb_str(), "ascii value") == 0 );
- WX_ASSERT_STR_EQUAL( "ascii value", s5 );
+ CPPUNIT_ASSERT_EQUAL( "ascii value", s5 );
CPPUNIT_ASSERT( s5 != "SomethingElse" );
}
-void UnicodeTestCase::ConversionEmpty()
+void UnicodeTestCase::ConversionFixed()
{
size_t len;
#if wxUSE_UNICODE
- wxCharBuffer buf = wxConvLibc.cWC2MB(L"", 0, &len);
+ wxConvLibc.cWC2MB(L"", 0, &len);
#else // !wxUSE_UNICODE
- wxWCharBuffer wbuf = wxConvLibc.cMB2WC("", 0, &len);
+ wxConvLibc.cMB2WC("", 0, &len);
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
- CPPUNIT_ASSERT(len == 0);
+ CPPUNIT_ASSERT_EQUAL( 0, len );
+
+#if wxUSE_UNICODE
+ // check that when we convert a fixed number of characters we obtain the
+ // expected return value
+ CPPUNIT_ASSERT_EQUAL( 0, wxConvLibc.ToWChar(NULL, 0, "", 0) );
+ CPPUNIT_ASSERT_EQUAL( 1, wxConvLibc.ToWChar(NULL, 0, "x", 1) );
+ CPPUNIT_ASSERT_EQUAL( 2, wxConvLibc.ToWChar(NULL, 0, "x", 2) );
+ CPPUNIT_ASSERT_EQUAL( 2, wxConvLibc.ToWChar(NULL, 0, "xy", 2) );
+#endif // wxUSE_UNICODE
}
void UnicodeTestCase::ConversionWithNULs()
static const StringConversionData utf7data[] =
{
// normal fragments
- { "+AKM-", L"\xa3" },
- { "+AOk-t+AOk-", L"\xe9t\xe9" },
+ StringConversionData("+AKM-", L"\xa3"),
+ StringConversionData("+AOk-t+AOk-", L"\xe9t\xe9"),
// this one is an alternative valid encoding of the same string
- { "+AOk-t+AOk", L"\xe9t\xe9", StringConversionData::ONLY_MB2WC },
+ StringConversionData("+AOk-t+AOk", L"\xe9t\xe9",
+ StringConversionData::ONLY_MB2WC),
// some special cases
- { "+-", L"+" },
- { "+--", L"+-" },
+ StringConversionData("+-", L"+"),
+ StringConversionData("+--", L"+-"),
// the following are invalid UTF-7 sequences
- { "\xa3", NULL },
- { "+", NULL },
- { "+~", NULL },
- { "a+", NULL },
+ StringConversionData("\xa3", NULL),
+ StringConversionData("+", NULL),
+ StringConversionData("+~", NULL),
+ StringConversionData("a+", NULL),
};
for ( size_t n = 0; n < WXSIZEOF(utf7data); n++ )
static const StringConversionData utf8data[] =
{
#ifdef wxHAVE_U_ESCAPE
- { "\xc2\xa3", L"\u00a3" },
+ StringConversionData("\xc2\xa3", L"\u00a3"),
#endif
- { "\xc2", NULL },
+ StringConversionData("\xc2", NULL),
};
- wxCSConv conv(_T("utf-8"));
+ wxCSConv conv(wxT("utf-8"));
for ( size_t n = 0; n < WXSIZEOF(utf8data); n++ )
{
const StringConversionData& d = utf8data[n];
static const StringConversionData utf16data[] =
{
#ifdef wxHAVE_U_ESCAPE
- { "\x04\x1f\x04\x40\x04\x38\x04\x32\x04\x35\x04\x42\0\0",
- L"\u041f\u0440\u0438\u0432\u0435\u0442" },
- { "\x01\0\0b\x01\0\0a\x01\0\0r\0\0", L"\u0100b\u0100a\u0100r" },
+ StringConversionData(
+ "\x04\x1f\x04\x40\x04\x38\x04\x32\x04\x35\x04\x42\0\0",
+ L"\u041f\u0440\u0438\u0432\u0435\u0442"),
+ StringConversionData(
+ "\x01\0\0b\x01\0\0a\x01\0\0r\0\0",
+ L"\u0100b\u0100a\u0100r"),
#endif
- { "\0f\0o\0o\0\0", L"foo" },
+ StringConversionData("\0f\0o\0o\0\0", L"foo"),
};
wxCSConv conv(wxFONTENCODING_UTF16BE);
// terminate the string, this exposed a bug in our conversion code which
// got confused in this case
size_t len;
- wxWCharBuffer wbuf(conv.cMB2WC("\x01\0\0B\0C" /* A macron BC */, 6, &len));
- CPPUNIT_ASSERT_EQUAL( (size_t)3, len );
+ conv.cMB2WC("\x01\0\0B\0C" /* A macron BC */, 6, &len);
+ CPPUNIT_ASSERT_EQUAL( 3, len );
}
void UnicodeTestCase::ConversionUTF32()
static const StringConversionData utf32data[] =
{
#ifdef wxHAVE_U_ESCAPE
- {
+ StringConversionData(
"\0\0\x04\x1f\0\0\x04\x40\0\0\x04\x38\0\0\x04\x32\0\0\x04\x35\0\0\x04\x42\0\0\0\0",
- L"\u041f\u0440\u0438\u0432\u0435\u0442" },
+ L"\u041f\u0440\u0438\u0432\u0435\u0442"),
#endif
- { "\0\0\0f\0\0\0o\0\0\0o\0\0\0\0", L"foo" },
+ StringConversionData("\0\0\0f\0\0\0o\0\0\0o\0\0\0\0", L"foo"),
};
wxCSConv conv(wxFONTENCODING_UTF32BE);
}
size_t len;
- wxWCharBuffer wbuf(conv.cMB2WC("\0\0\x01\0\0\0\0B\0\0\0C" /* A macron BC */,
- 12, &len));
- CPPUNIT_ASSERT_EQUAL( (size_t)3, len );
+ conv.cMB2WC("\0\0\x01\0\0\0\0B\0\0\0C" /* A macron BC */, 12, &len);
+ CPPUNIT_ASSERT_EQUAL( 3, len );
}
void UnicodeTestCase::IsConvOk()
{
CPPUNIT_ASSERT( wxCSConv(wxFONTENCODING_SYSTEM).IsOk() );
- CPPUNIT_ASSERT( wxCSConv(_T("UTF-8")).IsOk() );
- CPPUNIT_ASSERT( !wxCSConv(_T("NoSuchConversion")).IsOk() );
+ CPPUNIT_ASSERT( wxCSConv("US-ASCII").IsOk() );
+ CPPUNIT_ASSERT( wxCSConv("UTF-8").IsOk() );
+ CPPUNIT_ASSERT( !wxCSConv("NoSuchConversion").IsOk() );
#ifdef __WINDOWS__
- CPPUNIT_ASSERT( wxCSConv(_T("WINDOWS-437")).IsOk() );
+ CPPUNIT_ASSERT( wxCSConv("WINDOWS-437").IsOk() );
#endif
}
}
}
#endif // wxUSE_UNICODE
+
projects / wxWidgets.git / blobdiff