Add some more tests to InputMethodControllerTest

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/InputMethodController.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
@@ skipping 1409 matching lines @@
 
   Vector<CompositionUnderline> underlines;
   underlines.push_back(CompositionUnderline(0, 3, Color(255, 0, 0), false, 0));
   controller().setComposition(String("def"), underlines, 0, 3);
   controller().setComposition(String(""), underlines, 0, 3);
   controller().commitText(String("def"), underlines, 0);
 
   EXPECT_STREQ("abc\ndef", textarea->value().utf8().data());
 }
 
+TEST_F(InputMethodControllerTest, WhitespaceFixup) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // The space at the beginning of the string should have been converted to an
+  // nbsp
+  EXPECT_STREQ("&nbsp;text blah", div->innerHTML().utf8().data());
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // The space at the end of the string should have been converted to an nbsp
+  EXPECT_STREQ("&nbsp;text&nbsp;", div->innerHTML().utf8().data());
+}
+
+static String getMarkedText(DocumentMarkerController& documentMarkerController,
+                            Node* node,
+                            int markerIndex) {
+  DocumentMarker* marker = documentMarkerController.markers()[markerIndex];
+  return node->textContent().substring(
+      marker->startOffset(), marker->endOffset() - marker->startOffset());
+}
+
+TEST_F(InputMethodControllerTest,
+       WhitespaceFixupAroundMarkerNotContainingSpace) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under "text" (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+

[yabinh, 2017/03/02 06:47:05]

How about adding one line:
EXPECT_STREQ(" text ", div->innerHTML().utf8().data());

(Same in other tests.)

[Xiaocheng, 2017/03/02 20:24:31]

I suggested not checking precondition in PS1.

[yabinh, 2017/03/03 01:39:14]

Sorry I didn't notice that. But now I still prefer 1 test in Set1 to 2 tests in
Set3. To me, it SEEMS that they are not equivalent (because of addMarker()),
even though they actually are. 

That said, my l-g-t-m is still valid. I'm not going to be the blocker of this
issue. 

+  // Check that the marker is still attached to "text" and doesn't include
+  // either space around it
+  EXPECT_EQ(1u, document().markers().markersFor(div->firstChild()).size());
+  EXPECT_STREQ(
+      "text",
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest,
+       WhitespaceFixupAroundMarkerBeginningWithSpace) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under " text" (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(7, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the marker was split when the space at the beginning was
+  // converted to an nbsp
+  EXPECT_EQ(2u, document().markers().markers().size());
+  EXPECT_STREQ(
+      "\xC2\xA0",  // UTF-8 for an nbsp
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+  EXPECT_STREQ(
+      "text",
+      getMarkedText(document().markers(), div->firstChild(), 1).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, WhitespaceFixupAroundMarkerEndingWithSpace) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under "text " (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(8, 13).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the marker was split when the space at the end was
+  // converted to an nbsp
+  EXPECT_EQ(2u, document().markers().markers().size());
+  EXPECT_STREQ(
+      "text",
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+  EXPECT_STREQ(
+      "\xC2\xA0",  // UTF-8 for an nbsp
+      getMarkedText(document().markers(), div->firstChild(), 1).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest,
+       WhitespaceFixupAroundMarkerBeginningAndEndingWithSpaces) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under " text " (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(7, 13).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the marker was split into three pieces when the two spaces were
+  // converted to nbsps
+  EXPECT_EQ(3u, document().markers().markers().size());
+  EXPECT_STREQ(
+      "\xC2\xA0",  // UTF-8 for an nbsp
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+  EXPECT_STREQ(
+      "text",
+      getMarkedText(document().markers(), div->firstChild(), 1).utf8().data());
+  EXPECT_STREQ(
+      "\xC2\xA0",  // UTF-8 for an nbsp
+      getMarkedText(document().markers(), div->firstChild(), 2).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceStartOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "Initial text"
+  EphemeralRange markerRange = PlainTextRange(0, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "Initial" with "Original"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String("Original"), emptyUnderlines, 0);
+
+  // Verify marker is under "al text"
+  // ("Initial" and "Original" have "al" as a common suffix)
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_STREQ(
+      "al text",
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceTextContainsStartOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>This is some initial text</div>",
+      "sample");
+
+  // Add marker under "initial text"
+  EphemeralRange markerRange = PlainTextRange(13, 25).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "some initial" with "boring"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 8, 20);
+  controller().commitText(String("boring"), emptyUnderlines, 0);
+
+  // Verify marker is under " text"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_STREQ(
+      " text",
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceEndOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "Initial text"
+  EphemeralRange markerRange = PlainTextRange(0, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "text" with "string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 8, 12);
+  controller().commitText(String("string"), emptyUnderlines, 0);
+
+  // Verify marker is under "Initial "
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_STREQ(
+      "Initial ",
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceTextContainsEndOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>This is some initial text</div>",
+      "sample");
+
+  // Add marker under "some initial"
+  EphemeralRange markerRange = PlainTextRange(8, 20).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "initial text" with "content"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 13, 25);
+  controller().commitText(String("content"), emptyUnderlines, 0);
+
+  EXPECT_STREQ("This is some content", div->innerHTML().utf8().data());
+
+  // Verify marker is under "some "
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_STREQ(
+      "some ",
+      getMarkedText(document().markers(), div->firstChild(), 0).utf8().data());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceEntireMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "text"
+  EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "text" with "string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 8, 12);
+  controller().commitText(String("string"), emptyUnderlines, 0);
+
+  // Verify marker was removed
+  EXPECT_EQ(0u, document().markers().markers().size());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceTextWithMarkerAtBeginning) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "Initial"
+  EphemeralRange markerRange = PlainTextRange(0, 7).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  // Replace "Initial text" with "New string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 12);
+  controller().commitText(String("New string"), emptyUnderlines, 0);
+
+  // Verify marker was removed
+  EXPECT_EQ(0u, document().markers().markers().size());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceTextWithMarkerAtEnd) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "text"
+  EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  // Replace "Initial text" with "New string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 12);
+  controller().commitText(String("New string"), emptyUnderlines, 0);
+
+  // Verify marker was removed
+  EXPECT_EQ(0u, document().markers().markers().size());
+}
+
 }  // namespace blink