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

Unified Diff: ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller_unittest.mm

Issue 2746473003: [ObjC ARC] Converts ios/chrome/browser/ui/bookmarks:bookmarks to ARC. (Closed)
Patch Set: fix test Created 3 years, 9 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/bookmarks/bookmark_home_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller_unittest.mm b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller_unittest.mm
index 1125bb9861ad064e65ec0fef79064bea178a2a28..c26bb574e7d675318d408ccdabd6be0f90d88e69 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller_unittest.mm
@@ -40,41 +40,43 @@ namespace {
using BookmarkHomeViewControllerTest = BookmarkIOSUnitTest;
TEST_F(BookmarkHomeViewControllerTest, DeleteNodesUpdatesEditNodes) {
- const BookmarkNode* mobileNode = _bookmarkModel->mobile_node();
- const BookmarkNode* f1 = AddFolder(mobileNode, @"f1");
- const BookmarkNode* a = AddBookmark(mobileNode, @"a");
- const BookmarkNode* b = AddBookmark(mobileNode, @"b");
- const BookmarkNode* f2 = AddFolder(mobileNode, @"f2");
-
- const BookmarkNode* f1a = AddBookmark(f1, @"f1a");
- AddBookmark(f1, @"f1b");
- AddBookmark(f1, @"f1c");
- const BookmarkNode* f2a = AddBookmark(f2, @"f2a");
- AddBookmark(f2, @"f2b");
-
- std::set<const BookmarkNode*> toDelete;
- toDelete.insert(b);
- toDelete.insert(f1a);
- toDelete.insert(f1);
- toDelete.insert(f2a);
-
- base::scoped_nsobject<MockBookmarkHomeHandsetViewController> controller(
- [[MockBookmarkHomeHandsetViewController alloc]
- initWithLoader:nil
- browserState:chrome_browser_state_.get()]);
-
- [controller resetEditNodes];
- [controller insertEditNode:f1 atIndexPath:nil];
- [controller insertEditNode:a atIndexPath:nil];
- [controller insertEditNode:f2 atIndexPath:nil];
-
- bookmark_utils_ios::DeleteBookmarks(toDelete, _bookmarkModel);
-
- // After the deletion, only 'a' and 'f2' should be left.
- std::set<const BookmarkNode*> editingNodes = [controller editNodes];
- EXPECT_EQ(editingNodes.size(), 2u);
- EXPECT_TRUE(editingNodes.find(a) != editingNodes.end());
- EXPECT_TRUE(editingNodes.find(f2) != editingNodes.end());
+ @autoreleasepool {
+ const BookmarkNode* mobileNode = _bookmarkModel->mobile_node();
+ const BookmarkNode* f1 = AddFolder(mobileNode, @"f1");
+ const BookmarkNode* a = AddBookmark(mobileNode, @"a");
+ const BookmarkNode* b = AddBookmark(mobileNode, @"b");
+ const BookmarkNode* f2 = AddFolder(mobileNode, @"f2");
+
+ const BookmarkNode* f1a = AddBookmark(f1, @"f1a");
+ AddBookmark(f1, @"f1b");
+ AddBookmark(f1, @"f1c");
+ const BookmarkNode* f2a = AddBookmark(f2, @"f2a");
+ AddBookmark(f2, @"f2b");
+
+ std::set<const BookmarkNode*> toDelete;
+ toDelete.insert(b);
+ toDelete.insert(f1a);
+ toDelete.insert(f1);
+ toDelete.insert(f2a);
+
+ base::scoped_nsobject<MockBookmarkHomeHandsetViewController> controller(
+ [[MockBookmarkHomeHandsetViewController alloc]
+ initWithLoader:nil
+ browserState:chrome_browser_state_.get()]);
+
+ [controller resetEditNodes];
+ [controller insertEditNode:f1 atIndexPath:nil];
+ [controller insertEditNode:a atIndexPath:nil];
+ [controller insertEditNode:f2 atIndexPath:nil];
+
+ bookmark_utils_ios::DeleteBookmarks(toDelete, _bookmarkModel);
+
+ // After the deletion, only 'a' and 'f2' should be left.
+ std::set<const BookmarkNode*> editingNodes = [controller editNodes];
+ EXPECT_EQ(editingNodes.size(), 2u);
+ EXPECT_TRUE(editingNodes.find(a) != editingNodes.end());
+ EXPECT_TRUE(editingNodes.find(f2) != editingNodes.end());
+ }
}
} // anonymous namespace

Powered by Google App Engine
This is Rietveld 408576698