Refactor app list max folder logic.

ui/app_list/views/apps_grid_view_unittest.cc

 // Copyright (c) 2012 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/app_list/views/apps_grid_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 131 matching lines @@
                    GetItemViewAt(0)->bounds().size());
     rect.Offset(col * rect.width(), row * rect.height());
     return rect;
   }
 
   PaginationModel* GetPaginationModel() {
     return apps_grid_view_->pagination_model();
   }
 
   // Points are in |apps_grid_view_|'s coordinates.
-  void SimulateDrag(AppsGridView::Pointer pointer,
-                    const gfx::Point& from,
-                    const gfx::Point& to) {
+  AppListItemView* SimulateDrag(AppsGridView::Pointer pointer,
+                                const gfx::Point& from,
+                                const gfx::Point& to) {
     AppListItemView* view = GetItemViewForPoint(from);
     DCHECK(view);
 
     gfx::Point translated_from = gfx::PointAtOffsetFromOrigin(
         from - view->bounds().origin());
     gfx::Point translated_to = gfx::PointAtOffsetFromOrigin(
         to - view->bounds().origin());
 
     ui::MouseEvent pressed_event(ui::ET_MOUSE_PRESSED,
                                  translated_from, from, 0, 0);
     apps_grid_view_->InitiateDrag(view, pointer, pressed_event);
 
     ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
                               translated_to, to, 0, 0);
     apps_grid_view_->UpdateDragFromItem(pointer, drag_event);
+    return view;
   }
 
   void SimulateKeyPress(ui::KeyboardCode key_code) {
     ui::KeyEvent key_event(ui::ET_KEY_PRESSED, key_code, ui::EF_NONE);
     apps_grid_view_->OnKeyPressed(key_event);
   }
 
   scoped_ptr<AppListTestModel> model_;
   scoped_ptr<AppsGridView> apps_grid_view_;
   scoped_ptr<AppsGridViewTestApi> test_api_;
@@ skipping 229 matching lines @@
 
   // Dragging the last item over the folder, the folder won't accept the new
   // item.
   SimulateDrag(AppsGridView::MOUSE, from, to);
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(kMaxFolderItems, folder_item->ChildItemCount());
   test_api_->LayoutToIdealBounds();
 }
 
+// Check that moving items around doesn't allow a drop to happen into a full
+// folder.
+TEST_F(AppsGridViewTest, MouseDragMaxItemsInFolderWithMovement) {
+  EnsureFoldersEnabled();
+
+  // Create and add a folder with 16 items in it.
+  size_t kTotalItems = kMaxFolderItems;
+  model_->CreateAndPopulateFolderWithApps(kTotalItems);
+  EXPECT_EQ(1u, model_->top_level_item_list()->item_count());
+  EXPECT_EQ(AppListFolderItem::kItemType,
+            model_->top_level_item_list()->item_at(0)->GetItemType());
+  AppListFolderItem* folder_item = static_cast<AppListFolderItem*>(
+      model_->top_level_item_list()->item_at(0));
+  EXPECT_EQ(kTotalItems, folder_item->ChildItemCount());
+
+  // Create and add another item.
+  model_->PopulateAppWithId(kTotalItems);
+  EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
+  EXPECT_EQ(folder_item->id(), model_->top_level_item_list()->item_at(0)->id());
+  EXPECT_EQ(model_->GetItemName(kMaxFolderItems),
+            model_->top_level_item_list()->item_at(1)->id());
+
+  AppListItemView* folder_view =
+      GetItemViewForPoint(GetItemTileRectAt(0, 0).CenterPoint());
+
+  // Drag the new item to the left so that the grid reorders.
+  gfx::Point from = GetItemTileRectAt(0, 1).CenterPoint();
+  gfx::Point to = GetItemTileRectAt(0, 0).bottom_left();
+  AppListItemView* dragged_view = SimulateDrag(AppsGridView::MOUSE, from, to);
+  test_api_->LayoutToIdealBounds();
+
+  // The grid now looks like | blank | folder |.
+  EXPECT_EQ(NULL, GetItemViewForPoint(GetItemTileRectAt(0, 0).CenterPoint()));
+  EXPECT_EQ(folder_view,
+            GetItemViewForPoint(GetItemTileRectAt(0, 1).CenterPoint()));
+
+  // Move onto the folder and end the drag.
+  to = GetItemTileRectAt(0, 1).CenterPoint();
+  gfx::Point translated_to =
+      gfx::PointAtOffsetFromOrigin(to - dragged_view->bounds().origin());
+  ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, translated_to, to, 0, 0);
+  apps_grid_view_->UpdateDragFromItem(AppsGridView::MOUSE, drag_event);
+  apps_grid_view_->EndDrag(false);
+
+  // The item should not have moved into the folder.
+  EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
+  EXPECT_EQ(kMaxFolderItems, folder_item->ChildItemCount());
+  test_api_->LayoutToIdealBounds();
+}
+
 TEST_F(AppsGridViewTest, MouseDragItemReorder) {
   // This test assumes Folders are enabled.
   EnsureFoldersEnabled();
 
   model_->PopulateApps(4);
   EXPECT_EQ(4u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
             model_->GetModelContent());
 
   // Dragging an item towards its neighbours should not reorder until the drag
@@ skipping 311 matching lines @@
   AppListItemView* item_view = GetItemViewAt(0);
   ASSERT_TRUE(item_view);
   const views::Label* title_label = item_view->title();
   EXPECT_FALSE(title_label->GetTooltipText(
       title_label->bounds().CenterPoint(), &actual_tooltip));
   EXPECT_EQ(title, base::UTF16ToUTF8(title_label->text()));
 }
 
 }  // namespace test
 }  // namespace app_list