[MarkersInter...Range #2-9] Change behavior of SpellChecker::GetSpellCheckMarkerTouchingSelection()

third_party/WebKit/Source/core/editing/spellcheck/SpellCheckerTest.cpp

 // Copyright 2016 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/spellcheck/SpellChecker.h"
 
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/editing/markers/SpellCheckMarker.h"
 #include "core/editing/spellcheck/SpellCheckRequester.h"
@@ skipping 110 matching lines @@
 
   ASSERT_EQ(1u, GetDocument().Markers().Markers().size());
 
   // The Spelling marker's description should be a newline-separated list of the
   // suggested replacements
   EXPECT_EQ(
       "spellcheck\nspillchuck",
       ToSpellCheckMarker(GetDocument().Markers().Markers()[0])->Description());
 }
 
-TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_FirstCharSelected) {
+TEST_F(SpellCheckerTest, GetSpellCheckMarkerUnderSelection_FirstCharSelected) {
   SetBodyContent(
       "<div contenteditable>"
       "spllchck"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 8)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 0), Position(text, 1))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
+          .GetSpellCheckMarkerUnderSelection();
   EXPECT_TRUE(result);
 }
 
-TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_LastCharSelected) {
+TEST_F(SpellCheckerTest, GetSpellCheckMarkerUnderSelection_LastCharSelected) {
   SetBodyContent(
       "<div contenteditable>"
       "spllchck"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 8)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 7), Position(text, 8))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
+          .GetSpellCheckMarkerUnderSelection();
   EXPECT_TRUE(result);
 }
 
 TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_SingleCharWordSelected) {
+       GetSpellCheckMarkerUnderSelection_SingleCharWordSelected) {
   SetBodyContent(
       "<div contenteditable>"
       "s"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 1)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 0), Position(text, 1))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
+          .GetSpellCheckMarkerUnderSelection();
   EXPECT_TRUE(result);
 }
 
 TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_CaretLeftOfSingleCharWord) {
+       GetSpellCheckMarkerUnderSelection_CaretLeftOfSingleCharWord) {
   SetBodyContent(
       "<div contenteditable>"
       "s"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 1)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 0), Position(text, 0))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
-  EXPECT_TRUE(result);
+          .GetSpellCheckMarkerUnderSelection();
+  EXPECT_FALSE(result);
 }
 
 TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_CaretRightOfSingleCharWord) {
+       GetSpellCheckMarkerUnderSelection_CaretRightOfSingleCharWord) {
   SetBodyContent(
       "<div contenteditable>"
       "s"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 1)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 1), Position(text, 1))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
-  EXPECT_TRUE(result);
+          .GetSpellCheckMarkerUnderSelection();
+  EXPECT_FALSE(result);
 }
 
 TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_CaretLeftOfMultiCharWord) {
+       GetSpellCheckMarkerUnderSelection_CaretLeftOfMultiCharWord) {
   SetBodyContent(
       "<div contenteditable>"
       "spllchck"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 8)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 0), Position(text, 0))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
-  EXPECT_TRUE(result);
+          .GetSpellCheckMarkerUnderSelection();
+  EXPECT_FALSE(result);
 }
 
 TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_CaretRightOfMultiCharWord) {
+       GetSpellCheckMarkerUnderSelection_CaretRightOfMultiCharWord) {
   SetBodyContent(
       "<div contenteditable>"
       "spllchck"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 8)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 8), Position(text, 8))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
-  EXPECT_TRUE(result);
+          .GetSpellCheckMarkerUnderSelection();
+  EXPECT_FALSE(result);
 }
 
-TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_CaretMiddleOfWord) {
+TEST_F(SpellCheckerTest, GetSpellCheckMarkerUnderSelection_CaretMiddleOfWord) {
   SetBodyContent(
       "<div contenteditable>"
       "spllchck"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 8)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 4), Position(text, 4))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
+          .GetSpellCheckMarkerUnderSelection();
   EXPECT_TRUE(result);
 }
 
 TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_CaretOneCharLeftOfMisspelling) {
+       GetSpellCheckMarkerUnderSelection_CaretOneCharLeftOfMisspelling) {
   SetBodyContent(
       "<div contenteditable>"
       "a spllchck"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 2), Position(text, 10)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 1), Position(text, 1))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
+          .GetSpellCheckMarkerUnderSelection();
   EXPECT_FALSE(result);
 }
 
 TEST_F(SpellCheckerTest,
-       GetSpellCheckMarkerTouchingSelection_CaretOneCharRightOfMisspelling) {
+       GetSpellCheckMarkerUnderSelection_CaretOneCharRightOfMisspelling) {
   SetBodyContent(
       "<div contenteditable>"
       "spllchck a"
       "</div>");
   Element* div = GetDocument().QuerySelector("div");
   Node* text = div->firstChild();
 
   GetDocument().Markers().AddSpellingMarker(
       EphemeralRange(Position(text, 0), Position(text, 8)));
 
   GetDocument().GetFrame()->Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .SetBaseAndExtent(Position(text, 9), Position(text, 9))
           .Build());
 
   Optional<std::pair<Node*, SpellCheckMarker*>> result =
       GetDocument()
           .GetFrame()
           ->GetSpellChecker()
-          .GetSpellCheckMarkerTouchingSelection();
+          .GetSpellCheckMarkerUnderSelection();
   EXPECT_FALSE(result);
 }
 
 }  // namespace blink