Commit 124d0fc3 authored by Koji Ishii's avatar Koji Ishii Committed by Commit Bot

Reenable HyphenationTest.HyphenLocations on Android

The cause of the failure is not clear, but this test did not
skip when dictionaries are not available. This patch adds the
same condition as other tests in |HyphenationTest|.

Bug: 851413
Change-Id: I627290f090a433cd481adeba2c00484231bfee19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2483544Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818391}
parent 895ae909
...@@ -70,14 +70,13 @@ TEST_F(HyphenationTest, Get) { ...@@ -70,14 +70,13 @@ TEST_F(HyphenationTest, Get) {
} }
#if defined(USE_MINIKIN_HYPHENATION) || defined(OS_MAC) #if defined(USE_MINIKIN_HYPHENATION) || defined(OS_MAC)
// TODO(crbug.com/851413): Reenable this test. TEST_F(HyphenationTest, HyphenLocations) {
scoped_refptr<Hyphenation> hyphenation = GetHyphenation("en-us");
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#define MAYBE_HyphenLocations DISABLED_HyphenLocations // Hyphenation is available only for Android M MR1 or later.
#else if (!hyphenation)
#define MAYBE_HyphenLocations HyphenLocations return;
#endif #endif
TEST_F(HyphenationTest, MAYBE_HyphenLocations) {
scoped_refptr<Hyphenation> hyphenation = GetHyphenation("en-us");
ASSERT_TRUE(hyphenation) << "Cannot find the hyphenation engine"; ASSERT_TRUE(hyphenation) << "Cannot find the hyphenation engine";
// Get all hyphenation points by |HyphenLocations|. // Get all hyphenation points by |HyphenLocations|.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment