Related: #i103552# add regression test for シャットダウン

Change-Id: I30117fdf70036f6df8dc494fe33a8a56d5544635

3 files changed, 24 insertions, 8 deletions

diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 62100a017244..3a7855d8e3f4 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -51,4 +51,8 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\
 	i18npool/util/i18npool \
 ))
 
+$(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : \
+    $(call gb_Library_get_target,dict_ja) \
+    $(call gb_Library_get_target,dict_zh)
+
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 3fb555dce48e..63f9708e708d 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -61,6 +61,7 @@ public:
     void testNorthernThai();
 #endif
     void testKhmer();
+    void testJapanese();
 
     CPPUNIT_TEST_SUITE(TestBreakIterator);
     CPPUNIT_TEST(testLineBreaking);
@@ -75,6 +76,7 @@ public:
     CPPUNIT_TEST(testWordBoundaries);
     CPPUNIT_TEST(testKhmer);
 #endif
+    CPPUNIT_TEST(testJapanese);
     CPPUNIT_TEST_SUITE_END();
 private:
     uno::Reference<i18n::XBreakIterator> m_xBreak;
@@ -820,9 +822,9 @@ void TestBreakIterator::testKhmer()
     aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("km"));
     aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KH"));
 
-    const sal_Unicode KHMER1[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 };
+    const sal_Unicode KHMER[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 };
 
-    rtl::OUString aTest(KHMER1, SAL_N_ELEMENTS(KHMER1));
+    rtl::OUString aTest(KHMER, SAL_N_ELEMENTS(KHMER));
     i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
         i18n::WordType::DICTIONARY_WORD, true);
 
@@ -835,6 +837,21 @@ void TestBreakIterator::testKhmer()
 }
 #endif
 
+void TestBreakIterator::testJapanese()
+{
+    lang::Locale aLocale;
+    aLocale.Language = OUString("ja");
+    aLocale.Country = OUString("JP");
+
+    const sal_Unicode JAPANESE[] = { 0x30B7, 0x30E3, 0x30C3, 0x30C8, 0x30C0, 0x30A6, 0x30F3 };
+
+    rtl::OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE));
+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 5, aLocale,
+        i18n::WordType::DICTIONARY_WORD, true);
+
+    CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 7);
+}
+
 void TestBreakIterator::setUp()
 {
     BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
index 4899f6070185..95f6b009e911 100644
--- a/i18npool/source/breakiterator/data/README
+++ b/i18npool/source/breakiterator/data/README
@@ -16,12 +16,6 @@ latest versions.
 
 to-review, later are ok:
 
-commit ae9d7c2cef9ecd42687d64f985b9e2dcbc68a034
-Author: Thomas Lange [tl] <tl@openoffice.org>
-Date:   Tue Apr 27 10:09:22 2010 +0200
-
-    cws tl80: #i103552# Japanese word for 'shutdown' added to ja.dic
-
 commit ffdc043d7272d2e0a664f530bbc112f952acadab
 Author: Thomas Lange [tl] <tl@openoffice.org>
 Date:   Mon Mar 15 09:22:49 2010 +0100
@@ -561,6 +555,7 @@ Date:   Mon Mar 8 16:17:05 2004 +0000
 
 done, regression tests added:
 
+#i103552# Japanese word for 'shutdown' added to ja.dic
 #i113785# ligatures for spell checking will no longer break words
 An opening quote should not be counted as a word by word count tool (regression test in in writer)
 fdo#31271 wrong line break with (