X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b26ed94e4fd3fc3f6cac6c2fa7e3ed6d4b56706f..d924939be81c8a836516cded30f1392cd9b6baf5:/tests/strings/strings.cpp?ds=sidebyside diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index 3e25c70f48..42db733cb5 100644 --- a/tests/strings/strings.cpp +++ b/tests/strings/strings.cpp @@ -36,13 +36,8 @@ private: CPPUNIT_TEST( PChar ); CPPUNIT_TEST( Format ); CPPUNIT_TEST( Constructors ); -#if wxUSE_WCHAR_T - CPPUNIT_TEST( ConstructorsWithConversion ); - CPPUNIT_TEST( Conversion ); - CPPUNIT_TEST( ConversionUTF7 ); - CPPUNIT_TEST( ConversionUTF8 ); -#endif // wxUSE_WCHAR_T CPPUNIT_TEST( Extraction ); + CPPUNIT_TEST( Trim ); CPPUNIT_TEST( Find ); CPPUNIT_TEST( Replace ); CPPUNIT_TEST( Match ); @@ -58,13 +53,8 @@ private: void PChar(); void Format(); void Constructors(); -#if wxUSE_WCHAR_T - void ConstructorsWithConversion(); - void Conversion(); - void ConversionUTF7(); - void ConversionUTF8(); -#endif // wxUSE_WCHAR_T void Extraction(); + void Trim(); void Find(); void Replace(); void Match(); @@ -75,14 +65,6 @@ private: void ToULong(); void ToDouble(); -#if wxUSE_WCHAR_T - // test if converting s using the given encoding gives ws and vice versa - // - // if either of the first 2 arguments is NULL, the conversion is supposed - // to fail - void DoTestConversion(const char *s, const wchar_t *w, wxCSConv& conv); -#endif // wxUSE_WCHAR_T - DECLARE_NO_COPY_CLASS(StringTestCase) }; @@ -170,165 +152,6 @@ void StringTestCase::Constructors() TEST_CTOR((start, end), _T("really")); } -#if wxUSE_WCHAR_T -void StringTestCase::ConstructorsWithConversion() -{ - // the string "Déjà" in UTF-8 and wchar_t: - const unsigned char utf8Buf[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0}; - const wchar_t wchar[] = {0x44,0xE9,0x6A,0xE0,0}; - const unsigned char utf8subBuf[] = {0x44,0xC3,0xA9,0x6A,0}; // just "Déj" - const char *utf8 = (char *)utf8Buf; - const char *utf8sub = (char *)utf8subBuf; - - wxString s1(utf8, wxConvUTF8); - wxString s2(wchar, wxConvUTF8); - -#if wxUSE_UNICODE - CPPUNIT_ASSERT( s1 == wchar ); - CPPUNIT_ASSERT( s2 == wchar ); -#else - CPPUNIT_ASSERT( s1 == utf8 ); - CPPUNIT_ASSERT( s2 == utf8 ); -#endif - - wxString sub(utf8sub, wxConvUTF8); // "Dej" substring - wxString s3(utf8, wxConvUTF8, 4); - wxString s4(wchar, wxConvUTF8, 3); - - CPPUNIT_ASSERT( s3 == sub ); - CPPUNIT_ASSERT( s4 == sub ); - -#if wxUSE_UNICODE - CPPUNIT_ASSERT ( wxString("\t[pl]open.format.Sformatuj dyskietkê=gfloppy %f", - wxConvUTF8) == wxT("") ); //should stop at pos 35 -#endif -} - -void StringTestCase::Conversion() -{ -#if wxUSE_UNICODE - wxString szTheString(L"The\0String", wxConvLibc, 10); - wxCharBuffer theBuffer = szTheString.mb_str(); - - CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", 11) == 0 ); - - wxString szTheString2("The\0String", wxConvLocal, 10); - CPPUNIT_ASSERT( szTheString2.length() == 11 ); - CPPUNIT_ASSERT( wxTmemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 ); -#else - wxString szTheString(wxT("TheString")); - szTheString.insert(3, 1, '\0'); - wxWCharBuffer theBuffer = szTheString.wc_str(wxConvLibc); - - CPPUNIT_ASSERT( memcmp(theBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 ); - - wxString szLocalTheString(wxT("TheString")); - szLocalTheString.insert(3, 1, '\0'); - wxWCharBuffer theLocalBuffer = szLocalTheString.wc_str(wxConvLocal); - - CPPUNIT_ASSERT( memcmp(theLocalBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 ); -#endif -} - -#if !wxUSE_UNICODE -// in case wcscmp is missing -// -static int wx_wcscmp(const wchar_t *s1, const wchar_t *s2) -{ - while (*s1 == *s2 && *s1 != 0) - { - s1++; - s2++; - } - return *s1 - *s2; -} -#endif - -void -StringTestCase::DoTestConversion(const char *s, - const wchar_t *ws, - wxCSConv& conv) -{ -#if wxUSE_UNICODE - if ( ws ) - { - wxCharBuffer buf(wxString(ws).mb_str(conv)); - - CPPUNIT_ASSERT( strcmp(buf, s) == 0 ); - } -#else // wxUSE_UNICODE - if ( s ) - { - wxWCharBuffer wbuf(wxString(s).wc_str(conv)); - - if ( ws ) - CPPUNIT_ASSERT( wx_wcscmp(wbuf, ws) == 0 ); - else - CPPUNIT_ASSERT( !*wbuf ); - } -#endif // wxUSE_UNICODE/!wxUSE_UNICODE -} - -struct StringConversionData -{ - const char *str; - const wchar_t *wcs; -}; - -void StringTestCase::ConversionUTF7() -{ - static const StringConversionData utf7data[] = - { - { "+-", L"+" }, - { "+--", L"+-" }, - //\u isn't recognized on MSVC 6 -#if !defined(_MSC_VER) -#if !defined(__GNUC__) || (__GNUC__ >= 3) - { "+AKM-", L"\u00a3" }, -#endif -#endif - // Windows accepts invalid UTF-7 strings and so does our UTF-7 - // conversion code -- this is wrong IMO but the way it is for now - // - // notice that converting "+" still behaves as expected because the - // result is just an empty string, i.e. the same as if there were an - // error, but converting "a+" results in "a" while it really should - // fail - { "+", NULL }, - { "a+", L"a" }, - }; - - wxCSConv conv(_T("utf-7")); - for ( size_t n = 0; n < WXSIZEOF(utf7data); n++ ) - { - const StringConversionData& d = utf7data[n]; - DoTestConversion(d.str, d.wcs, conv); - } -} - -void StringTestCase::ConversionUTF8() -{ - static const StringConversionData utf8data[] = - { - //\u isn't recognized on MSVC 6 -#if !defined(_MSC_VER) -#if !defined(__GNUC__) || (__GNUC__ >= 3) - { "\xc2\xa3", L"\u00a3" }, -#endif -#endif - { "\xc2", NULL }, - }; - - wxCSConv conv(_T("utf-8")); - for ( size_t n = 0; n < WXSIZEOF(utf8data); n++ ) - { - const StringConversionData& d = utf8data[n]; - DoTestConversion(d.str, d.wcs, conv); - } -} - -#endif // wxUSE_WCHAR_T - void StringTestCase::Extraction() { @@ -344,11 +167,10 @@ void StringTestCase::Extraction() wxString rest; - #define TEST_STARTS_WITH( prefix , correct_rest, result ) \ - CPPUNIT_ASSERT( \ - ( s.StartsWith( prefix, &rest ) == result ) && \ - ( ( result == false ) || ( wxStrcmp( correct_rest , rest ) == 0 ) ) \ - ) + #define TEST_STARTS_WITH(prefix, correct_rest, result) \ + CPPUNIT_ASSERT_EQUAL(result, s.StartsWith(prefix, &rest)); \ + if ( result ) \ + CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest) TEST_STARTS_WITH( _T("Hello"), _T(", world!"), true ); TEST_STARTS_WITH( _T("Hello, "), _T("world!"), true ); @@ -359,6 +181,41 @@ void StringTestCase::Extraction() TEST_STARTS_WITH( _T("Hi"), _T(""), false ); #undef TEST_STARTS_WITH + + #define TEST_ENDS_WITH(suffix, correct_rest, result) \ + CPPUNIT_ASSERT_EQUAL(result, s.EndsWith(suffix, &rest)); \ + if ( result ) \ + CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest) + + TEST_ENDS_WITH( _T(""), _T("Hello, world!"), true ); + TEST_ENDS_WITH( _T("!"), _T("Hello, world"), true ); + TEST_ENDS_WITH( _T(", world!"), _T("Hello"), true ); + TEST_ENDS_WITH( _T("ello, world!"), _T("H"), true ); + TEST_ENDS_WITH( _T("Hello, world!"), _T(""), true ); + TEST_ENDS_WITH( _T("very long string"), _T(""), false ); + TEST_ENDS_WITH( _T("?"), _T(""), false ); + TEST_ENDS_WITH( _T("Hello, world"), _T(""), false ); + TEST_ENDS_WITH( _T("Gello, world!"), _T(""), false ); + + #undef TEST_ENDS_WITH +} + +void StringTestCase::Trim() +{ + #define TEST_TRIM( str , dir , result ) \ + CPPUNIT_ASSERT( wxString(str).Trim(dir) == result ) + + TEST_TRIM( _T(" Test "), true, _T(" Test") ); + TEST_TRIM( _T(" "), true, _T("") ); + TEST_TRIM( _T(" "), true, _T("") ); + TEST_TRIM( _T(""), true, _T("") ); + + TEST_TRIM( _T(" Test "), false, _T("Test ") ); + TEST_TRIM( _T(" "), false, _T("") ); + TEST_TRIM( _T(" "), false, _T("") ); + TEST_TRIM( _T(""), false, _T("") ); + + #undef TEST_TRIM } void StringTestCase::Find()