Clean up of SelectionModel

views/touchui/touch_selection_controller_impl_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/utf_string_conversions.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
@@ skipping 31 matching lines @@
     textfield_view_ = static_cast<NativeTextfieldViews*>(
         textfield_->GetNativeWrapperForTesting());
     textfield_view_->SetBoundsRect(params.bounds);
     textfield_->set_id(1);
 
     DCHECK(textfield_view_);
     textfield_->RequestFocus();
   }
 
  protected:
-  gfx::Point GetCursorPosition(int cursor_pos) {
+  gfx::Point GetCursorPosition(const gfx::SelectionModel& sel) {
     gfx::RenderText* render_text = textfield_view_->GetRenderText();
-    gfx::Rect cursor_bounds = render_text->GetCursorBounds(
-        gfx::SelectionModel(cursor_pos), false);
+    gfx::Rect cursor_bounds = render_text->GetCursorBounds(sel, true);
     return gfx::Point(cursor_bounds.x(), cursor_bounds.bottom() - 1);
   }
 
   TouchSelectionControllerImpl* GetSelectionController() {
     return static_cast<TouchSelectionControllerImpl*>(
         textfield_view_->touch_selection_controller_.get());
   }
 
   void SimulateSelectionHandleDrag(gfx::Point p, int selection_handle) {
     TouchSelectionControllerImpl* controller = GetSelectionController();
@@ skipping 12 matching lines @@
   // If textfield has selection, this method verifies that the selection handles
   // are visible and at the correct positions (at the end points of selection).
   // |cursor_at_selection_handle_1| is used to decide whether selection
   // handle 1's position is matched against the start of selection or the end.
   void VerifySelectionHandlePositions(bool cursor_at_selection_handle_1) {
     if (textfield_->HasSelection()) {
       EXPECT_TRUE(GetSelectionController()->IsSelectionHandle1Visible());
       EXPECT_TRUE(GetSelectionController()->IsSelectionHandle2Visible());
       gfx::SelectionModel sel;
       textfield_view_->GetSelectionModel(&sel);
-      gfx::Point selection_start = GetCursorPosition(sel.selection_start());
-      gfx::Point selection_end = GetCursorPosition(sel.selection_end());
+      gfx::SelectionModel sel_start = textfield_view_->GetRenderText()->
+                                      GetSelectionModelForSelectionStart();
+      gfx::Point selection_start = GetCursorPosition(sel_start);
+      gfx::Point selection_end = GetCursorPosition(sel);
       gfx::Point sh1 = GetSelectionController()->GetSelectionHandle1Position();
       gfx::Point sh2 = GetSelectionController()->GetSelectionHandle2Position();
       sh1.Offset(10, 0); // offset by kSelectionHandleRadius.
       sh2.Offset(10, 0);
 
       if (cursor_at_selection_handle_1) {
         EXPECT_EQ(sh1, selection_end);
         EXPECT_EQ(sh2, selection_start);
       } else {
         EXPECT_EQ(sh1, selection_start);
@@ skipping 34 matching lines @@
 
   // Test with lost focus.
   widget_->GetFocusManager()->ClearFocus();
   VerifySelectionHandlePositions(false);
 
   // Test with focus re-gained.
   widget_->GetFocusManager()->SetFocusedView(textfield_);
   VerifySelectionHandlePositions(false);
 }
 
+// Tests that the selection handles are placed appropriately in bidi text.
+TEST_F(TouchSelectionControllerImplTest, SelectionInBidiTextfieldTest) {
+  CreateTextfield();
+  textfield_->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2"));
+
+  // Test cursor at run boundary and with empty selection.
+  textfield_->SelectSelectionModel(
+      gfx::SelectionModel(3, 2, gfx::SelectionModel::TRAILING));
+  VerifySelectionHandlePositions(false);
+
+  // Test selection range (3, 2).

[msw, 2011/09/29 02:20:21]

Please also test some other pertinent BiDi ranges.
Maybe: (2,3) (3,4) (4,3) (1,4) (4,1) (3,6) (6,3), or as you see fit.
You can split the test up if it gets too large.

[xji, 2011/10/03 23:18:57]

Done.

+  textfield_->SelectSelectionModel(gfx::SelectionModel(3, 2));
+  VerifySelectionHandlePositions(false);
+}
+
 // Tests if the SelectRect callback is called appropriately when selection
 // handles are moved.
 TEST_F(TouchSelectionControllerImplTest, SelectRectCallbackTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("textfield with selected text"));
   textfield_->SelectSelectionModel(gfx::SelectionModel(3, 7));
 
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "tfie");
   VerifySelectionHandlePositions(false);
 
@@ skipping 16 matching lines @@
   VerifySelectionHandlePositions(true);
 
   // Drag selection handle 2 across selection handle 1.
   x = textfield_->font().GetStringWidth(ASCIIToUTF16("with selected "));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "selected ");
   VerifySelectionHandlePositions(false);
 }
 
 }  // namespace views