Extending the Views-on-Mac experiment: whole app list grid.

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"
 #include "ui/app_list/app_list_item.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"
+#include "ui/app_list/views/progress_bar_view.h"
 #include "ui/base/models/simple_menu_model.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 
 @interface TestPaginationObserver : NSObject<AppsPaginationModelObserver> {
  @private
   NSInteger hoveredSegmentForTest_;
   int totalPagesChangedCount_;
   int selectedPageChangedCount_;
   int lastNewSelectedPage_;
   bool visibilityDidChange_;
@@ skipping 544 matching lines @@
   NSButton* button = GetItemViewAt(kItemsPerPage);
   NSView* containerView = [button superview];
   EXPECT_EQ(1u, [[containerView subviews] count]);
   EXPECT_NSEQ(@"Item 16", [button title]);
   item_model->SetHighlighted(true);
   item_model->SetIsInstalling(true);
   EXPECT_EQ(1u, [apps_grid_controller_ visiblePage]);
 
   EXPECT_EQ(2u, [[containerView subviews] count]);
   EXPECT_NSEQ(@"", [button title]);
-  NSProgressIndicator* progressIndicator =
-      [[containerView subviews] objectAtIndex:1];
-  EXPECT_FALSE([progressIndicator isIndeterminate]);
-  EXPECT_EQ(0.0, [progressIndicator doubleValue]);
+  app_list::ProgressBarView* progressBar =
+      [[apps_grid_controller_ itemAtIndex:kItemsPerPage] progressIndicator];
+  // TODO(tapted): Check for indeterminate:NO.
+  EXPECT_EQ(0.0, progressBar->current_value());
 
   // Updating the progress in the model should update the progress bar.
   item_model->SetPercentDownloaded(50);
-  EXPECT_EQ(50.0, [progressIndicator doubleValue]);
+  EXPECT_EQ(0.5, progressBar->current_value());
 
   // Two things can be installing simultaneously. When one starts or completes
   // the model builder will ask for the item to be highlighted.
   app_list::AppListItem* alternate_item_model =
       model()->top_level_item_list()->item_at(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(1.0, progressBar->current_value());
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
 
   // A percent of -1 indicates the download is complete and the unpack/install
   // process has started.
   item_model->SetPercentDownloaded(-1);
-  EXPECT_TRUE([progressIndicator isIndeterminate]);
+  // TODO(tapted): Check for indeterminate:YES.
 
   // Completing install removes the progress bar, and restores the title.
   // ExtensionAppModelBuilder will reload the ExtensionAppItem, which also
   // highlights. Do the same here.
   alternate_item_model->SetHighlighted(false);
   item_model->SetHighlighted(true);
   item_model->SetIsInstalling(false);
   EXPECT_EQ(1u, [[containerView subviews] count]);
   EXPECT_NSEQ(@"Item 16", [button title]);
   EXPECT_EQ(1u, [apps_grid_controller_ visiblePage]);
@@ skipping 369 matching lines @@
   // Test that a button being held down with the left button does not also show
   // a context menu.
   [GetItemViewAt(0) highlight:YES];
   EXPECT_FALSE([page menuForEvent:mouse_at_cell_0]);
   [GetItemViewAt(0) highlight:NO];
   EXPECT_TRUE([page menuForEvent:mouse_at_cell_0]);
 }
 
 }  // namespace test
 }  // namespace app_list