modification to RenderText for inheritance/SelectionModel

views/controls/textfield/textfield_views_model_unittest.cc

 // Copyright (c) 2011 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 "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
@@ skipping 108 matching lines @@
   EXPECT_EQ(string16(), model.GetSelectedText());
   model.SelectAll();
   EXPECT_STR_EQ("HELLO", model.GetSelectedText());
   // SelectAll should select towards the end.
   ui::Range range;
   model.GetSelectedRange(&range);
   EXPECT_EQ(0U, range.start());
   EXPECT_EQ(5U, range.end());
 
   // Select and move cursor
-  model.MoveCursorTo(1U, false);
-  model.MoveCursorTo(3U, true);
+  gfx::SelectionModel selection(1U);
+  model.MoveCursorTo(selection);
+  selection.set_selection_end(3U);
+  model.MoveCursorTo(selection);
   EXPECT_STR_EQ("EL", model.GetSelectedText());
   model.MoveCursorLeft(gfx::CHARACTER_BREAK, false);
   EXPECT_EQ(1U, model.GetCursorPosition());
-  model.MoveCursorTo(1U, false);
-  model.MoveCursorTo(3U, true);
+  selection.set_selection_end(1U);
+  selection.set_selection_start(selection.selection_end());
+  model.MoveCursorTo(selection);
+  selection.set_selection_end(3U);
+  model.MoveCursorTo(selection);
   model.MoveCursorRight(gfx::CHARACTER_BREAK, false);
   EXPECT_EQ(3U, model.GetCursorPosition());
 
   // Select all and move cursor
   model.SelectAll();
   model.MoveCursorLeft(gfx::CHARACTER_BREAK, false);
   EXPECT_EQ(0U, model.GetCursorPosition());
   model.SelectAll();
   model.MoveCursorRight(gfx::CHARACTER_BREAK, false);
   EXPECT_EQ(5U, model.GetCursorPosition());
@@ skipping 178 matching lines @@
 TEST_F(TextfieldViewsModelTest, SelectWordTest) {
   TextfieldViewsModel model(NULL);
   model.Append(ASCIIToUTF16("  HELLO  !!  WO     RLD "));
 
   // Test when cursor is at the beginning.
   model.MoveCursorLeft(gfx::LINE_BREAK, false);
   model.SelectWord();
   SelectWordTestVerifier(model, "  ", 2U);
 
   // Test when cursor is at the beginning of a word.
-  model.MoveCursorTo(2U, false);
+  gfx::SelectionModel selection(2U);
+  model.MoveCursorTo(selection);
   model.SelectWord();
   SelectWordTestVerifier(model, "HELLO", 7U);
 
   // Test when cursor is at the end of a word.
-  model.MoveCursorTo(15U, false);
+  selection.set_selection_end(15U);
+  selection.set_selection_start(selection.selection_end());
+  model.MoveCursorTo(selection);
   model.SelectWord();
   SelectWordTestVerifier(model, "WO", 15U);
 
   // Test when cursor is somewhere in a non-alph-numeric fragment.
   for (size_t cursor_pos = 8; cursor_pos < 13U; cursor_pos++) {
-    model.MoveCursorTo(cursor_pos, false);
+    selection.set_selection_end(cursor_pos);
+    selection.set_selection_start(selection.selection_end());
+    model.MoveCursorTo(selection);
     model.SelectWord();
     SelectWordTestVerifier(model, "  !!  ", 13U);
   }
 
   // Test when cursor is somewhere in a whitespace fragment.
-  model.MoveCursorTo(17U, false);
+  selection.set_selection_end(17U);
+  selection.set_selection_start(selection.selection_end());
+  model.MoveCursorTo(selection);
   model.SelectWord();
   SelectWordTestVerifier(model, "     ", 20U);
 
   // Test when cursor is at the end.
   model.MoveCursorRight(gfx::LINE_BREAK, false);
   model.SelectWord();
   SelectWordTestVerifier(model, " ", 24U);
 }
 
 TEST_F(TextfieldViewsModelTest, RangeTest) {
@@ skipping 228 matching lines @@
   composition_text_confirmed_or_cleared_ = false;
   EXPECT_STR_EQ("678678", model.GetText());
 
   model.SetCompositionText(composition);
   model.MoveCursorRight(gfx::LINE_BREAK, false);
   EXPECT_TRUE(composition_text_confirmed_or_cleared_);
   composition_text_confirmed_or_cleared_ = false;
   EXPECT_STR_EQ("678", model.GetText());
 
   model.SetCompositionText(composition);
-  model.MoveCursorTo(0, true);
+  gfx::SelectionModel sel(0);
+  sel.set_selection_start(model.render_text()->GetSelectionStart());
+  model.MoveCursorTo(sel);
   EXPECT_TRUE(composition_text_confirmed_or_cleared_);
   composition_text_confirmed_or_cleared_ = false;
   EXPECT_STR_EQ("678678", model.GetText());
 
   model.SetCompositionText(composition);
   model.SelectRange(ui::Range(0, 3));
   EXPECT_TRUE(composition_text_confirmed_or_cleared_);
   composition_text_confirmed_or_cleared_ = false;
   EXPECT_STR_EQ("678", model.GetText());
 
@@ skipping 82 matching lines @@
   // Clear history
   model.ClearEditHistory();
   EXPECT_FALSE(model.Undo());
   EXPECT_FALSE(model.Redo());
   EXPECT_STR_EQ("a", model.GetText());
   EXPECT_EQ(1U, model.GetCursorPosition());
 
   // Delete ===============================
   model.SetText(ASCIIToUTF16("ABCDE"));
   model.ClearEditHistory();
-  model.MoveCursorTo(2, false);
+  gfx::SelectionModel sel(2);
+  model.MoveCursorTo(sel);
   EXPECT_TRUE(model.Delete());
   EXPECT_STR_EQ("ABDE", model.GetText());
   model.MoveCursorLeft(gfx::LINE_BREAK, false);
   EXPECT_TRUE(model.Delete());
   EXPECT_STR_EQ("BDE", model.GetText());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABDE", model.GetText());
   EXPECT_EQ(0U, model.GetCursorPosition());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.GetText());
@@ skipping 73 matching lines @@
   EXPECT_STR_EQ("www.youtube.com", model.GetText());
   EXPECT_EQ(5U, model.GetCursorPosition());
   EXPECT_FALSE(model.Redo());
 }
 
 TEST_F(TextfieldViewsModelTest, UndoRedo_CutCopyPasteTest) {
   TextfieldViewsModel model(NULL);
   model.SetText(ASCIIToUTF16("ABCDE"));
   EXPECT_FALSE(model.Redo());  // nothing to redo
   // Cut
-  model.MoveCursorTo(1, false);
-  model.MoveCursorTo(3, true);
+  gfx::SelectionModel sel(1);
+  model.MoveCursorTo(sel);
+  sel.set_selection_end(3);
+  model.MoveCursorTo(sel);
   model.Cut();
   EXPECT_STR_EQ("ADE", model.GetText());
   EXPECT_EQ(1U, model.GetCursorPosition());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.GetText());
   EXPECT_EQ(3U, model.GetCursorPosition());
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("", model.GetText());
   EXPECT_EQ(0U, model.GetCursorPosition());
   EXPECT_FALSE(model.Undo());  // no more undo
@@ skipping 65 matching lines @@
   // empty cut shouldn't create an edit.
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCBCBCDE", model.GetText());
   EXPECT_EQ(3U, model.GetCursorPosition());
 
   // Copy
   ResetModel(&model);
   model.SetText(ASCIIToUTF16("12345"));
   EXPECT_STR_EQ("12345", model.GetText());
   EXPECT_EQ(0U, model.GetCursorPosition());
-  model.MoveCursorTo(1, false);
-  model.MoveCursorTo(3, true);
+  sel.set_selection_end(1);
+  sel.set_selection_start(sel.selection_end());
+  model.MoveCursorTo(sel);
+  sel.set_selection_end(3);
+  model.MoveCursorTo(sel);
   model.Copy();  // Copy "23"
   EXPECT_STR_EQ("12345", model.GetText());
   EXPECT_EQ(3U, model.GetCursorPosition());
   model.Paste();  // Paste "23" into "23".
   EXPECT_STR_EQ("12345", model.GetText());
   EXPECT_EQ(3U, model.GetCursorPosition());
   model.Paste();
   EXPECT_STR_EQ("1232345", model.GetText());
   EXPECT_EQ(5U, model.GetCursorPosition());
   EXPECT_TRUE(model.Undo());
@@ skipping 103 matching lines @@
   EXPECT_EQ(5U, model.GetCursorPosition());
   EXPECT_FALSE(model.Redo());
 }
 
 TEST_F(TextfieldViewsModelTest, UndoRedo_ReplaceTest) {
   // By Cursor
   {
     SCOPED_TRACE("forward & insert by cursor");
     TextfieldViewsModel model(NULL);
     model.SetText(ASCIIToUTF16("abcd"));
-    model.MoveCursorTo(1, false);
-    model.MoveCursorTo(3, true);
+    gfx::SelectionModel sel(1);
+    model.MoveCursorTo(sel);
+    sel.set_selection_end(3);
+    model.MoveCursorTo(sel);
     RunInsertReplaceTest(model);
   }
   {
     SCOPED_TRACE("backward & insert by cursor");
     TextfieldViewsModel model(NULL);
     model.SetText(ASCIIToUTF16("abcd"));
-    model.MoveCursorTo(3, false);
-    model.MoveCursorTo(1, true);
+    gfx::SelectionModel sel(3);
+    model.MoveCursorTo(sel);
+    sel.set_selection_end(1);
+    model.MoveCursorTo(sel);
     RunInsertReplaceTest(model);
   }
   {
     SCOPED_TRACE("forward & overwrite by cursor");
     TextfieldViewsModel model(NULL);
     model.SetText(ASCIIToUTF16("abcd"));
-    model.MoveCursorTo(1, false);
-    model.MoveCursorTo(3, true);
+    gfx::SelectionModel sel(1);
+    model.MoveCursorTo(sel);
+    sel.set_selection_end(3);
+    model.MoveCursorTo(sel);
     RunOverwriteReplaceTest(model);
   }
   {
     SCOPED_TRACE("backward & overwrite by cursor");
     TextfieldViewsModel model(NULL);
     model.SetText(ASCIIToUTF16("abcd"));
-    model.MoveCursorTo(3, false);
-    model.MoveCursorTo(1, true);
+    gfx::SelectionModel sel(3);
+    model.MoveCursorTo(sel);
+    sel.set_selection_end(1);
+    model.MoveCursorTo(sel);
     RunOverwriteReplaceTest(model);
   }
   // By SelectRange API
   {
     SCOPED_TRACE("forward & insert by SelectRange");
     TextfieldViewsModel model(NULL);
     model.SetText(ASCIIToUTF16("abcd"));
     model.SelectRange(ui::Range(1, 3));
     RunInsertReplaceTest(model);
   }
@@ skipping 91 matching lines @@
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.GetText());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("1234", model.GetText());
   EXPECT_FALSE(model.Redo());
 
   // TODO(oshima): We need MockInputMethod to test the behavior with IME.
 }
 
 }  // namespace views