Add a way to reconfigure cell from IndexPaths

ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
 
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/test/base/scoped_block_swizzler.h"
 #include "ios/chrome/test/block_cleanup_test.h"
@@ skipping 26 matching lines @@
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
   SectionIdentifierFoo = kSectionIdentifierEnumZero,
 };
 
 typedef NS_ENUM(NSInteger, ItemType) {
   ItemTypeFooBar = kItemTypeEnumZero,
   ItemTypeFooBiz,
 };
 
-class CollectionViewControllerTest : public BlockCleanupTest {};
+typedef void (^ReconfigureBlock)(CollectionViewController*,
+                                 NSArray*,
+                                 SectionIdentifier);
+
+class CollectionViewControllerTest : public BlockCleanupTest {
+ public:
+  void TestReconfigureBlock(ReconfigureBlock block) {
+    CollectionViewController* controller = [[CollectionViewController alloc]
+        initWithStyle:CollectionViewControllerStyleDefault];
+    [controller loadModel];
+
+    CollectionViewModel* model = [controller collectionViewModel];
+    [model addSectionWithIdentifier:SectionIdentifierFoo];
+
+    MockCollectionViewItem* firstReconfiguredItem =
+        [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBar];
+    [model addItem:firstReconfiguredItem
+        toSectionWithIdentifier:SectionIdentifierFoo];
+
+    MockCollectionViewItem* secondReconfiguredItem =
+        [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
+    [model addItem:secondReconfiguredItem
+        toSectionWithIdentifier:SectionIdentifierFoo];
+
+    MockCollectionViewItem* firstNonReconfiguredItem =
+        [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
+    [model addItem:firstNonReconfiguredItem
+        toSectionWithIdentifier:SectionIdentifierFoo];
+
+    MockCollectionViewItem* thirdReconfiguredItem =
+        [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
+    [model addItem:thirdReconfiguredItem
+        toSectionWithIdentifier:SectionIdentifierFoo];
+
+    MockCollectionViewItem* secondNonReconfiguredItem =
+        [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
+    [model addItem:secondNonReconfiguredItem
+        toSectionWithIdentifier:SectionIdentifierFoo];
+
+    // The collection view is not visible on screen, so it has not created any
+    // of its cells.  Swizzle |cellsForItemAtIndexPath:| and inject an
+    // implementation for testing that always returns a non-nil cell.
+    MDCCollectionViewCell* dummyCell = [[MDCCollectionViewCell alloc] init];
+    {
+      ScopedBlockSwizzler swizzler([UICollectionView class],
+                                   @selector(cellForItemAtIndexPath:),
+                                   ^(id self) {
+                                     return dummyCell;
+                                   });
+
+      NSArray* itemsToReconfigure = @[
+        firstReconfiguredItem, secondReconfiguredItem, thirdReconfiguredItem
+      ];
+      block(controller, itemsToReconfigure, SectionIdentifierFoo);
+    }
+
+    EXPECT_TRUE([firstReconfiguredItem configureCellCalled]);
+    EXPECT_TRUE([secondReconfiguredItem configureCellCalled]);
+    EXPECT_TRUE([thirdReconfiguredItem configureCellCalled]);
+
+    EXPECT_FALSE([firstNonReconfiguredItem configureCellCalled]);
+    EXPECT_FALSE([secondNonReconfiguredItem configureCellCalled]);
+  }
+};
 
 }  // namespace
 
 TEST_F(CollectionViewControllerTest, InitDefaultStyle) {
   CollectionViewController* controller = [[CollectionViewController alloc]
       initWithStyle:CollectionViewControllerStyleDefault];
   EXPECT_EQ(nil, controller.appBar);
 }
 
 TEST_F(CollectionViewControllerTest, InitAppBarStyle) {
@@ skipping 14 matching lines @@
   [[controller collectionViewModel] addItem:someItem
                     toSectionWithIdentifier:SectionIdentifierFoo];
 
   ASSERT_EQ(NO, [someItem configureCellCalled]);
   [controller collectionView:[controller collectionView]
       cellForItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]];
   EXPECT_EQ(YES, [someItem configureCellCalled]);
 }
 
 TEST_F(CollectionViewControllerTest, ReconfigureCells) {
-  CollectionViewController* controller = [[CollectionViewController alloc]
-      initWithStyle:CollectionViewControllerStyleDefault];
-  [controller loadModel];
+  TestReconfigureBlock(^void(CollectionViewController* controller,
+                             NSArray* itemsToReconfigure,
+                             SectionIdentifier sectionIdentifier) {
+    [controller reconfigureCellsForItems:itemsToReconfigure
+                 inSectionWithIdentifier:sectionIdentifier];
+  });
+}
 
-  CollectionViewModel* model = [controller collectionViewModel];
-  [model addSectionWithIdentifier:SectionIdentifierFoo];
-
-  MockCollectionViewItem* firstReconfiguredItem =
-      [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBar];
-  [model addItem:firstReconfiguredItem
-      toSectionWithIdentifier:SectionIdentifierFoo];
-
-  MockCollectionViewItem* secondReconfiguredItem =
-      [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
-  [model addItem:secondReconfiguredItem
-      toSectionWithIdentifier:SectionIdentifierFoo];
-
-  MockCollectionViewItem* firstNonReconfiguredItem =
-      [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
-  [model addItem:firstNonReconfiguredItem
-      toSectionWithIdentifier:SectionIdentifierFoo];
-
-  MockCollectionViewItem* thirdReconfiguredItem =
-      [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
-  [model addItem:thirdReconfiguredItem
-      toSectionWithIdentifier:SectionIdentifierFoo];
-
-  MockCollectionViewItem* secondNonReconfiguredItem =
-      [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
-  [model addItem:secondNonReconfiguredItem
-      toSectionWithIdentifier:SectionIdentifierFoo];
-
-  // The collection view is not visible on screen, so it has not created any of
-  // its cells.  Swizzle |cellsForItemAtIndexPath:| and inject an implementation
-  // for testing that always returns a non-nil cell.
-  MDCCollectionViewCell* dummyCell = [[MDCCollectionViewCell alloc] init];
-  {
-    ScopedBlockSwizzler swizzler([UICollectionView class],
-                                 @selector(cellForItemAtIndexPath:),
-                                 ^(id self) {
-                                   return dummyCell;
-                                 });
-
-    NSArray* itemsToReconfigure = @[
-      firstReconfiguredItem, secondReconfiguredItem, thirdReconfiguredItem
-    ];
-    [controller reconfigureCellsForItems:itemsToReconfigure
-                 inSectionWithIdentifier:SectionIdentifierFoo];
-  }
-
-  EXPECT_TRUE([firstReconfiguredItem configureCellCalled]);
-  EXPECT_TRUE([secondReconfiguredItem configureCellCalled]);
-  EXPECT_TRUE([thirdReconfiguredItem configureCellCalled]);
-
-  EXPECT_FALSE([firstNonReconfiguredItem configureCellCalled]);
-  EXPECT_FALSE([secondNonReconfiguredItem configureCellCalled]);
+TEST_F(CollectionViewControllerTest, ReconfigureCellsWithIndexPath) {
+  TestReconfigureBlock(^void(CollectionViewController* controller,
+                             NSArray* itemsToReconfigure,
+                             SectionIdentifier sectionIdentifier) {
+    NSMutableArray* indexPaths = [NSMutableArray array];
+    for (CollectionViewItem* item : itemsToReconfigure) {
+      NSIndexPath* indexPath =
+          [controller.collectionViewModel indexPathForItem:item
+                                   inSectionWithIdentifier:sectionIdentifier];
+      if (indexPath) {
+        [indexPaths addObject:indexPath];
+      }
+    }
+    [controller reconfigureCellsAtIndexPaths:indexPaths];
+  });
 }