| Index: content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| index e1a3ac1b011a784048fbe27b65ab8e5a9ffb765f..ee6ab2bf1fff30689c25b843a6bef117205a9e91 100644
|
| --- a/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| +++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| @@ -320,7 +320,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
|
| ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
|
| }
|
|
|
| -TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
|
| +TEST_F(BrowserAccessibilityTest, DISABLED_TestTextBoundaries) {
|
| std::string text1_value = "One two three.\nFour five six.";
|
|
|
| ui::AXNodeData text1;
|
| @@ -374,22 +374,22 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
|
|
|
| ASSERT_EQ(S_FALSE, text1_obj->get_textAtOffset(
|
| text1_len, IA2_TEXT_BOUNDARY_CHAR, &start, &end, text.Receive()));
|
| - ASSERT_EQ(text1_len, start);
|
| - ASSERT_EQ(text1_len, end);
|
| + ASSERT_EQ(0, start);
|
| + ASSERT_EQ(0, end);
|
| text.Reset();
|
|
|
| ASSERT_EQ(S_OK, text1_obj->get_textAtOffset(
|
| 1, IA2_TEXT_BOUNDARY_WORD, &start, &end, text.Receive()));
|
| ASSERT_EQ(0, start);
|
| - ASSERT_EQ(3, end);
|
| - ASSERT_STREQ(L"One", text);
|
| + ASSERT_EQ(4, end);
|
| + ASSERT_STREQ(L"One ", text);
|
| text.Reset();
|
|
|
| ASSERT_EQ(S_OK, text1_obj->get_textAtOffset(
|
| 6, IA2_TEXT_BOUNDARY_WORD, &start, &end, text.Receive()));
|
| ASSERT_EQ(4, start);
|
| - ASSERT_EQ(7, end);
|
| - ASSERT_STREQ(L"two", text);
|
| + ASSERT_EQ(8, end);
|
| + ASSERT_STREQ(L"two\n", text);
|
| text.Reset();
|
|
|
| ASSERT_EQ(S_OK, text1_obj->get_textAtOffset(
|
| @@ -406,8 +406,17 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
|
| ASSERT_STREQ(L"One two three.\n", text);
|
| text.Reset();
|
|
|
| + ASSERT_EQ(S_OK, text1_obj->get_textAtOffset(
|
| + text1_len, IA2_TEXT_BOUNDARY_LINE, &start, &end, text.Receive()));
|
| + ASSERT_EQ(15, start);
|
| + ASSERT_EQ(text1_len, end);
|
| + ASSERT_STREQ(L"Four five six.", text);
|
| + text.Reset();
|
| +
|
| ASSERT_EQ(S_OK,
|
| text1_obj->get_text(0, IA2_TEXT_OFFSET_LENGTH, text.Receive()));
|
| + ASSERT_EQ(0, start);
|
| + ASSERT_EQ(text1_len, end);
|
| ASSERT_STREQ(L"One two three.\nFour five six.", text);
|
|
|
| // Delete the manager and test that all BrowserAccessibility instances are
|
|
|