CPPUNIT_TEST( ToULongLong );
#endif // wxLongLong_t
CPPUNIT_TEST( ToDouble );
+ CPPUNIT_TEST( FromDouble );
CPPUNIT_TEST( StringBuf );
CPPUNIT_TEST( UTF8Buf );
CPPUNIT_TEST( CStrDataTernaryOperator );
void ToULongLong();
#endif // wxLongLong_t
void ToDouble();
+ void FromDouble();
void StringBuf();
void UTF8Buf();
void CStrDataTernaryOperator();
CPPUNIT_ASSERT( s1 != neq2 );
CPPUNIT_ASSERT( s1 != neq3 );
CPPUNIT_ASSERT( s1 != neq4 );
+
+ CPPUNIT_ASSERT( wxString("\n").Cmp(" ") < 0 );
+ CPPUNIT_ASSERT( wxString("'").Cmp("!") > 0 );
+ CPPUNIT_ASSERT( wxString("!").Cmp("z") < 0 );
}
void StringTestCase::CompareNoCase()
CPPUNIT_CNCNEQ_ASSERT( s1, neq );
CPPUNIT_CNCNEQ_ASSERT( s1, neq2 );
CPPUNIT_CNCNEQ_ASSERT( s1, neq3 );
+
+ CPPUNIT_ASSERT( wxString("\n").CmpNoCase(" ") < 0 );
+ CPPUNIT_ASSERT( wxString("'").CmpNoCase("!") > 0);
+ CPPUNIT_ASSERT( wxString("!").Cmp("Z") < 0 );
}
void StringTestCase::Contains()
{ wxT("--1"), 0, Number_Invalid },
{ wxT("-1"), -1, Number_Signed | Number_Long },
- // this is surprizing but consistent with strtoul() behaviour
+ // this is surprising but consistent with strtoul() behaviour
{ wxT("-1"), ULONG_MAX, Number_Unsigned | Number_Long },
// this must overflow, even with 64 bit long
if ( ld.flags & (Number_LongLong | Number_Unsigned) )
continue;
-
+
// NOTE: unless you're using some exotic locale, ToCLong and ToLong
// should behave the same for our test data set:
if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.LValue(), l );
}
+
+ // special case: check that the output is not modified if the parsing
+ // failed completely
+ l = 17;
+ CPPUNIT_ASSERT( !wxString("foo").ToLong(&l) );
+ CPPUNIT_ASSERT_EQUAL( 17, l );
+
+ // also check that it is modified if we did parse something successfully in
+ // the beginning of the string
+ CPPUNIT_ASSERT( !wxString("9 cats").ToLong(&l) );
+ CPPUNIT_ASSERT_EQUAL( 9, l );
}
void StringTestCase::ToULong()
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToCULong(&ul) );
if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.ULValue(), ul );
-
+
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULong(&ul) );
if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.ULValue(), ul );
// test ToDouble() now:
- // NOTE: for the test to be reliable, we need to set the locale explicitely
+ // NOTE: for the test to be reliable, we need to set the locale explicitly
// so that we know the decimal point character to use
if (!wxLocale::IsAvailable(wxLANGUAGE_FRENCH))
return; // you should have french support installed to continue this test!
- wxLocale *locale = new wxLocale;
-
+ wxLocale locale;
+
// don't load default catalog, it may be unavailable:
- CPPUNIT_ASSERT( locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_CONV_ENCODING) );
-
+ CPPUNIT_ASSERT( locale.Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT) );
+
static const struct ToDoubleData doubleData2[] =
{
{ wxT("1"), 1, true },
if ( ld.ok )
CPPUNIT_ASSERT_EQUAL( ld.value, d );
}
-
- delete locale;
+}
+
+void StringTestCase::FromDouble()
+{
+ static const struct FromDoubleTestData
+ {
+ double value;
+ const char *str;
+ } testData[] =
+ {
+ { 1.23, "1.23" },
+ // NB: there are no standards about the minimum exponent width
+ // and newer MSVC versions use 3 digits as minimum exponent
+ // width while GNU libc uses 2 digits as minimum width...
+#ifdef wxUSING_VC_CRT_IO
+ { -3e-10, "-3e-010" },
+#else
+ { -3e-10, "-3e-10" },
+#endif
+ { -0.45678, "-0.45678" },
+ };
+
+ for ( unsigned n = 0; n < WXSIZEOF(testData); n++ )
+ {
+ const FromDoubleTestData& td = testData[n];
+ CPPUNIT_ASSERT_EQUAL( td.str, wxString::FromCDouble(td.value) );
+ }
+
+ if ( !wxLocale::IsAvailable(wxLANGUAGE_FRENCH) )
+ return;
+
+ wxLocale locale;
+ CPPUNIT_ASSERT( locale.Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT) );
+
+ for ( unsigned m = 0; m < WXSIZEOF(testData); m++ )
+ {
+ const FromDoubleTestData& td = testData[m];
+
+ wxString str(td.str);
+ str.Replace(".", ",");
+ CPPUNIT_ASSERT_EQUAL( str, wxString::FromDouble(td.value) );
+ }
}
void StringTestCase::StringBuf()
void StringTestCase::BeforeAndAfter()
{
- const wxString s(L"letter=\xe9;\xe7a=l\xe0");
+ // Construct a string with 2 equal signs in it by concatenating its three
+ // parts: before the first "=", in between the two "="s and after the last
+ // one. This allows to avoid duplicating the string contents (which has to
+ // be different for Unicode and ANSI builds) in the tests below.
+#if wxUSE_UNICODE
+ #define FIRST_PART L"letter"
+ #define MIDDLE_PART L"\xe9;\xe7a"
+ #define LAST_PART L"l\xe0"
+#else // !wxUSE_UNICODE
+ #define FIRST_PART "letter"
+ #define MIDDLE_PART "e;ca"
+ #define LAST_PART "la"
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
- CPPUNIT_ASSERT_EQUAL( "letter", s.BeforeFirst('=') );
- CPPUNIT_ASSERT_EQUAL( s, s.BeforeFirst('!') );
- CPPUNIT_ASSERT_EQUAL( L"letter=\xe9", s.BeforeFirst(';') );
+ const wxString s(FIRST_PART wxT("=") MIDDLE_PART wxT("=") LAST_PART);
- CPPUNIT_ASSERT_EQUAL( L"letter=\xe9;\xe7a", s.BeforeLast('=') );
- CPPUNIT_ASSERT_EQUAL( "", s.BeforeLast('!') );
- CPPUNIT_ASSERT_EQUAL( L"letter=\xe9", s.BeforeLast(';') );
+ wxString r;
- CPPUNIT_ASSERT_EQUAL( L"\xe9;\xe7a=l\xe0", s.AfterFirst('=') );
+ CPPUNIT_ASSERT_EQUAL( FIRST_PART, s.BeforeFirst('=', &r) );
+ CPPUNIT_ASSERT_EQUAL( MIDDLE_PART wxT("=") LAST_PART, r );
+
+ CPPUNIT_ASSERT_EQUAL( s, s.BeforeFirst('!', &r) );
+ CPPUNIT_ASSERT_EQUAL( "", r );
+
+
+ CPPUNIT_ASSERT_EQUAL( FIRST_PART wxT("=") MIDDLE_PART, s.BeforeLast('=', &r) );
+ CPPUNIT_ASSERT_EQUAL( LAST_PART, r );
+
+ CPPUNIT_ASSERT_EQUAL( "", s.BeforeLast('!', &r) );
+ CPPUNIT_ASSERT_EQUAL( s, r );
+
+
+ CPPUNIT_ASSERT_EQUAL( MIDDLE_PART wxT("=") LAST_PART, s.AfterFirst('=') );
CPPUNIT_ASSERT_EQUAL( "", s.AfterFirst('!') );
- CPPUNIT_ASSERT_EQUAL( L"\xe7a=l\xe0", s.AfterFirst(';') );
- CPPUNIT_ASSERT_EQUAL( L"l\xe0", s.AfterLast('=') );
+
+ CPPUNIT_ASSERT_EQUAL( LAST_PART, s.AfterLast('=') );
CPPUNIT_ASSERT_EQUAL( s, s.AfterLast('!') );
- CPPUNIT_ASSERT_EQUAL( L"\xe7a=l\xe0", s.AfterLast(';') );
+
+ #undef LAST_PART
+ #undef MIDDLE_PART
+ #undef FIRST_PART
}
void StringTestCase::ScopedBuffers()
projects / wxWidgets.git / blobdiff