summaryrefslogtreecommitdiffstats
path: root/tests/WordBreakerTests.cpp
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2016-04-19 17:14:27 +0900
committerRaph Levien <raph@google.com>2016-04-19 14:09:38 +0000
commit77f488345316fba46c271fc04bea470819ae1712 (patch)
treeb6ddec308ee5b78a70ce99b77af907d9f983e92a /tests/WordBreakerTests.cpp
parent994aa84f7b18466806fe552ea57da1852b909f24 (diff)
downloadandroid_frameworks_minikin-77f488345316fba46c271fc04bea470819ae1712.tar.gz
android_frameworks_minikin-77f488345316fba46c271fc04bea470819ae1712.tar.bz2
android_frameworks_minikin-77f488345316fba46c271fc04bea470819ae1712.zip
Do not break before and after ZWJ.
The emoji list is generated from external/unicode/emoji-data.txt Bug: 28248662 Change-Id: Ie49b3782505665d62c24371ca23d317ae5e9c5f7
Diffstat (limited to 'tests/WordBreakerTests.cpp')
-rw-r--r--tests/WordBreakerTests.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/WordBreakerTests.cpp b/tests/WordBreakerTests.cpp
index 480c57d..9fa9da3 100644
--- a/tests/WordBreakerTests.cpp
+++ b/tests/WordBreakerTests.cpp
@@ -93,6 +93,8 @@ TEST_F(WordBreakerTest, zwjEmojiSequences) {
UTF16(0x1F469), 0x200D, 0x2764, 0x200D, UTF16(0x1F48B), 0x200D, UTF16(0x1F469),
// eye + zwj + left speech bubble
UTF16(0x1F441), 0x200D, UTF16(0x1F5E8),
+ // CAT FACE + zwj + BUST IN SILHOUETTE
+ UTF16(0x1F431), 0x200D, UTF16(0x1F464),
};
WordBreaker breaker;
breaker.setLocale(icu::Locale::getEnglish());
@@ -104,9 +106,12 @@ TEST_F(WordBreakerTest, zwjEmojiSequences) {
EXPECT_EQ(17, breaker.next()); // after woman + zwj + heart + zwj + woman
EXPECT_EQ(7, breaker.wordStart());
EXPECT_EQ(17, breaker.wordEnd());
- EXPECT_EQ((ssize_t)NELEM(buf), breaker.next()); // end
+ EXPECT_EQ(22, breaker.next()); // after eye + zwj + left speech bubble
EXPECT_EQ(17, breaker.wordStart());
EXPECT_EQ(22, breaker.wordEnd());
+ EXPECT_EQ((ssize_t)NELEM(buf), breaker.next()); // end
+ EXPECT_EQ(22, breaker.wordStart());
+ EXPECT_EQ(27, breaker.wordEnd());
}
TEST_F(WordBreakerTest, emojiWithModifier) {