Allow pages on the OSX app launcher to be turned while dragging.

ui/app_list/cocoa/apps_grid_controller_unittest.mm

 // Copyright 2013 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/memory/scoped_nsobject.h"
 #import "testing/gtest_mac.h"
 #include "ui/app_list/app_list_item_model.h"
 #import "ui/app_list/cocoa/apps_collection_view_drag_manager.h"
 #import "ui/app_list/cocoa/apps_grid_controller.h"
 #import "ui/app_list/cocoa/apps_grid_view_item.h"
 #import "ui/app_list/cocoa/apps_pagination_model_observer.h"
 #import "ui/app_list/cocoa/test/apps_grid_controller_test_helper.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #import "ui/base/test/cocoa_test_event_utils.h"
 
 @interface TestPaginationObserver : NSObject<AppsPaginationModelObserver> {
  @private
+  NSInteger hoveredSegmentForTest_;
   int totalPagesChangedCount_;
   int selectedPageChangedCount_;
   int lastNewSelectedPage_;
   bool visibilityDidChange_;
 }
 
+@property(assign, nonatomic) NSInteger hoveredSegmentForTest;
 @property(assign, nonatomic) int totalPagesChangedCount;
 @property(assign, nonatomic) int selectedPageChangedCount;
 @property(assign, nonatomic) int lastNewSelectedPage;
 
 - (bool)readVisibilityDidChange;
 
 @end
 
 @implementation TestPaginationObserver
 
+@synthesize hoveredSegmentForTest = hoveredSegmentForTest_;
 @synthesize totalPagesChangedCount = totalPagesChangedCount_;
 @synthesize selectedPageChangedCount = selectedPageChangedCount_;
 @synthesize lastNewSelectedPage = lastNewSelectedPage_;
 
+- (id)init {
+  if ((self = [super init]))
+    hoveredSegmentForTest_ = -1;
+
+  return self;
+}
+
 - (bool)readVisibilityDidChange {
   bool truth = visibilityDidChange_;
   visibilityDidChange_ = false;
   return truth;
 }
 
 - (void)totalPagesChanged {
   ++totalPagesChangedCount_;
 }
 
 - (void)selectedPageChanged:(int)newSelected {
   ++selectedPageChangedCount_;
   lastNewSelectedPage_ = newSelected;
 }
 
 - (void)pageVisibilityChanged {
   visibilityDidChange_ = true;
 }
 
+- (NSInteger)pagerSegmentAtLocation:(NSPoint)locationInWindow {
+  return hoveredSegmentForTest_;
+}
+
 @end
 
 namespace app_list {
 namespace test {
 
 namespace {
 
 class AppsGridControllerTest : public AppsGridControllerTestHelper {
  public:
   AppsGridControllerTest() {}
@@ skipping 151 matching lines @@
   SimulateKeyAction(@selector(moveRight:));
   SimulateKeyAction(@selector(moveRight:));
   EXPECT_EQ(2u, [apps_grid_controller_ selectedItemIndex]);
   SimulateKeyAction(@selector(insertNewline:));
   EXPECT_EQ(1, delegate()->activate_count());
   EXPECT_EQ(std::string("Item 2"), delegate()->last_activated()->title());
 }
 
 // Tests keyboard navigation across pages.
 TEST_F(AppsGridControllerTest, CrossPageKeyboardNavigation) {
-  [AppsGridController setScrollAnimationDuration:0.0];
-
   model()->PopulateApps(2 * kItemsPerPage);
   EXPECT_EQ(kItemsPerPage, [[GetPageAt(0) content] count]);
   EXPECT_EQ(kItemsPerPage, [[GetPageAt(1) content] count]);
 
   // Moving Left, Up, or PageUp from the top-left corner of the first page does
   // nothing.
   [apps_grid_controller_ selectItemAtIndex:0];
   SimulateKeyAction(@selector(moveLeft:));
   EXPECT_EQ(0u, [apps_grid_controller_ selectedItemIndex]);
   SimulateKeyAction(@selector(moveUp:));
@@ skipping 212 matching lines @@
   EXPECT_EQ(4u, [apps_grid_controller_ pageCount]);
 
   EXPECT_FALSE([observer readVisibilityDidChange]);
   EXPECT_EQ(0, [observer selectedPageChangedCount]);
 
   [apps_grid_controller_ setPaginationObserver:nil];
 }
 
 // Test AppsGridPaginationObserver selectedPageChanged().
 TEST_F(AppsGridControllerTest, PaginationObserverSelectedPageChanged) {
-  [AppsGridController setScrollAnimationDuration:0.0];
   scoped_nsobject<TestPaginationObserver> observer(
       [[TestPaginationObserver alloc] init]);
   [apps_grid_controller_ setPaginationObserver:observer];
   EXPECT_EQ(0, [[NSAnimationContext currentContext] duration]);
 
   ReplaceTestModel(kItemsPerPage * 3 + 1);
   EXPECT_EQ(1, [observer totalPagesChangedCount]);
   EXPECT_EQ(4u, [apps_grid_controller_ pageCount]);
 
   EXPECT_FALSE([observer readVisibilityDidChange]);
@@ skipping 144 matching lines @@
   [drag_manager onMouseDownInPage:page
                         withEvent:mouse_at_cell_0];
   [drag_manager onMouseDragged:mouse_at_cell_1];
   [drag_manager onMouseUp:mouse_at_cell_1];
   EXPECT_EQ(std::string(), model()->GetModelContent());
   EXPECT_EQ(std::string("||"), GetViewContent());
 }
 
 // Test item moves between pages.
 TEST_F(AppsGridControllerTest, DragAndDropMultiPage) {
-  [AppsGridController setScrollAnimationDuration:0.0];
   const size_t kPagesToTest = 3;
   // Put one item on the last page to hit more edge cases.
   ReplaceTestModel(kItemsPerPage * (kPagesToTest - 1) + 1);
   NSCollectionView* page[kPagesToTest];
   for (size_t i = 0; i < kPagesToTest; ++i)
     page[i] = [apps_grid_controller_ collectionViewAtPageIndex:i];
 
   const std::string kSecondItemMovedToSecondPage =
       "|Item 0,Item 2,Item 3,Item 4,Item 5,Item 6,Item 7,Item 8,"
       "Item 9,Item 10,Item 11,Item 12,Item 13,Item 14,Item 15,Item 16|"
@@ skipping 50 matching lines @@
   EXPECT_EQ(2u, GetPageIndexForItem(33));
 
   // Scroll to end again, and keep dragging (should be ignored).
   [apps_grid_controller_ scrollToPage:2];
   [drag_manager onMouseDragged:mouse_at_cell_0];
   EXPECT_EQ(0u, GetPageIndexForItem(1));
   [drag_manager onMouseUp:mouse_at_cell_0];
   EXPECT_EQ(0u, GetPageIndexForItem(1));
 }
 
+namespace {
+
+NSEvent* MouseEventForScroll(NSView* view, CGFloat relative_x) {

[sail, 2013/05/17 19:16:13]

move to top of file?

[tapted, 2013/05/17 23:25:29]

Done.

+  NSRect view_rect = [view frame];
+  NSPoint point_in_view = NSMakePoint(NSMidX(view_rect), NSMidY(view_rect));
+  point_in_view.x += point_in_view.x * relative_x;
+  NSPoint point_in_window = [view convertPoint:point_in_view
+                                        toView:nil];
+  return cocoa_test_event_utils::LeftMouseDownAtPoint(point_in_window);
+}
+
+}  // namespace
+
+// Test scrolling when dragging past edge or over the pager.
+TEST_F(AppsGridControllerTest, ScrollingWhileDragging) {
+  scoped_nsobject<TestPaginationObserver> observer(
+      [[TestPaginationObserver alloc] init]);
+  [apps_grid_controller_ setPaginationObserver:observer];
+
+  ReplaceTestModel(kItemsPerPage * 3);
+  // Start on the middle page.
+  [apps_grid_controller_ scrollToPage:1];
+  NSCollectionView* page = [apps_grid_controller_ collectionViewAtPageIndex:1];
+  NSEvent* mouse_at_cell_0 = MouseEventInCell(page, 0);
+
+  NSEvent* at_center = MouseEventForScroll([apps_grid_controller_ view], 0.0);
+  NSEvent* at_left = MouseEventForScroll([apps_grid_controller_ view], -1.1);
+  NSEvent* at_right = MouseEventForScroll([apps_grid_controller_ view], 1.1);
+
+  AppsCollectionViewDragManager* drag_manager =
+      [apps_grid_controller_ dragManager];
+  [drag_manager onMouseDownInPage:page
+                        withEvent:mouse_at_cell_0];
+  [drag_manager onMouseDragged:at_center];
+
+  // Nothing should be scheduled: target page is visible page.
+  EXPECT_EQ(1u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(1u, [apps_grid_controller_ scheduledScrollPage]);
+
+  // Drag to the left, should go to first page and no further.
+  [drag_manager onMouseDragged:at_left];
+  EXPECT_EQ(1u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(0u, [apps_grid_controller_ scheduledScrollPage]);
+  [apps_grid_controller_ scrollToPage:0];  // Commit without timer for testing.
+  [drag_manager onMouseDragged:at_left];
+  EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(0u, [apps_grid_controller_ scheduledScrollPage]);
+
+  // Drag to the right, should go to last page and no futher.
+  [drag_manager onMouseDragged:at_right];
+  EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(1u, [apps_grid_controller_ scheduledScrollPage]);
+  [apps_grid_controller_ scrollToPage:1];
+  [drag_manager onMouseDragged:at_right];
+  EXPECT_EQ(1u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(2u, [apps_grid_controller_ scheduledScrollPage]);
+  [apps_grid_controller_ scrollToPage:2];
+  [drag_manager onMouseDragged:at_right];
+  EXPECT_EQ(2u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(2u, [apps_grid_controller_ scheduledScrollPage]);
+
+  // Simulate a hover over the first pager segment.
+  [observer setHoveredSegmentForTest:0];
+  [drag_manager onMouseDragged:at_center];
+  EXPECT_EQ(2u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(0u, [apps_grid_controller_ scheduledScrollPage]);
+
+  // Drag it back, should cancel schedule.
+  [observer setHoveredSegmentForTest:-1];
+  [drag_manager onMouseDragged:at_center];
+  EXPECT_EQ(2u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(2u, [apps_grid_controller_ scheduledScrollPage]);
+
+  // Hover again, now over middle segment, and ensure a release also cancels.
+  [observer setHoveredSegmentForTest:1];
+  [drag_manager onMouseDragged:at_center];
+  EXPECT_EQ(2u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(1u, [apps_grid_controller_ scheduledScrollPage]);
+  [drag_manager onMouseUp:at_center];
+  EXPECT_EQ(2u, [apps_grid_controller_ visiblePage]);
+  EXPECT_EQ(2u, [apps_grid_controller_ scheduledScrollPage]);
+
+  [apps_grid_controller_ setPaginationObserver:nil];
+}
+
 }  // namespace test
 }  // namespace app_list