Tapping/longpressing should result in INSERTION_HANDLE_SHOWN

ui/touch_selection/touch_selection_controller_unittest.cc

 // 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 "ui/touch_selection/touch_selection_controller.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 237 matching lines @@
   insertion_rect.Offset(1, 0);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_MOVED));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart());
 
   insertion_rect.Offset(0, 1);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_MOVED));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart());
 
+  OnTapEvent();
+  insertion_rect.Offset(1, 0);
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_SHOWN));
+  EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart());
+
   ClearInsertion();
   EXPECT_THAT(GetAndResetEvents(),
               ElementsAre(INSERTION_HANDLE_CLEARED));
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionToSelectionTransition) {
   OnLongPressEvent();
 
   gfx::RectF start_rect(5, 5, 0, 10);
   gfx::RectF end_rect(50, 5, 0, 10);
@@ skipping 194 matching lines @@
 
   // No tap should be signalled if the touch sequence is cancelled.
   event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   event = MockMotionEvent(MockMotionEvent::ACTION_CANCEL, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_DRAG_STARTED,
                                                INSERTION_HANDLE_DRAG_STOPPED));
 }
 
-TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) {
-  base::TimeTicks event_time = base::TimeTicks::Now();
-  OnTapEvent();
-  SetDraggingEnabled(true);
-
-  gfx::RectF anchor_rect(10, 0, 0, 10);
-  bool visible = true;
-  ChangeInsertion(anchor_rect, visible);
-  EXPECT_THAT(GetAndResetEvents(),
-              ElementsAre(INSERTION_HANDLE_SHOWN));
-  EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart());
-
-  // Tapping again shouldn't reset the active insertion point.
-  OnTapEvent();
-  MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
-  EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_DRAG_STARTED));
-  EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart());
-
-  event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0);
-  EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_TAPPED,
-                                               INSERTION_HANDLE_DRAG_STOPPED));
-  EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart());
-
-  anchor_rect.Offset(5, 15);
-  ChangeInsertion(anchor_rect, visible);
-  EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_MOVED));
-  EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart());
-
-  // Pressing shouldn't reset the active insertion point.
-  OnLongPressEvent();
-  event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
-  EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_DRAG_STARTED));
-  EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart());
-
-  event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0);
-  EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_TAPPED,
-                                               INSERTION_HANDLE_DRAG_STOPPED));
-  EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart());
-}
-
 TEST_F(TouchSelectionControllerTest, SelectionBasic) {
   gfx::RectF start_rect(5, 5, 0, 10);
   gfx::RectF end_rect(50, 5, 0, 10);
   bool visible = true;
 
   OnLongPressEvent();
   ChangeSelection(start_rect, visible, end_rect, visible);
   EXPECT_THAT(GetAndResetEvents(),
               ElementsAre(SELECTION_HANDLES_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart());
@@ skipping 718 matching lines @@
                           offset_rect.x(), offset_rect.bottom());
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_HANDLE_DRAG_STOPPED));
   EXPECT_EQ(test_controller.GetStartHandleOrientation(),
             TouchHandleOrientation::LEFT);
   EXPECT_EQ(test_controller.GetEndHandleOrientation(),
             TouchHandleOrientation::RIGHT);
 }
 
 }  // namespace ui