Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm

Issue 2680363004: [ObjC ARC] Converts ios/chrome/browser/ui/collection_view:unit_tests to ARC. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm b/ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm
index c5b5488b62aa7f3aab835f313b3b4cc31ad8bc14..d2318fb8c83e5c3d466e448901c863b5bcd53aa3 100644
--- a/ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm
@@ -4,8 +4,6 @@
#import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
-#include "base/ios/weak_nsobject.h"
-#import "base/mac/scoped_nsobject.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"
@@ -13,6 +11,10 @@
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
// Checks that key methods are called.
// CollectionViewItem can't easily be mocked via OCMock as one of the methods to
// mock returns a Class type.
@@ -47,29 +49,26 @@ class CollectionViewControllerTest : public BlockCleanupTest {};
} // namespace
TEST_F(CollectionViewControllerTest, InitDefaultStyle) {
- base::scoped_nsobject<CollectionViewController> controller(
- [[CollectionViewController alloc]
- initWithStyle:CollectionViewControllerStyleDefault]);
- EXPECT_EQ(nil, controller.get().appBar);
+ CollectionViewController* controller = [[CollectionViewController alloc]
+ initWithStyle:CollectionViewControllerStyleDefault];
+ EXPECT_EQ(nil, controller.appBar);
}
TEST_F(CollectionViewControllerTest, InitAppBarStyle) {
- base::scoped_nsobject<CollectionViewController> controller(
- [[CollectionViewController alloc]
- initWithStyle:CollectionViewControllerStyleAppBar]);
- EXPECT_NE(nil, controller.get().appBar);
+ CollectionViewController* controller = [[CollectionViewController alloc]
+ initWithStyle:CollectionViewControllerStyleAppBar];
+ EXPECT_NE(nil, controller.appBar);
}
TEST_F(CollectionViewControllerTest, CellForItemAtIndexPath) {
- base::scoped_nsobject<CollectionViewController> controller(
- [[CollectionViewController alloc]
- initWithStyle:CollectionViewControllerStyleDefault]);
+ CollectionViewController* controller = [[CollectionViewController alloc]
+ initWithStyle:CollectionViewControllerStyleDefault];
[controller loadModel];
[[controller collectionViewModel]
addSectionWithIdentifier:SectionIdentifierFoo];
- base::scoped_nsobject<MockCollectionViewItem> someItem(
- [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBar]);
+ MockCollectionViewItem* someItem =
+ [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBar];
[[controller collectionViewModel] addItem:someItem
toSectionWithIdentifier:SectionIdentifierFoo];
@@ -80,49 +79,47 @@ TEST_F(CollectionViewControllerTest, CellForItemAtIndexPath) {
}
TEST_F(CollectionViewControllerTest, ReconfigureCells) {
- base::scoped_nsobject<CollectionViewController> controller(
- [[CollectionViewController alloc]
- initWithStyle:CollectionViewControllerStyleDefault]);
+ CollectionViewController* controller = [[CollectionViewController alloc]
+ initWithStyle:CollectionViewControllerStyleDefault];
[controller loadModel];
CollectionViewModel* model = [controller collectionViewModel];
[model addSectionWithIdentifier:SectionIdentifierFoo];
- base::scoped_nsobject<MockCollectionViewItem> firstReconfiguredItem(
- [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBar]);
+ MockCollectionViewItem* firstReconfiguredItem =
+ [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBar];
[model addItem:firstReconfiguredItem
toSectionWithIdentifier:SectionIdentifierFoo];
- base::scoped_nsobject<MockCollectionViewItem> secondReconfiguredItem(
- [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz]);
+ MockCollectionViewItem* secondReconfiguredItem =
+ [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
[model addItem:secondReconfiguredItem
toSectionWithIdentifier:SectionIdentifierFoo];
- base::scoped_nsobject<MockCollectionViewItem> firstNonReconfiguredItem(
- [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz]);
+ MockCollectionViewItem* firstNonReconfiguredItem =
+ [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
[model addItem:firstNonReconfiguredItem
toSectionWithIdentifier:SectionIdentifierFoo];
- base::scoped_nsobject<MockCollectionViewItem> thirdReconfiguredItem(
- [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz]);
+ MockCollectionViewItem* thirdReconfiguredItem =
+ [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz];
[model addItem:thirdReconfiguredItem
toSectionWithIdentifier:SectionIdentifierFoo];
- base::scoped_nsobject<MockCollectionViewItem> secondNonReconfiguredItem(
- [[MockCollectionViewItem alloc] initWithType:ItemTypeFooBiz]);
+ 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.
- base::scoped_nsobject<MDCCollectionViewCell> dummyCell(
- [[MDCCollectionViewCell alloc] init]);
+ MDCCollectionViewCell* dummyCell = [[MDCCollectionViewCell alloc] init];
{
ScopedBlockSwizzler swizzler([UICollectionView class],
@selector(cellForItemAtIndexPath:),
^(id self) {
- return dummyCell.get();
+ return dummyCell;
});
NSArray* itemsToReconfigure = @[

Powered by Google App Engine
This is Rietveld 408576698