X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e5f6c1c4f79af395e094be3fa2957394e2e5825..ae46a7fd15bff134460b9af46af896136b018fad:/tests/formatconverter/formatconvertertest.cpp diff --git a/tests/formatconverter/formatconvertertest.cpp b/tests/formatconverter/formatconvertertest.cpp index aa924fe9f4..1e5d50a3b1 100644 --- a/tests/formatconverter/formatconvertertest.cpp +++ b/tests/formatconverter/formatconvertertest.cpp @@ -36,7 +36,7 @@ // // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -47,14 +47,6 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" - -// wxFormatConverter can only be tested in a Unicode non-Windows debug build -// -#if defined(wxNEED_PRINTF_CONVERSION) && defined(__WXDEBUG__) -#define CAN_TEST -extern wxString wxConvertFormat(const wxChar *format); -#endif using CppUnit::TestCase; using std::string; @@ -78,7 +70,6 @@ class FormatConverterTestCase : public TestCase CPPUNIT_TEST(format_c); CPPUNIT_TEST(format_hc); CPPUNIT_TEST(format_lc); -#ifdef CAN_TEST CPPUNIT_TEST(format_S); CPPUNIT_TEST(format_hS); CPPUNIT_TEST(format_lS); @@ -86,7 +77,6 @@ class FormatConverterTestCase : public TestCase CPPUNIT_TEST(format_hC); CPPUNIT_TEST(format_lC); CPPUNIT_TEST(testLonger); -#endif CPPUNIT_TEST_SUITE_END(); void format_d(); @@ -99,7 +89,6 @@ class FormatConverterTestCase : public TestCase void format_hc(); void format_lc(); -#ifdef CAN_TEST void format_S(); void format_hS(); void format_lS(); @@ -108,16 +97,19 @@ class FormatConverterTestCase : public TestCase void format_lC(); void testLonger(); - void doTest(const wxChar *input, const wxChar *expected); - void check(const wxString& input, const wxString& expected); -#endif + void doTest(const char *input, const char *expectedScanf, + const char *expectedUtf8, + const char *expectedWcharUnix, + const char *expectedWcharWindows); + void check(const wxString& input, const wxString& expectedScanf, + const wxString& expectedUtf8, + const wxString& expectedWcharUnix, + const wxString& expectedWcharWindows); }; void FormatConverterTestCase::format_d() { -#ifdef CAN_TEST - doTest(_T("d"), _T("d")); -#endif + doTest("d", "d", "d", "d", "d"); CPPUNIT_ASSERT(wxString::Format(_T("%d"), 255) == _T("255")); CPPUNIT_ASSERT(wxString::Format(_T("%05d"), 255) == _T("00255")); CPPUNIT_ASSERT(wxString::Format(_T("% 5d"), 255) == _T(" 255")); @@ -129,27 +121,21 @@ void FormatConverterTestCase::format_d() void FormatConverterTestCase::format_hd() { -#ifdef CAN_TEST - doTest(_T("hd"), _T("hd")); -#endif + doTest("hd", "hd", "hd", "hd", "hd"); short s = 32767; CPPUNIT_ASSERT(wxString::Format(_T("%hd"), s) == _T("32767")); } void FormatConverterTestCase::format_ld() { -#ifdef CAN_TEST - doTest(_T("ld"), _T("ld")); -#endif + doTest("ld", "ld", "ld", "ld", "ld"); long l = 2147483647L; CPPUNIT_ASSERT(wxString::Format(_T("%ld"), l) == _T("2147483647")); } void FormatConverterTestCase::format_s() { -#ifdef CAN_TEST - doTest(_T("s"), _T("ls")); -#endif + doTest("s", "ls", "s", "ls", "s"); CPPUNIT_ASSERT(wxString::Format(_T("%s!"), _T("test")) == _T("test!")); CPPUNIT_ASSERT(wxString::Format(_T("%6s!"), _T("test")) == _T(" test!")); CPPUNIT_ASSERT(wxString::Format(_T("%-6s!"), _T("test")) == _T("test !")); @@ -159,9 +145,7 @@ void FormatConverterTestCase::format_s() void FormatConverterTestCase::format_hs() { -#ifdef CAN_TEST - doTest(_T("hs"), _T("hs")); -#endif + doTest("hs", "hs", "s", "ls", "s"); CPPUNIT_ASSERT(wxString::Format(wxString(_T("%hs!")), "test") == _T("test!")); CPPUNIT_ASSERT(wxString::Format(wxString(_T("%6hs!")), "test") == _T(" test!")); CPPUNIT_ASSERT(wxString::Format(wxString(_T("%-6hs!")), "test") == _T("test !")); @@ -171,9 +155,7 @@ void FormatConverterTestCase::format_hs() void FormatConverterTestCase::format_ls() { -#ifdef CAN_TEST - doTest(_T("ls"), _T("ls")); -#endif + doTest("ls", "ls", "s", "ls", "s"); CPPUNIT_ASSERT(wxString::Format(_T("%ls!"), L"test") == _T("test!")); CPPUNIT_ASSERT(wxString::Format(_T("%6ls!"), L"test") == _T(" test!")); CPPUNIT_ASSERT(wxString::Format(_T("%-6ls!"), L"test") == _T("test !")); @@ -183,9 +165,7 @@ void FormatConverterTestCase::format_ls() void FormatConverterTestCase::format_c() { -#ifdef CAN_TEST - doTest(_T("c"), _T("lc")); -#endif + doTest("c", "lc", "s", "lc", "c"); CPPUNIT_ASSERT(wxString::Format(_T("%c"), _T('x')) == _T("x")); CPPUNIT_ASSERT(wxString::Format(_T("%2c"), _T('x')) == _T(" x")); CPPUNIT_ASSERT(wxString::Format(_T("%-2c"), _T('x')) == _T("x ")); @@ -193,9 +173,7 @@ void FormatConverterTestCase::format_c() void FormatConverterTestCase::format_hc() { -#ifdef CAN_TEST - doTest(_T("hc"), _T("hc")); -#endif + doTest("hc", "hc", "s", "lc", "c"); CPPUNIT_ASSERT(wxString::Format(wxString(_T("%hc")), 'x') == _T("x")); CPPUNIT_ASSERT(wxString::Format(wxString(_T("%2hc")), 'x') == _T(" x")); CPPUNIT_ASSERT(wxString::Format(wxString(_T("%-2hc")), 'x') == _T("x ")); @@ -203,23 +181,26 @@ void FormatConverterTestCase::format_hc() void FormatConverterTestCase::format_lc() { -#ifdef CAN_TEST - doTest(_T("lc"), _T("lc")); -#endif + doTest("lc", "lc", "s", "lc", "c"); CPPUNIT_ASSERT(wxString::Format(_T("%lc"), L'x') == _T("x")); CPPUNIT_ASSERT(wxString::Format(_T("%2lc"), L'x') == _T(" x")); CPPUNIT_ASSERT(wxString::Format(_T("%-2lc"), L'x') == _T("x ")); } -#ifdef CAN_TEST -void FormatConverterTestCase::format_S() { doTest(_T("S"), _T("s")); } -void FormatConverterTestCase::format_hS() { doTest(_T("hS"), _T("s")); } -void FormatConverterTestCase::format_lS() { doTest(_T("lS"), _T("ls")); } +void FormatConverterTestCase::format_S() + { doTest("S", "s", "s", "ls", "s"); } +void FormatConverterTestCase::format_hS() + { doTest("hS", "s", "s", "ls", "s"); } +void FormatConverterTestCase::format_lS() + { doTest("lS", "ls", "s", "ls", "s"); } -void FormatConverterTestCase::format_C() { doTest(_T("C"), _T("c")); } -void FormatConverterTestCase::format_hC() { doTest(_T("hC"), _T("c")); } -void FormatConverterTestCase::format_lC() { doTest(_T("lC"), _T("lc")); } +void FormatConverterTestCase::format_C() + { doTest("C", "c", "s", "lc", "c"); } +void FormatConverterTestCase::format_hC() + { doTest("hC", "c", "s", "lc", "c"); } +void FormatConverterTestCase::format_lC() + { doTest("lC", "lc", "s", "lc", "c"); } // It's possible that although a format converts correctly alone, it leaves // the converter in a bad state that will affect subsequent formats, so @@ -228,42 +209,49 @@ void FormatConverterTestCase::format_lC() { doTest(_T("lC"), _T("lc")); } void FormatConverterTestCase::testLonger() { struct { - const wxChar *input; - const wxChar *expected; + const char *input; + const char *expectedScanf; + const char *expectedWcharUnix; + const char *expectedWcharWindows; + const char *expectedUtf8; } formats[] = { - { _T("%d"), _T("%d"), }, - { _T("%*hd"), _T("%*hd") }, - { _T("%.4ld"), _T("%.4ld") }, - { _T("%-.*s"), _T("%-.*ls") }, - { _T("%.*hs"), _T("%.*hs"), }, - { _T("%-.9ls"), _T("%-.9ls") }, - { _T("%-*c"), _T("%-*lc") }, - { _T("%3hc"), _T("%3hc") }, - { _T("%-5lc"), _T("%-5lc") } + { "%d", "%d", "%d", "%d", "%d" }, + { "%*hd", "%*hd", "%*hd", "%*hd", "%*hd" }, + { "%.4ld", "%.4ld", "%.4ld", "%.4ld", "%.4ld" }, + { "%-.*s", "%-.*ls", "%-.*ls", "%-.*s", "%-.*s" }, + { "%.*hs", "%.*hs", "%.*ls", "%.*s", "%.*s" }, + { "%-.9ls", "%-.9ls", "%-.9ls", "%-.9s", "%-.9s" }, + { "%-*c", "%-*lc", "%-*lc", "%-*c", "%-*s" }, + { "%3hc", "%3hc", "%3lc", "%3c", "%3s" }, + { "%-5lc", "%-5lc", "%-5lc", "%-5c", "%-5s" } }; size_t i, j; - // exclude patterns that don't translate correctly alone from the test - for (i = 0; i < WXSIZEOF(formats); i++) - if (wxConvertFormat(formats[i].input) != formats[i].expected) - formats[i].input = NULL; - // test all possible pairs of the above patterns for (i = 0; i < WXSIZEOF(formats); i++) { if (formats[i].input) { wxString input(formats[i].input); - wxString expected(formats[i].expected); + wxString expectedScanf(formats[i].expectedScanf); + wxString expectedUtf8(formats[i].expectedUtf8); + wxString expectedWcharUnix(formats[i].expectedWcharUnix); + wxString expectedWcharWindows(formats[i].expectedWcharWindows); for (j = 0; j < WXSIZEOF(formats); j++) if (formats[j].input) check(input + formats[j].input, - expected + formats[j].expected); + expectedScanf + formats[j].expectedScanf, + expectedUtf8 + formats[j].expectedUtf8, + expectedWcharUnix + formats[j].expectedWcharUnix, + expectedWcharWindows + formats[j].expectedWcharWindows); } } } -void FormatConverterTestCase::doTest(const wxChar *input, - const wxChar *expected) +void FormatConverterTestCase::doTest(const char *input, + const char *expectedScanf, + const char *expectedUtf8, + const char *expectedWcharUnix, + const char *expectedWcharWindows) { static const wxChar *flag_width[] = { _T(""), _T("*"), _T("10"), _T("-*"), _T("-10"), NULL }; @@ -282,20 +270,61 @@ void FormatConverterTestCase::doTest(const wxChar *input, for (const wxChar **prec = precs; *prec; prec++) for (const wxChar **width = flag_width; *width; width++) check(fmt + *width + *prec + input, - fmt + *width + *prec + expected); + fmt + *width + *prec + expectedScanf, + fmt + *width + *prec + expectedUtf8, + fmt + *width + *prec + expectedWcharUnix, + fmt + *width + *prec + expectedWcharWindows); } void FormatConverterTestCase::check(const wxString& input, - const wxString& expected) + const wxString& expectedScanf, + const wxString& expectedUtf8, + const wxString& expectedWcharUnix, + const wxString& expectedWcharWindows) { - wxString result = wxConvertFormat(input); - wxString msg = _T("input: '") + input + - _T("', result: '") + result + - _T("', expected: '") + expected + _T("'"); - CPPUNIT_ASSERT_MESSAGE(string(msg.mb_str()), result == expected); + // all of them are unused in some build configurations + wxUnusedVar(expectedScanf); + wxUnusedVar(expectedUtf8); + wxUnusedVar(expectedWcharUnix); + wxUnusedVar(expectedWcharWindows); + + wxString result, msg; + +#ifndef __WINDOWS__ + // on windows, wxScanf() string needs no modifications + result = wxScanfConvertFormatW(input.wc_str()); + + msg = _T("input: '") + input + + _T("', result (scanf): '") + result + + _T("', expected: '") + expectedScanf + _T("'"); + CPPUNIT_ASSERT_MESSAGE(string(msg.mb_str()), result == expectedScanf); +#endif // !__WINDOWS__ + +#if wxUSE_UNICODE_UTF8 + result = (const char*)wxFormatString(input); + + msg = _T("input: '") + input + + _T("', result (UTF-8): '") + result + + _T("', expected: '") + expectedUtf8 + _T("'"); + CPPUNIT_ASSERT_MESSAGE(string(msg.mb_str()), result == expectedUtf8); +#endif // wxUSE_UNICODE_UTF8 + +#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY + result = (const wchar_t*)wxFormatString(input); + +#ifdef __WINDOWS__ + wxString expectedWchar(expectedWcharWindows); +#else + wxString expectedWchar(expectedWcharUnix); +#endif + + msg = _T("input: '") + input + + _T("', result (wchar_t): '") + result + + _T("', expected: '") + expectedWchar + _T("'"); + CPPUNIT_ASSERT_MESSAGE(string(msg.mb_str()), result == expectedWchar); +#endif // wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY } -#endif // CAN_TEST // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION(FormatConverterTestCase);