Fix InputConnection.deleteSurroundingText()

third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp

Index: third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
index b7558279047e9ddb33261dd87bffaf4e855bd5d3..60772199293d88e00ca29f4333487373ff2b0c9a 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -190,4 +190,195 @@ TEST_F(InputMethodControllerTest, ConfirmPasswordComposition)
     EXPECT_STREQ("foo", input->value().utf8().data());
 }
 
+TEST_F(InputMethodControllerTest, DeleteSurroundingTextWithEmptyText)
+{
+    HTMLInputElement* input = toHTMLInputElement(
+        insertHTMLElement("<input id='sample'>", "sample"));
+
+    input->setValue("");
+    EXPECT_STREQ("", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 0);
+    EXPECT_STREQ("", input->value().utf8().data());
+
+    input->setValue("");
+    EXPECT_STREQ("", input->value().utf8().data());
+    controller().deleteSurroundingText(1, 0);
+    EXPECT_STREQ("", input->value().utf8().data());
+
+    input->setValue("");
+    EXPECT_STREQ("", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 1);
+    EXPECT_STREQ("", input->value().utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, DeleteSurroundingTextWithRangeSelection)
+{
+    HTMLInputElement* input = toHTMLInputElement(
+        insertHTMLElement("<input id='sample'>", "sample"));
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(1, 4));
+    controller().deleteSurroundingText(0, 0);
+    EXPECT_STREQ("hello", input->value().utf8().data());
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(1, 4));
+    controller().deleteSurroundingText(1, 1);
+    EXPECT_STREQ("ell", input->value().utf8().data());
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(1, 4));
+    controller().deleteSurroundingText(100, 0);
+    EXPECT_STREQ("ello", input->value().utf8().data());
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(1, 4));
+    controller().deleteSurroundingText(0, 100);
+    EXPECT_STREQ("hell", input->value().utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, DeleteSurroundingTextWithCursorSelection)
+{
+    HTMLInputElement* input = toHTMLInputElement(
+        insertHTMLElement("<input id='sample'>", "sample"));
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
+    controller().deleteSurroundingText(0, 0);
+    EXPECT_STREQ("hello", input->value().utf8().data());
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
+    controller().deleteSurroundingText(1, 1);
+    EXPECT_STREQ("hlo", input->value().utf8().data());
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
+    controller().deleteSurroundingText(100, 0);
+    EXPECT_STREQ("llo", input->value().utf8().data());
+
+    input->setValue("hello");
+    EXPECT_STREQ("hello", input->value().utf8().data());
+    controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
+    controller().deleteSurroundingText(0, 100);
+    EXPECT_STREQ("he", input->value().utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, DeleteSurroundingTextWithMultiCodeTextOnTheLeft)
+{
+    HTMLInputElement* input = toHTMLInputElement(
+        insertHTMLElement("<input id='sample'>", "sample"));
+
+    // U+2605 == "black star". It takes up 1 space.
+    input->setValue(String::fromUTF8("foo\xE2\x98\x85"));
+    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    EXPECT_STREQ("foo\xE2\x98\x85", input->value().utf8().data());
+    controller().deleteSurroundingText(1, 0);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+
+    // U+1F3C6 == "trophy". It takes up 2 space.
+    input->setValue(String::fromUTF8("foo\xF0\x9F\x8F\x86"));
+    controller().setEditableSelectionOffsets(PlainTextRange(5, 5));
+    EXPECT_STREQ("foo\xF0\x9F\x8F\x86", input->value().utf8().data());
+    controller().deleteSurroundingText(1, 0);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+
+    // composed U+0E01 "ka kai" + U+0E49 "mai tho". It takes up 2 space.
+    input->setValue(String::fromUTF8("foo\xE0\xB8\x81\xE0\xB9\x89"));
+    controller().setEditableSelectionOffsets(PlainTextRange(5, 5));
+    EXPECT_STREQ("foo\xE0\xB8\x81\xE0\xB9\x89", input->value().utf8().data());
+    controller().deleteSurroundingText(1, 0);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86"));
+    controller().setEditableSelectionOffsets(PlainTextRange(7, 7));
+    EXPECT_STREQ("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86", input->value().utf8().data());
+    controller().deleteSurroundingText(2, 0);
+    EXPECT_STREQ("foo\xF0\x9F\x8F\x86", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86"));
+    controller().setEditableSelectionOffsets(PlainTextRange(7, 7));
+    EXPECT_STREQ("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86", input->value().utf8().data());
+    controller().deleteSurroundingText(3, 0);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86"));
+    controller().setEditableSelectionOffsets(PlainTextRange(7, 7));
+    EXPECT_STREQ("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86", input->value().utf8().data());
+    controller().deleteSurroundingText(4, 0);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86"));
+    controller().setEditableSelectionOffsets(PlainTextRange(7, 7));
+    EXPECT_STREQ("foo\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86", input->value().utf8().data());
+    controller().deleteSurroundingText(5, 0);
+    EXPECT_STREQ("fo", input->value().utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, DeleteSurroundingTextWithMultiCodeTextOnTheRight)
+{
+    HTMLInputElement* input = toHTMLInputElement(
+        insertHTMLElement("<input id='sample'>", "sample"));
+
+    // U+2605 == "black star". It takes up 1 space.
+    input->setValue(String::fromUTF8("\xE2\x98\x85 foo"));
+    controller().setEditableSelectionOffsets(PlainTextRange(0, 0));
+    EXPECT_STREQ("\xE2\x98\x85 foo", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 1);
+    EXPECT_STREQ(" foo", input->value().utf8().data());
+
+    // U+1F3C6 == "trophy". It takes up 2 space.
+    input->setValue(String::fromUTF8("\xF0\x9F\x8F\x86 foo"));
+    controller().setEditableSelectionOffsets(PlainTextRange(0, 0));
+    EXPECT_STREQ("\xF0\x9F\x8F\x86 foo", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 1);
+    EXPECT_STREQ(" foo", input->value().utf8().data());
+
+    // composed U+0E01 "ka kai" + U+0E49 "mai tho". It takes up 2 space.
+    input->setValue(String::fromUTF8("\xE0\xB8\x81\xE0\xB9\x89 foo"));
+    controller().setEditableSelectionOffsets(PlainTextRange(0, 0));
+    EXPECT_STREQ("\xE0\xB8\x81\xE0\xB9\x89 foo", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 1);
+    EXPECT_STREQ(" foo", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo"));
+    controller().setEditableSelectionOffsets(PlainTextRange(0, 0));
+    EXPECT_STREQ("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 2);
+    EXPECT_STREQ("\xF0\x9F\x8F\x86 foo", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo"));
+    controller().setEditableSelectionOffsets(PlainTextRange(0, 0));
+    EXPECT_STREQ("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 3);
+    EXPECT_STREQ(" foo", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo"));
+    controller().setEditableSelectionOffsets(PlainTextRange(0, 0));
+    EXPECT_STREQ("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 4);
+    EXPECT_STREQ(" foo", input->value().utf8().data());
+
+    // "trophy" + "trophy".
+    input->setValue(String::fromUTF8("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo"));
+    controller().setEditableSelectionOffsets(PlainTextRange(0, 0));
+    EXPECT_STREQ("\xF0\x9F\x8F\x86\xF0\x9F\x8F\x86 foo", input->value().utf8().data());
+    controller().deleteSurroundingText(0, 5);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+}
+
 } // namespace blink