CPPUNIT_TEST_SUITE( IntlTestCase );
CPPUNIT_TEST( Domain );
CPPUNIT_TEST( Headers );
- CPPUNIT_TEST( DateTimeFmt );
+ CPPUNIT_TEST( DateTimeFmtFrench );
+ CPPUNIT_TEST( DateTimeFmtC );
+ CPPUNIT_TEST( IsAvailable );
CPPUNIT_TEST_SUITE_END();
void Domain();
void Headers();
- void DateTimeFmt();
+ void DateTimeFmtFrench();
+ void DateTimeFmtC();
+ void IsAvailable();
wxLocale *m_locale;
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( IntlTestCase );
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IntlTestCase, "IntlTestCase" );
void IntlTestCase::setUp()
CPPUNIT_ASSERT( m_locale );
// don't load default catalog, it may be unavailable:
- bool loaded = m_locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_CONV_ENCODING);
+ bool loaded = m_locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT);
CPPUNIT_ASSERT( loaded );
m_locale->AddCatalog("internat");
CPPUNIT_ASSERT_EQUAL( "YEAR-MO-DA HO:MI+ZONE", m_locale->GetHeaderValue("PO-Revision-Date") );
CPPUNIT_ASSERT_EQUAL( "Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>", m_locale->GetHeaderValue("Last-Translator") );
CPPUNIT_ASSERT_EQUAL( "1.0", m_locale->GetHeaderValue("MIME-Version") );
- CPPUNIT_ASSERT_EQUAL( "text/plain; charset=iso-8859-1", m_locale->GetHeaderValue("Content-Type") );
+ CPPUNIT_ASSERT_EQUAL( "text/plain; charset=utf-8", m_locale->GetHeaderValue("Content-Type") );
CPPUNIT_ASSERT_EQUAL( "8bit", m_locale->GetHeaderValue("Content-Transfer-Encoding") );
// check that it fails with a bogus domain:
CPPUNIT_ASSERT_EQUAL( "", m_locale->GetHeaderValue("X-Not-Here") );
}
-static void CompareFormats(const wxString& expected, wxString actual)
+static wxString
+NormalizeFormat(const wxString& fmtOrig)
{
- if ( actual.empty() )
- {
- // this means that GetInfo() failed which can happen, just ignore
- return;
- }
+ wxString fmt(fmtOrig);
#ifdef __GLIBC__
// glibc uses some extensions in its formats which we need to convert to
// standard form
- actual.Replace("%T", "%H:%M:%S");
- actual.Replace("%e", "%d");
+ fmt.Replace("%T", "%H:%M:%S");
+ fmt.Replace("%e", "%d");
#endif // __GLIBC__
- CPPUNIT_ASSERT_EQUAL( expected, actual );
+ return fmt;
}
-void IntlTestCase::DateTimeFmt()
+#define WX_ASSERT_EQUAL_FORMAT(msg, expected, actual) \
+ if ( !actual.empty() ) \
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(msg, expected, NormalizeFormat(actual))
+
+void IntlTestCase::DateTimeFmtFrench()
{
if ( !m_locale )
return;
- CompareFormats( "%d.%m.%Y", m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) );
- CompareFormats( "%a %d %b %Y", m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) );
- CompareFormats( "%a %d %b %Y %H:%M:%S %Z",
+#ifdef __GLIBC__
+ // Versions of glibc up to 2.7 wrongly used periods for French locale
+ // separator.
+#if __GLIBC__ > 2 || __GLIBC_MINOR__ >= 8
+ static const char *FRENCH_DATE_FMT = "%d/%m/%Y";
+#else
+ static const char *FRENCH_DATE_FMT = "%d.%m.%Y";
+#endif
+ static const char *FRENCH_LONG_DATE_FMT = "%a %d %b %Y";
+ static const char *FRENCH_DATE_TIME_FMT = "%a %d %b %Y %H:%M:%S %Z";
+#else
+ static const char *FRENCH_DATE_FMT = "%d/%m/%Y";
+ static const char *FRENCH_LONG_DATE_FMT = "%A %d %B %Y";
+#ifdef __WXOSX__
+ static const char *FRENCH_DATE_TIME_FMT = "%A %d %B %Y %H:%M:%S";
+#else
+ static const char *FRENCH_DATE_TIME_FMT = "%d/%m/%Y %H:%M:%S";
+#endif
+#endif
+
+ WX_ASSERT_EQUAL_FORMAT( "French short date", FRENCH_DATE_FMT,
+ m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) );
+ WX_ASSERT_EQUAL_FORMAT( "French long date", FRENCH_LONG_DATE_FMT,
+ m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) );
+ WX_ASSERT_EQUAL_FORMAT( "French date and time", FRENCH_DATE_TIME_FMT,
m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT) );
- CompareFormats( "%H:%M:%S", m_locale->GetInfo(wxLOCALE_TIME_FMT) );
+ WX_ASSERT_EQUAL_FORMAT( "French time", "%H:%M:%S",
+ m_locale->GetInfo(wxLOCALE_TIME_FMT) );
+}
+
+void IntlTestCase::DateTimeFmtC()
+{
+ // again, glibc uses different defaults
+#ifdef __GLIBC__
+ static const char *C_DATE_FMT = "%m/%d/%y";
+ static const char *C_LONG_DATE_FMT = "%a %b %d %Y";
+ static const char *C_DATE_TIME_FMT = "%a %b %d %H:%M:%S %Y";
+#else
+ static const char *C_DATE_FMT = "%d/%m/%Y";
+ static const char *C_LONG_DATE_FMT = "%A %d %B %Y";
+#ifdef __WXOSX__
+ static const char *C_DATE_TIME_FMT = "%A %d %B %Y %H:%M:%S";
+#else
+ static const char *C_DATE_TIME_FMT = "%d/%m/%Y %H:%M:%S";
+#endif
+#endif
- // also test for "C" locale
setlocale(LC_ALL, "C");
- CompareFormats( "%m/%d/%y", m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) );
- CompareFormats( "%a %b %d %Y", m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) );
- CompareFormats( "%a %b %d %H:%M:%S %Y",
+ WX_ASSERT_EQUAL_FORMAT( "C short date", C_DATE_FMT,
+ m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) );
+ WX_ASSERT_EQUAL_FORMAT( "C long date", C_LONG_DATE_FMT,
+ m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) );
+ WX_ASSERT_EQUAL_FORMAT( "C date and time", C_DATE_TIME_FMT,
m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT) );
- CompareFormats( "%H:%M:%S", m_locale->GetInfo(wxLOCALE_TIME_FMT) );
+ WX_ASSERT_EQUAL_FORMAT( "C time", "%H:%M:%S",
+ m_locale->GetInfo(wxLOCALE_TIME_FMT) );
+}
+
+void IntlTestCase::IsAvailable()
+{
+ const wxString origLocale(setlocale(LC_ALL, NULL));
+
+ // Calling IsAvailable() shouldn't change the locale.
+ wxLocale::IsAvailable(wxLANGUAGE_ENGLISH);
+
+ CPPUNIT_ASSERT_EQUAL( origLocale, setlocale(LC_ALL, NULL) );
}
#endif // wxUSE_INTL
projects / wxWidgets.git / blobdiff