diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-14 10:14:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-14 10:14:18 +0200 |
| commit | 2c975878ff82eb911e488359f7f3fdb7ec104584 (patch) | |
| tree | ee78a4aff47a2343376da7bb2f977420e639a0a5 /i18nlangtag/qa | |
| parent | 068c04fb06806a9345c0059545d19a416d7e60b7 (diff) | |
Pass ENABLE_LIBLANGTAG into code via config_liblangtag.h
...so changes to ENABLE_LIBLANGTAG during configure cause proper recompilation
of source code
Change-Id: I282623c885b83e3bf7d94f6f364c5031c012f058
Diffstat (limited to 'i18nlangtag/qa')
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index f93f1df53f7d..76ef5a36fa05 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -17,6 +17,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> +#include <config_liblangtag.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <osl/file.hxx> @@ -25,14 +26,6 @@ using namespace com::sun::star; -// To test the replacement code add '&& 0' and also in -// source/languagetag/languagetag.cxx -#if defined(ENABLE_LIBLANGTAG) -#define USE_LIBLANGTAG 1 -#else -#define USE_LIBLANGTAG 0 -#endif - namespace { class TestLanguageTag : public CppUnit::TestFixture @@ -58,7 +51,7 @@ void TestLanguageTag::testAllTags() OUString aBcp47 = de_DE.getBcp47(); lang::Locale aLocale = de_DE.getLocale(); LanguageType nLanguageType = de_DE.getLanguageType(); -#if USE_LIBLANGTAG +#if ENABLE_LIBLANGTAG CPPUNIT_ASSERT_MESSAGE("Default script should be stripped after canonicalize.", aBcp47 == "de-DE" ); CPPUNIT_ASSERT( aLocale.Language == "de" ); CPPUNIT_ASSERT( aLocale.Country == "DE" ); @@ -87,7 +80,7 @@ void TestLanguageTag::testAllTags() OUString s_klingon( "i-klingon" ); LanguageTag klingon( s_klingon, true ); lang::Locale aLocale = klingon.getLocale(); -#if USE_LIBLANGTAG +#if ENABLE_LIBLANGTAG CPPUNIT_ASSERT( klingon.getBcp47() == "tlh" ); CPPUNIT_ASSERT( aLocale.Language == "tlh" ); CPPUNIT_ASSERT( aLocale.Country.isEmpty() ); @@ -469,7 +462,7 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( en_GB_oxendict_Fallbacks[4] == "en"); } -#if USE_LIBLANGTAG +#if ENABLE_LIBLANGTAG // 'zh-yue-HK' uses redundant 'zh-yue' and should be preferred 'yue-HK' #if 0 /* XXX Disabled because liblangtag in lt_tag_canonicalize() after replacing @@ -623,7 +616,7 @@ void TestLanguageTag::testAllTags() CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) && aCanonicalized == "en-US" ); CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized, true) && aCanonicalized == "x-foobar" ); CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) && aCanonicalized == "qaa" ); -#if USE_LIBLANGTAG +#if ENABLE_LIBLANGTAG CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" ); /* TODO: at least some (those we know) grandfathered tags should be * recognized by the replacement code. */ |