Applied #13763 from dghart, to use primary selections if available

[wxWidgets.git] / tests / intl / intltest.cpp

diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp
index 097e3a9025a0cff1a86c67eb328c6aa4ea95aafd..d747b7aa265361b8e9feed9924343a9f6c2397ef 100644 (file)
--- a/tests/intl/intltest.cpp
+++ b/tests/intl/intltest.cpp
@@ -41,10 +41,16 @@ private:
     CPPUNIT_TEST_SUITE( IntlTestCase );
         CPPUNIT_TEST( Domain );
         CPPUNIT_TEST( Headers );
     CPPUNIT_TEST_SUITE( IntlTestCase );
         CPPUNIT_TEST( Domain );
         CPPUNIT_TEST( Headers );

+        CPPUNIT_TEST( DateTimeFmtFrench );
+        CPPUNIT_TEST( DateTimeFmtC );
+        CPPUNIT_TEST( IsAvailable );

     CPPUNIT_TEST_SUITE_END();
 
     void Domain();
     void Headers();
     CPPUNIT_TEST_SUITE_END();
 
     void Domain();
     void Headers();

+    void DateTimeFmtFrench();
+    void DateTimeFmtC();
+    void IsAvailable();

 
     wxLocale *m_locale;
 
 
     wxLocale *m_locale;
 


@@ -54,21 +60,24 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( IntlTestCase );
 
 // 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_TEST_SUITE_NAMED_REGISTRATION( IntlTestCase, "IntlTestCase" );
 
 void IntlTestCase::setUp()
 {

-    if (!wxLocale::IsAvailable(wxLANGUAGE_FRENCH))
-        return;     // you should have french support installed to run this test!
+    // Check that French locale is supported, this test doesn't work without it
+    // and all the other function need to check whether m_locale is non-NULL
+    // before continuing
+    if ( !wxLocale::IsAvailable(wxLANGUAGE_FRENCH) )
+        return;

 
     wxLocale::AddCatalogLookupPathPrefix("./intl");
 
     m_locale = new wxLocale;
 
     wxLocale::AddCatalogLookupPathPrefix("./intl");
 
     m_locale = new wxLocale;

-    CPPUNIT_ASSERT( m_locale);
-    
+    CPPUNIT_ASSERT( m_locale );
+

     // don't load default catalog, it may be unavailable:
     // 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( loaded );
 
     m_locale->AddCatalog("internat");


@@ -86,7 +95,7 @@ void IntlTestCase::tearDown()
 void IntlTestCase::Domain()
 {
     if (!m_locale)
 void IntlTestCase::Domain()
 {
     if (!m_locale)

-        return;     // no french support installed on this system!
+        return;

 
     // _() searches all domains by default:
     CPPUNIT_ASSERT_EQUAL( "&Ouvrir un fichier", _("&Open bogus file") );
 
     // _() searches all domains by default:
     CPPUNIT_ASSERT_EQUAL( "&Ouvrir un fichier", _("&Open bogus file") );


@@ -100,8 +109,8 @@ void IntlTestCase::Domain()
 
 void IntlTestCase::Headers()
 {
 
 void IntlTestCase::Headers()
 {

-    if (!m_locale)
-        return;     // no french support installed on this system!
+    if ( !m_locale )
+        return;

 
     CPPUNIT_ASSERT_EQUAL( "wxWindows 2.0 i18n sample", m_locale->GetHeaderValue("Project-Id-Version") );
     CPPUNIT_ASSERT_EQUAL( "1999-01-13 18:19+0100", m_locale->GetHeaderValue("POT-Creation-Date") );
 
     CPPUNIT_ASSERT_EQUAL( "wxWindows 2.0 i18n sample", m_locale->GetHeaderValue("Project-Id-Version") );
     CPPUNIT_ASSERT_EQUAL( "1999-01-13 18:19+0100", m_locale->GetHeaderValue("POT-Creation-Date") );


@@ -118,4 +127,93 @@ void IntlTestCase::Headers()
     CPPUNIT_ASSERT_EQUAL( "", m_locale->GetHeaderValue("X-Not-Here") );
 }
 
     CPPUNIT_ASSERT_EQUAL( "", m_locale->GetHeaderValue("X-Not-Here") );
 }
 

+static wxString
+NormalizeFormat(const wxString& fmtOrig)
+{
+    wxString fmt(fmtOrig);
+
+#ifdef __GLIBC__
+    // glibc uses some extensions in its formats which we need to convert to
+    // standard form
+    fmt.Replace("%T", "%H:%M:%S");
+    fmt.Replace("%e", "%d");
+#endif // __GLIBC__
+
+    return fmt;
+}
+
+#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;
+
+#ifdef __GLIBC__
+    // glibc also uses dots for French locale separator for some reason (the
+    // standard format uses slashes)
+    static const char *FRENCH_DATE_FMT = "%d.%m.%Y";
+    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) );
+    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
+
+    setlocale(LC_ALL, "C");
+
+    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) );
+    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
 #endif // wxUSE_INTL