Index: ui/touch_selection/touch_selection_controller_unittest.cc |
diff --git a/ui/touch_selection/touch_selection_controller_unittest.cc b/ui/touch_selection/touch_selection_controller_unittest.cc |
index fc2259e8547a5a5ba57766f8b7478fb43c4d3864..5b60f320588224d179b33ebf04adf2b0126b5b65 100644 |
--- a/ui/touch_selection/touch_selection_controller_unittest.cc |
+++ b/ui/touch_selection/touch_selection_controller_unittest.cc |
@@ -36,6 +36,8 @@ class MockTouchHandleDrawable : public TouchHandleDrawable { |
private: |
bool* intersects_rect_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(MockTouchHandleDrawable); |
}; |
} // namespace |
@@ -104,6 +106,9 @@ class TouchSelectionControllerTest : public testing::Test, |
return make_scoped_ptr(new MockTouchHandleDrawable(&dragging_enabled_)); |
} |
+ void OnScrollStarted() override {} |
+ void OnScrollCompleted() override {} |
+ |
void AllowShowingOnTapForEmptyEditable() { |
bool show_on_tap_for_empty_editable = true; |
controller_.reset(new TouchSelectionController( |
@@ -116,22 +121,22 @@ class TouchSelectionControllerTest : public testing::Test, |
void SetAnimationEnabled(bool enabled) { animation_enabled_ = enabled; } |
void SetDraggingEnabled(bool enabled) { dragging_enabled_ = enabled; } |
- void ClearSelection() { |
- controller_->OnSelectionBoundsChanged(SelectionBound(), |
- SelectionBound()); |
+ bool ClearSelection() { |
+ return controller_->OnSelectionBoundsUpdated(SelectionBound(), |
+ SelectionBound()); |
} |
- void ClearInsertion() { ClearSelection(); } |
+ bool ClearInsertion() { return ClearSelection(); } |
- void ChangeInsertion(const gfx::RectF& rect, bool visible) { |
+ bool ChangeInsertion(const gfx::RectF& rect, bool visible) { |
SelectionBound bound; |
bound.set_type(SelectionBound::CENTER); |
bound.SetEdge(rect.origin(), rect.bottom_left()); |
bound.set_visible(visible); |
- controller_->OnSelectionBoundsChanged(bound, bound); |
+ return controller_->OnSelectionBoundsUpdated(bound, bound); |
} |
- void ChangeSelection(const gfx::RectF& start_rect, |
+ bool ChangeSelection(const gfx::RectF& start_rect, |
bool start_visible, |
const gfx::RectF& end_rect, |
bool end_visible) { |
@@ -142,7 +147,7 @@ class TouchSelectionControllerTest : public testing::Test, |
end_bound.SetEdge(end_rect.origin(), end_rect.bottom_left()); |
start_bound.set_visible(start_visible); |
end_bound.set_visible(end_visible); |
- controller_->OnSelectionBoundsChanged(start_bound, end_bound); |
+ return controller_->OnSelectionBoundsUpdated(start_bound, end_bound); |
} |
void Animate() { |
@@ -205,6 +210,8 @@ class TouchSelectionControllerTest : public testing::Test, |
bool animation_enabled_; |
bool dragging_enabled_; |
scoped_ptr<TouchSelectionController> controller_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerTest); |
}; |
TEST_F(TouchSelectionControllerTest, InsertionBasic) { |
@@ -212,33 +219,33 @@ TEST_F(TouchSelectionControllerTest, InsertionBasic) { |
bool visible = true; |
// Insertion events are ignored until automatic showing is enabled. |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_FALSE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), IsEmpty()); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
controller().OnTapEvent(); |
// Insertion events are ignored until the selection region is marked editable. |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), IsEmpty()); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
controller().OnTapEvent(); |
controller().OnSelectionEditable(true); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
insertion_rect.Offset(1, 0); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_MOVED)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
insertion_rect.Offset(0, 1); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_MOVED)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
- ClearInsertion(); |
+ EXPECT_TRUE(ClearInsertion()); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED)); |
} |
@@ -248,7 +255,7 @@ TEST_F(TouchSelectionControllerTest, InsertionClearedWhenNoLongerEditable) { |
controller().OnTapEvent(); |
controller().OnSelectionEditable(true); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
@@ -265,13 +272,13 @@ TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) { |
// created with |show_on_tap_for_empty_editable| set to false. |
controller().OnTapEvent(); |
controller().OnSelectionEmpty(true); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
// Once the region becomes non-empty, taps should show the insertion handle. |
controller().OnTapEvent(); |
controller().OnSelectionEmpty(false); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
@@ -283,7 +290,7 @@ TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) { |
insertion_rect.Offset(2, -2); |
controller().OnLongPressEvent(); |
controller().OnSelectionEmpty(true); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
@@ -303,13 +310,13 @@ TEST_F(TouchSelectionControllerTest, InsertionWithShowOnTapForEmptyEditable) { |
// controller is created with |show_on_tap_for_empty_editable| set to true. |
controller().OnTapEvent(); |
controller().OnSelectionEmpty(true); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
// Additional taps should not hide the insertion handle in this case. |
controller().OnTapEvent(); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_FALSE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), IsEmpty()); |
} |
@@ -321,19 +328,19 @@ TEST_F(TouchSelectionControllerTest, InsertionAppearsAfterTapFollowingTyping) { |
controller().OnTapEvent(); |
controller().OnSelectionEditable(true); |
controller().OnSelectionEmpty(true); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
// Simulate the cursor moving while a user is typing. |
insertion_rect.Offset(10, 0); |
controller().OnSelectionEmpty(false); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_FALSE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
// If the user taps the *same* position as the cursor at the end of the text |
// entry, the handle should appear. |
controller().OnTapEvent(); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |
} |
@@ -346,16 +353,16 @@ TEST_F(TouchSelectionControllerTest, InsertionToSelectionTransition) { |
gfx::RectF end_rect(50, 5, 0, 10); |
bool visible = true; |
- ChangeInsertion(start_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED, |
SELECTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
- ChangeInsertion(end_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED, |
INSERTION_SHOWN)); |
EXPECT_EQ(end_rect.bottom_left(), GetLastEventStart()); |
@@ -364,7 +371,7 @@ TEST_F(TouchSelectionControllerTest, InsertionToSelectionTransition) { |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED)); |
controller().OnTapEvent(); |
- ChangeInsertion(end_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(end_rect.bottom_left(), GetLastEventStart()); |
} |
@@ -381,7 +388,7 @@ TEST_F(TouchSelectionControllerTest, InsertionDragged) { |
float line_height = 10.f; |
gfx::RectF start_rect(10, 0, 0, line_height); |
bool visible = true; |
- ChangeInsertion(start_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
@@ -428,12 +435,11 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) { |
gfx::RectF start_rect(10, 0, 0, 10); |
bool visible = true; |
- ChangeInsertion(start_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0); |
EXPECT_TRUE(controller().WillHandleTouchEvent(event)); |
- //TODO(AKV): this test case has to be modified once crbug.com/394093 is fixed. |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_DRAG_STARTED)); |
event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0); |
@@ -442,9 +448,9 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) { |
INSERTION_DRAG_STOPPED)); |
// Reset the insertion. |
- ClearInsertion(); |
+ EXPECT_TRUE(ClearInsertion()); |
controller().OnTapEvent(); |
- ChangeInsertion(start_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED, |
INSERTION_SHOWN)); |
@@ -460,9 +466,9 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) { |
INSERTION_DRAG_STOPPED)); |
// Reset the insertion. |
- ClearInsertion(); |
+ EXPECT_TRUE(ClearInsertion()); |
controller().OnTapEvent(); |
- ChangeInsertion(start_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED, |
INSERTION_SHOWN)); |
@@ -477,9 +483,9 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) { |
INSERTION_DRAG_STOPPED)); |
// Reset the insertion. |
- ClearInsertion(); |
+ EXPECT_TRUE(ClearInsertion()); |
controller().OnTapEvent(); |
- ChangeInsertion(start_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED, |
INSERTION_SHOWN)); |
@@ -500,7 +506,7 @@ TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) { |
gfx::RectF anchor_rect(10, 0, 0, 10); |
bool visible = true; |
- ChangeInsertion(anchor_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(anchor_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart()); |
@@ -518,7 +524,7 @@ TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) { |
EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart()); |
anchor_rect.Offset(5, 15); |
- ChangeInsertion(anchor_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(anchor_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_MOVED)); |
EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventStart()); |
@@ -543,22 +549,22 @@ TEST_F(TouchSelectionControllerTest, SelectionBasic) { |
bool visible = true; |
// Selection events are ignored until automatic showing is enabled. |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_FALSE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
controller().OnLongPressEvent(); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
start_rect.Offset(1, 0); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
// Selection movement does not currently trigger a separate event. |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_MOVED)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
EXPECT_EQ(end_rect.bottom_left(), GetLastEventEnd()); |
- ClearSelection(); |
+ EXPECT_TRUE(ClearSelection()); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED)); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
} |
@@ -569,7 +575,7 @@ TEST_F(TouchSelectionControllerTest, SelectionRepeatedLongPress) { |
bool visible = true; |
controller().OnLongPressEvent(); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
EXPECT_EQ(end_rect.bottom_left(), GetLastEventEnd()); |
@@ -578,7 +584,7 @@ TEST_F(TouchSelectionControllerTest, SelectionRepeatedLongPress) { |
// event notification. |
start_rect.Offset(10, 10); |
controller().OnLongPressEvent(); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
EXPECT_EQ(end_rect.bottom_left(), GetLastEventEnd()); |
@@ -596,7 +602,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDragged) { |
gfx::RectF start_rect(0, 0, 0, line_height); |
gfx::RectF end_rect(50, 0, 0, line_height); |
bool visible = true; |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
@@ -650,7 +656,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedWithOverlap) { |
gfx::RectF start_rect(0, 0, 0, line_height); |
gfx::RectF end_rect(50, 0, 0, line_height); |
bool visible = true; |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
@@ -688,7 +694,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) { |
gfx::RectF start_rect(50, line_height, 0, line_height); |
gfx::RectF end_rect(100, line_height, 0, line_height); |
bool visible = true; |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
@@ -718,7 +724,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) { |
EXPECT_FALSE(GetAndResetSelectionMoved()); |
end_rect += gfx::Vector2dF(0, 5); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_MOVED)); |
// Move the base, triggering a swap of points. |
@@ -745,7 +751,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) { |
EXPECT_FALSE(GetAndResetSelectionMoved()); |
start_rect += gfx::Vector2dF(0, 5); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_MOVED)); |
// Move the same point again, not triggering a swap of points. |
@@ -772,7 +778,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) { |
EXPECT_FALSE(GetAndResetSelectionMoved()); |
start_rect += gfx::Vector2dF(0, 5); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_MOVED)); |
// Move the base, triggering a swap of points. |
@@ -808,7 +814,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDragExtremeLineSize) { |
gfx::RectF small_line_rect(0, 0, 0, small_line_height); |
gfx::RectF large_line_rect(50, 50, 0, large_line_height); |
bool visible = true; |
- ChangeSelection(small_line_rect, visible, large_line_rect, visible); |
+ EXPECT_TRUE( |
+ ChangeSelection(small_line_rect, visible, large_line_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
EXPECT_EQ(small_line_rect.bottom_left(), GetLastEventStart()); |
@@ -841,15 +848,15 @@ TEST_F(TouchSelectionControllerTest, Animation) { |
gfx::RectF insertion_rect(5, 5, 0, 10); |
bool visible = true; |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_FALSE(GetAndResetNeedsAnimate()); |
visible = false; |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_TRUE(GetAndResetNeedsAnimate()); |
visible = true; |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_TRUE(GetAndResetNeedsAnimate()); |
// If the handles are explicity hidden, no animation should be triggered. |
@@ -860,7 +867,7 @@ TEST_F(TouchSelectionControllerTest, Animation) { |
SetAnimationEnabled(false); |
controller().OnTapEvent(); |
visible = true; |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_FALSE(GetAndResetNeedsAnimate()); |
} |
@@ -871,18 +878,18 @@ TEST_F(TouchSelectionControllerTest, TemporarilyHidden) { |
gfx::RectF insertion_rect(5, 5, 0, 10); |
bool visible = true; |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_FALSE(GetAndResetNeedsAnimate()); |
controller().SetTemporarilyHidden(true); |
EXPECT_TRUE(GetAndResetNeedsAnimate()); |
visible = false; |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_FALSE(GetAndResetNeedsAnimate()); |
visible = true; |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible)); |
EXPECT_FALSE(GetAndResetNeedsAnimate()); |
controller().SetTemporarilyHidden(false); |
@@ -895,7 +902,7 @@ TEST_F(TouchSelectionControllerTest, SelectionClearOnTap) { |
bool visible = true; |
controller().OnLongPressEvent(); |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN)); |
// Selection should not be cleared if the selection bounds have not changed. |
@@ -904,7 +911,7 @@ TEST_F(TouchSelectionControllerTest, SelectionClearOnTap) { |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
controller().OnTapEvent(); |
- ClearSelection(); |
+ EXPECT_TRUE(ClearSelection()); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED)); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
} |
@@ -915,7 +922,7 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) { |
bool visible = true; |
// The selection should not be activated, as it wasn't yet allowed. |
- ChangeSelection(start_rect, visible, end_rect, visible); |
+ EXPECT_FALSE(ChangeSelection(start_rect, visible, end_rect, visible)); |
EXPECT_EQ(gfx::PointF(), GetLastEventStart()); |
// Now explicitly allow showing from the previously supplied bounds. |
@@ -929,7 +936,7 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) { |
EXPECT_EQ(start_rect.bottom_left(), GetLastEventStart()); |
// Trying to show from an empty selection will have no result. |
- ClearSelection(); |
+ EXPECT_TRUE(ClearSelection()); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED)); |
controller().AllowShowingFromCurrentSelection(); |
EXPECT_THAT(GetAndResetEvents(), IsEmpty()); |
@@ -939,7 +946,7 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) { |
controller().OnSelectionEmpty(false); |
controller().HideAndDisallowShowingAutomatically(); |
gfx::RectF insertion_rect(5, 5, 0, 10); |
- ChangeInsertion(insertion_rect, visible); |
+ EXPECT_FALSE(ChangeInsertion(insertion_rect, visible)); |
controller().AllowShowingFromCurrentSelection(); |
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN)); |
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart()); |