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..59f0d1d39a1d09bd061d96c1263e4f357af99a7f 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -190,4 +190,133 @@ 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, DeleteSurroundingTextForMultiCodeWord)
+{
+    HTMLInputElement* input = toHTMLInputElement(
+        insertHTMLElement("<input id='sample'>", "sample"));
+
+    input->setValue(String::fromUTF8("foo\xE2\x98\x85")); // U+2605 == "black star"
+    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());
+
+    input->setValue(String::fromUTF8("foo\xF0\x9F\x8F\x86")); // U+1F3C6 == "trophy"
+    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    EXPECT_STREQ("foo\xF0\x9F\x8F\x86", input->value().utf8().data());
+    controller().deleteSurroundingText(1, 0);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+
+    input->setValue(String::fromUTF8("foo\xE0\xB8\x81\xE0\xB9\x89")); // composed U+0E01 "ka kai" + U+0E49 "mai tho"
+    controller().setEditableSelectionOffsets(PlainTextRange(4, 4));
+    EXPECT_STREQ("foo\xE0\xB8\x81\xE0\xB9\x89", input->value().utf8().data());
+    controller().deleteSurroundingText(1, 0);
+    EXPECT_STREQ("foo", input->value().utf8().data());
+
+    input->setValue(String::fromUTF8("\xE2\x98\x85 foo")); // U+2605 == "black star"
+    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());
+
+    input->setValue(String::fromUTF8("\xF0\x9F\x8F\x86 foo")); // U+1F3C6 == "trophy"
+    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());
+
+    input->setValue(String::fromUTF8("\xE0\xB8\x81\xE0\xB9\x89 foo")); // composed U+0E01 "ka kai" + U+0E49 "mai tho"
+    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());
+
+    input->setValue(String::fromUTF8("\xE2\x98\x85\xF0\x9F\x8F\x86\xE0\xB8\x81\xE0\xB9\x89")); // "black star" + "trophy" + "ka kai" & "mai tho"
+    controller().setEditableSelectionOffsets(PlainTextRange(1, 2));
+    EXPECT_STREQ("\xE2\x98\x85\xF0\x9F\x8F\x86\xE0\xB8\x81\xE0\xB9\x89", input->value().utf8().data());
+    controller().deleteSurroundingText(1, 1);
+    EXPECT_STREQ("\xF0\x9F\x8F\x86", input->value().utf8().data());
+}
+
 } // namespace blink