Store AppItems as pages in AppListModel.

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/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "testing/gtest_mac.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 411 matching lines @@
 }
 
 // Test runtime updates: adding items, removing items, and moving items (e.g. in
 // response to app install, uninstall, and chrome sync changes. Also test
 // changing titles and icons.
 TEST_F(AppsGridControllerTest, ModelUpdates) {
   model()->PopulateApps(2);
   EXPECT_EQ(2u, [[GetPageAt(0) content] count]);
   EXPECT_EQ(std::string("|Item 0,Item 1|"), GetViewContent());
 
-  // Add an item (PopulateApps will create a duplicate "Item 0").
+  // Add an item (PopulateApps will create a new "Item 2").
   model()->PopulateApps(1);
   EXPECT_EQ(3u, [[GetPageAt(0) content] count]);
   NSButton* button = GetItemViewAt(2);
-  EXPECT_NSEQ(@"Item 0", [button title]);
-  EXPECT_EQ(std::string("|Item 0,Item 1,Item 0|"), GetViewContent());
+  EXPECT_NSEQ(@"Item 2", [button title]);
+  EXPECT_EQ(std::string("|Item 0,Item 1,Item 2|"), GetViewContent());
 
   // Update the title via the ItemModelObserver.
-  app_list::AppListItemModel* item_model = model()->apps()->GetItemAt(2);
+  app_list::AppListItemModel* item_model = model()->GetItemAt(0, 2);
   item_model->SetTitleAndFullName("UpdatedItem", "UpdatedItem");
   EXPECT_NSEQ(@"UpdatedItem", [button title]);
   EXPECT_EQ(std::string("|Item 0,Item 1,UpdatedItem|"), GetViewContent());
 
   // Test icon updates through the model observer by ensuring the icon changes.
   NSSize icon_size = [[button image] size];
   EXPECT_EQ(0, icon_size.width);
   EXPECT_EQ(0, icon_size.height);
 
   SkBitmap bitmap;
   const int kTestImageSize = 10;
   const int kTargetImageSize = 48;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, kTestImageSize, kTestImageSize);
   item_model->SetIcon(gfx::ImageSkia::CreateFrom1xBitmap(bitmap), false);
   icon_size = [[button image] size];
   // Icon should always be resized to 48x48.
   EXPECT_EQ(kTargetImageSize, icon_size.width);
   EXPECT_EQ(kTargetImageSize, icon_size.height);
 
   // Test removing an item at the end.
-  model()->apps()->DeleteAt(2);
+  model()->DeleteItemAt(0, 2);
   EXPECT_EQ(2u, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(std::string("|Item 0,Item 1|"), GetViewContent());
 
   // Test removing in the middle.
-  model()->AddItem("Item 2");
+  model()->CreateAndAddItem("Item 2");
   EXPECT_EQ(3u, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(std::string("|Item 0,Item 1,Item 2|"), GetViewContent());
-  model()->apps()->DeleteAt(1);
+  model()->DeleteItemAt(0, 1);
   EXPECT_EQ(2u, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(std::string("|Item 0,Item 2|"), GetViewContent());
 
-  // Test inserting in the middle.
-  model()->apps()->AddAt(1, model()->CreateItem("Item One", "Item One"));
+  // Test adding an item at the end.
+  model()->CreateAndAddItem("Item Three");
   EXPECT_EQ(3u, [apps_grid_controller_ itemCount]);
-  EXPECT_EQ(std::string("|Item 0,Item One,Item 2|"), GetViewContent());
+  EXPECT_EQ(std::string("|Item 0,Item 2,Item Three|"), GetViewContent());
 
   // Test swapping items (e.g. rearranging via sync).
-  model()->apps()->Move(1, 2);
-  EXPECT_EQ(std::string("|Item 0,Item 2,Item One|"), GetViewContent());
-
-  // Test removing multiple items via the model.
-  model()->apps()->DeleteAll();
-  EXPECT_EQ(0u, [apps_grid_controller_ itemCount]);
-  EXPECT_EQ(std::string("||"), GetViewContent());
+  model()->MoveItem(0, 1, 0, 2);
+  EXPECT_EQ(std::string("|Item 0,Item Three,Item 2|"), GetViewContent());
 
   // Test removing the last item when there is one item on the second page.
   ReplaceTestModel(kItemsPerPage + 1);
   EXPECT_EQ(kItemsPerPage + 1, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(2u, [apps_grid_controller_ pageCount]);
-  model()->apps()->DeleteAt(kItemsPerPage);
+  model()->DeleteItemAt(1, 0);
   EXPECT_EQ(kItemsPerPage, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(1u, [apps_grid_controller_ pageCount]);
 }
 
 // Test install progress bars, and install flow with item highlighting.
 TEST_F(AppsGridControllerTest, ItemInstallProgress) {
   ReplaceTestModel(kItemsPerPage + 1);
   EXPECT_EQ(2u, [apps_grid_controller_ pageCount]);
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
-  app_list::AppListItemModel* item_model =
-      model()->apps()->GetItemAt(kItemsPerPage);
+  app_list::AppListItemModel* item_model = model()->GetItemAt(1, 0);
 
   // Highlighting an item should activate the page it is on.
   item_model->SetHighlighted(true);
   EXPECT_EQ(1u, [apps_grid_controller_ visiblePage]);
 
   // Clearing a highlight stays on the current page.
   [apps_grid_controller_ scrollToPage:0];
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
   item_model->SetHighlighted(false);
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
@@ skipping 15 matching lines @@
   EXPECT_FALSE([progressIndicator isIndeterminate]);
   EXPECT_EQ(0.0, [progressIndicator doubleValue]);
 
   // Updating the progress in the model should update the progress bar.
   item_model->SetPercentDownloaded(50);
   EXPECT_EQ(50.0, [progressIndicator doubleValue]);
 
   // Two things can be installing simultaneously. When one starts or completes
   // the model builder will ask for the item to be highlighted.
   app_list::AppListItemModel* alternate_item_model =
-      model()->apps()->GetItemAt(0);
+      model()->GetItemAt(0, 0);
   item_model->SetHighlighted(false);
   alternate_item_model->SetHighlighted(true);
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
 
   // Update the first item (page doesn't change on updates).
   item_model->SetPercentDownloaded(100);
   EXPECT_EQ(100.0, [progressIndicator doubleValue]);
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
 
   // A percent of -1 indicates the download is complete and the unpack/install
@@ skipping 46 matching lines @@
   model()->PopulateApps(kItemsPerPage);
   EXPECT_EQ(0, [observer totalPagesChangedCount]);
   EXPECT_EQ(1u, [apps_grid_controller_ pageCount]);
   model()->PopulateApps(1);
   EXPECT_EQ(1, [observer totalPagesChangedCount]);
   EXPECT_EQ(2u, [apps_grid_controller_ pageCount]);
   ReplaceTestModel(0);
   EXPECT_EQ(2, [observer totalPagesChangedCount]);
   EXPECT_EQ(1u, [apps_grid_controller_ pageCount]);
   ReplaceTestModel(kItemsPerPage * 3 + 1);
-  EXPECT_EQ(3, [observer totalPagesChangedCount]);
+  // 4 pages = 3 additional page changes
+  EXPECT_EQ(5, [observer totalPagesChangedCount]);
   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) {
   base::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]);
+  // 4 pages = 3 page changes
+  EXPECT_EQ(3, [observer totalPagesChangedCount]);
   EXPECT_EQ(4u, [apps_grid_controller_ pageCount]);
 
   EXPECT_FALSE([observer readVisibilityDidChange]);
   EXPECT_EQ(0, [observer selectedPageChangedCount]);
 
   [apps_grid_controller_ scrollToPage:1];
   EXPECT_EQ(1, [observer selectedPageChangedCount]);
   EXPECT_EQ(1, [observer lastNewSelectedPage]);
   EXPECT_TRUE([observer readVisibilityDidChange]);
   EXPECT_FALSE([observer readVisibilityDidChange]);  // Testing test behaviour.
@@ skipping 266 matching lines @@
   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];
 }
 
 TEST_F(AppsGridControllerTest, ContextMenus) {
   AppListItemWithMenu* item_two_model = new AppListItemWithMenu("Item Two");
-  model()->apps()->AddAt(0, new AppListItemWithMenu("Item One"));
-  model()->apps()->AddAt(1, item_two_model);
+  model()->AddItem(new AppListItemWithMenu("Item One"));
+  model()->AddItem(item_two_model);
   EXPECT_EQ(2u, [apps_grid_controller_ itemCount]);
 
   NSCollectionView* page = [apps_grid_controller_ collectionViewAtPageIndex:0];
   NSEvent* mouse_at_cell_0 = MouseEventInCell(page, 0);
   NSEvent* mouse_at_cell_1 = MouseEventInCell(page, 1);
 
   NSMenu* menu = [page menuForEvent:mouse_at_cell_0];
   EXPECT_EQ(1, [menu numberOfItems]);
   EXPECT_NSEQ(@"Menu For: Item One", [[menu itemAtIndex:0] title]);
 
   // Test a context menu request while the item is still installing.
   item_two_model->SetMenuReadyForTesting(false);
   menu = [page menuForEvent:mouse_at_cell_1];
   EXPECT_EQ(nil, menu);
 
   item_two_model->SetMenuReadyForTesting(true);
   menu = [page menuForEvent:mouse_at_cell_1];
   EXPECT_EQ(1, [menu numberOfItems]);
   EXPECT_NSEQ(@"Menu For: Item Two", [[menu itemAtIndex:0] title]);
 }
 
 }  // namespace test
 }  // namespace app_list