Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix test failure on glibc systems which do not use %T; also replace CompareTimeFormats() with a macro to get failure messages on the right line

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-04 12:09:54 +00:00
parent 0c51a971fb
commit df6de630f5
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/intl/intltest.cpp
View File

@@ -125,25 +125,25 @@ void IntlTestCase::Headers()
CPPUNIT_ASSERT_EQUAL( "", m_locale->GetHeaderValue("X-Not-Here") ); CPPUNIT_ASSERT_EQUAL( "", m_locale->GetHeaderValue("X-Not-Here") );
} }
static void static wxString
CompareFormats(const char *msg, const wxString& expected, wxString actual) NormalizeFormat(const wxString& fmtOrig)
{ {
if ( actual.empty() ) wxString fmt(fmtOrig);
{
// this means that GetInfo() failed which can happen, just ignore
return;
}
#ifdef __GLIBC__ #ifdef __GLIBC__
// glibc uses some extensions in its formats which we need to convert to // glibc uses some extensions in its formats which we need to convert to
// standard form // standard form
actual.Replace("%T", "%H:%M:%S"); fmt.Replace("%T", "%H:%M:%S");
actual.Replace("%e", "%d"); fmt.Replace("%e", "%d");
#endif // __GLIBC__ #endif // __GLIBC__
CPPUNIT_ASSERT_EQUAL_MESSAGE( msg, expected, actual ); return fmt;
} }
#define WX_ASSERT_EQUAL_FORMAT(msg, expected, actual) \
if ( !actual.empty() ) \
CPPUNIT_ASSERT_EQUAL_MESSAGE(msg, expected, NormalizeFormat(actual))
void IntlTestCase::DateTimeFmtFrench() void IntlTestCase::DateTimeFmtFrench()
{ {
if ( !m_locale ) if ( !m_locale )
@@ -154,7 +154,7 @@ void IntlTestCase::DateTimeFmtFrench()
// standard format uses slashes) // standard format uses slashes)
static const char *FRENCH_DATE_FMT = "%d.%m.%Y"; static const char *FRENCH_DATE_FMT = "%d.%m.%Y";
static const char *FRENCH_LONG_DATE_FMT = "%a %d %b %Y"; static const char *FRENCH_LONG_DATE_FMT = "%a %d %b %Y";
static const char *FRENCH_DATE_TIME_FMT = "%a %d %b %Y %T %Z"; static const char *FRENCH_DATE_TIME_FMT = "%a %d %b %Y %H:%M:%S %Z";
#else #else
static const char *FRENCH_DATE_FMT = "%d/%m/%Y"; static const char *FRENCH_DATE_FMT = "%d/%m/%Y";
static const char *FRENCH_LONG_DATE_FMT = "%A %d %B %Y"; static const char *FRENCH_LONG_DATE_FMT = "%A %d %B %Y";
@@ -165,13 +165,13 @@ void IntlTestCase::DateTimeFmtFrench()
#endif #endif
#endif #endif
CompareFormats( "French short date", FRENCH_DATE_FMT, WX_ASSERT_EQUAL_FORMAT( "French short date", FRENCH_DATE_FMT,
m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) ); m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) );
CompareFormats( "French long date", FRENCH_LONG_DATE_FMT, WX_ASSERT_EQUAL_FORMAT( "French long date", FRENCH_LONG_DATE_FMT,
m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) ); m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) );
CompareFormats( "French date and time", FRENCH_DATE_TIME_FMT, WX_ASSERT_EQUAL_FORMAT( "French date and time", FRENCH_DATE_TIME_FMT,
m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT) ); m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT) );
CompareFormats( "French time", "%H:%M:%S", WX_ASSERT_EQUAL_FORMAT( "French time", "%H:%M:%S",
m_locale->GetInfo(wxLOCALE_TIME_FMT) ); m_locale->GetInfo(wxLOCALE_TIME_FMT) );
} }
@@ -194,13 +194,13 @@ void IntlTestCase::DateTimeFmtC()
setlocale(LC_ALL, "C"); setlocale(LC_ALL, "C");
CompareFormats( "C short date", C_DATE_FMT, WX_ASSERT_EQUAL_FORMAT( "C short date", C_DATE_FMT,
m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) ); m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) );
CompareFormats( "C long date", C_LONG_DATE_FMT, WX_ASSERT_EQUAL_FORMAT( "C long date", C_LONG_DATE_FMT,
m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) ); m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) );
CompareFormats( "C date and time", C_DATE_TIME_FMT, WX_ASSERT_EQUAL_FORMAT( "C date and time", C_DATE_TIME_FMT,
m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT) ); m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT) );
CompareFormats( "C time", "%H:%M:%S", WX_ASSERT_EQUAL_FORMAT( "C time", "%H:%M:%S",
m_locale->GetInfo(wxLOCALE_TIME_FMT) ); m_locale->GetInfo(wxLOCALE_TIME_FMT) );
} }