CPPUNIT_TEST( ConstructorsWithConversion );
CPPUNIT_TEST( Conversion );
CPPUNIT_TEST( ConversionUTF7 );
-#endif
+ CPPUNIT_TEST( ConversionUTF8 );
+#endif // wxUSE_WCHAR_T
CPPUNIT_TEST( Extraction );
CPPUNIT_TEST( Find );
CPPUNIT_TEST( Tokenizer );
CPPUNIT_TEST( CaseChanges );
CPPUNIT_TEST( Compare );
CPPUNIT_TEST( CompareNoCase );
+ CPPUNIT_TEST( ToLong );
+ CPPUNIT_TEST( ToULong );
+ CPPUNIT_TEST( ToDouble );
CPPUNIT_TEST_SUITE_END();
void String();
void ConstructorsWithConversion();
void Conversion();
void ConversionUTF7();
-#endif
+ void ConversionUTF8();
+#endif // wxUSE_WCHAR_T
void Extraction();
void Find();
void SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode );
void CaseChanges();
void Compare();
void CompareNoCase();
+ void ToLong();
+ 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)
};
#endif
}
-void StringTestCase::ConversionUTF7()
+#if !wxUSE_UNICODE
+// in case wcscmp is missing
+//
+static int wx_wcscmp(const wchar_t *s1, const wchar_t *s2)
{
- const wchar_t data[] = { 0x00A3, 0x00A3, 0x00A3, 0x00A3, 0 }; // pound signs
-
- //utf7 and utf7alt are equivelent
- const char *utf7 = "+AKM-+AKM-+AKM-+AKM-";
- const char *utf7alt = "+AKMAowCjAKM-";
+ 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
- wxString str(data);
-
- wxCSConv conv(_T("utf-7"));
-
- wxCharBuffer theBuffer = str.mb_str(conv);
-
- CPPUNIT_ASSERT( strcmp(theBuffer, utf7) == 0 || strcmp(theBuffer, utf7alt) == 0);
-#else //ANSI
- wxString str(utf7);
+ if ( ws )
+ {
+ wxCharBuffer buf(wxString(ws).mb_str(conv));
- wxCSConv conv(_T("utf-7"));
+ CPPUNIT_ASSERT( strcmp(buf, s) == 0 );
+ }
+#else // wxUSE_UNICODE
+ if ( s )
+ {
+ wxWCharBuffer wbuf(wxString(s).wc_str(conv));
- wxWCharBuffer theWBuffer = str.wc_str(conv);
+ if ( ws )
+ CPPUNIT_ASSERT( wx_wcscmp(wbuf, ws) == 0 );
+ else
+ CPPUNIT_ASSERT( !*wbuf );
+ }
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+}
- CPPUNIT_ASSERT( wxWcslen(theWBuffer) == wxWcslen(data) );
- CPPUNIT_ASSERT( memcmp(theWBuffer, data, wxWcslen(data) * sizeof(wchar_t)) == 0 );
+struct StringConversionData
+{
+ const char *str;
+ const wchar_t *wcs;
+};
- wxString stralt(utf7alt);
+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" },
+ };
- wxWCharBuffer theWBufferAlt = stralt.wc_str(conv);
+ 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);
+ }
+}
- CPPUNIT_ASSERT( wxWcslen(theWBufferAlt) == wxWcslen(data) );
- CPPUNIT_ASSERT( memcmp(theWBufferAlt, data, wxWcslen(data) * sizeof(wchar_t)) == 0 );
+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 },
+ };
-#endif // wxUSE_UNICODE
+ 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
// call this with the string to tokenize, delimeters to use and the expected
// positions (i.e. results of GetPosition()) after each GetNextToken() call,
// terminate positions with 0
-static void
-DoTokenizerGetPosition(const wxChar *s, const wxChar *delims, int pos, ...)
+static void DoTokenizerGetPosition(const wxChar *s,
+ const wxChar *delims, int pos, ...)
{
wxStringTokenizer tkz(s, delims);
TEST_REPLACE( _T("foobar"), 3, 0, _T("-"), _T("foo-bar") );
TEST_REPLACE( _T("barfoo"), 0, 6, _T("foobar"), _T("foobar") );
+
+ #define TEST_NULLCHARREPLACE( o , olen, pos , len , replacement , r, rlen ) \
+ { \
+ wxString s(o,olen); \
+ s.replace( pos , len , replacement ); \
+ CPPUNIT_ASSERT( s == wxString(r,rlen) ); \
+ }
+
+ TEST_NULLCHARREPLACE( _T("null\0char"), 9, 5, 1, _T("d"),
+ _T("null\0dhar"), 9 );
+
+ #define TEST_WXREPLACE( o , olen, olds, news, all, r, rlen ) \
+ { \
+ wxString s(o,olen); \
+ s.Replace( olds, news, all ); \
+ CPPUNIT_ASSERT( s == wxString(r,rlen) ); \
+ }
+
+ TEST_WXREPLACE( _T("null\0char"), 9, _T("c"), _T("de"), true,
+ _T("null\0dehar"), 10 );
+
+ TEST_WXREPLACE( _T("null\0dehar"), 10, _T("de"), _T("c"), true,
+ _T("null\0char"), 9 );
+
+ #undef TEST_WXREPLACE
+ #undef TEST_NULLCHARREPLACE
#undef TEST_REPLACE
}
CPPUNIT_CNCNEQ_ASSERT( s1, neq3 );
}
+void StringTestCase::ToLong()
+{
+ long l;
+ static const struct ToLongData
+ {
+ const wxChar *str;
+ long value;
+ bool ok;
+ } longData[] =
+ {
+ { _T("1"), 1, true },
+ { _T("0"), 0, true },
+ { _T("a"), 0, false },
+ { _T("12345"), 12345, true },
+ { _T("-1"), -1, true },
+ { _T("--1"), 0, false },
+ };
+
+ size_t n;
+ for ( n = 0; n < WXSIZEOF(longData); n++ )
+ {
+ const ToLongData& ld = longData[n];
+ CPPUNIT_ASSERT_EQUAL( ld.ok, wxString(ld.str).ToLong(&l) );
+ if ( ld.ok )
+ CPPUNIT_ASSERT_EQUAL( ld.value, l );
+ }
+}
+
+void StringTestCase::ToULong()
+{
+ unsigned long ul;
+ static const struct ToULongData
+ {
+ const wxChar *str;
+ unsigned long value;
+ bool ok;
+ } ulongData[] =
+ {
+ { _T("1"), 1, true },
+ { _T("0"), 0, true },
+ { _T("a"), 0, false },
+ { _T("12345"), 12345, true },
+ // this is surprizing but consistent with strtoul() behaviour
+ { _T("-1"), ULONG_MAX, true },
+ };
+
+ size_t n;
+ for ( n = 0; n < WXSIZEOF(ulongData); n++ )
+ {
+ const ToULongData& uld = ulongData[n];
+ CPPUNIT_ASSERT_EQUAL( uld.ok, wxString(uld.str).ToULong(&ul) );
+ if ( uld.ok )
+ CPPUNIT_ASSERT_EQUAL( uld.value, ul );
+ }
+}
+
+void StringTestCase::ToDouble()
+{
+ double d;
+ static const struct ToDoubleData
+ {
+ const wxChar *str;
+ double value;
+ bool ok;
+ } doubleData[] =
+ {
+ { _T("1"), 1, true },
+ { _T("1.23"), 1.23, true },
+ { _T(".1"), .1, true },
+ { _T("1."), 1, true },
+ { _T("1.."), 0, false },
+ { _T("0"), 0, true },
+ { _T("a"), 0, false },
+ { _T("12345"), 12345, true },
+ { _T("-1"), -1, true },
+ { _T("--1"), 0, false },
+ };
+
+ // we need to use decimal point, not comma or whatever is its value for the
+ // current locale
+ wxSetlocale(LC_ALL, _T("C"));
+
+ size_t n;
+ for ( n = 0; n < WXSIZEOF(doubleData); n++ )
+ {
+ const ToDoubleData& ld = doubleData[n];
+ CPPUNIT_ASSERT_EQUAL( ld.ok, wxString(ld.str).ToDouble(&d) );
+ if ( ld.ok )
+ CPPUNIT_ASSERT_EQUAL( ld.value, d );
+ }
+}
projects / wxWidgets.git / blobdiff