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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm

Issue 1105413002: Avoid conversion of index to BookmarkNode pointer unnacessarily. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes as per review comments. Created 5 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 [controller_ createNewFolders]; 198 [controller_ createNewFolders];
199 [controller_ cancel:nil]; 199 [controller_ cancel:nil];
200 } 200 }
201 201
202 TEST_F(BookmarkEditorBaseControllerTest, SelectedFolderDeleted) { 202 TEST_F(BookmarkEditorBaseControllerTest, SelectedFolderDeleted) {
203 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); 203 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
204 [controller_ selectTestNodeInBrowser:folder_b_3_]; 204 [controller_ selectTestNodeInBrowser:folder_b_3_];
205 EXPECT_EQ(folder_b_3_, [controller_ selectedNode]); 205 EXPECT_EQ(folder_b_3_, [controller_ selectedNode]);
206 206
207 // Delete the selected node, and verify it's no longer selected: 207 // Delete the selected node, and verify it's no longer selected:
208 model->Remove(folder_b_, 3); 208 model->Remove(folder_b_->GetChild(3));
209 EXPECT_NE(folder_b_3_, [controller_ selectedNode]); 209 EXPECT_NE(folder_b_3_, [controller_ selectedNode]);
210 210
211 [controller_ cancel:nil]; 211 [controller_ cancel:nil];
212 } 212 }
213 213
214 TEST_F(BookmarkEditorBaseControllerTest, SelectedFoldersParentDeleted) { 214 TEST_F(BookmarkEditorBaseControllerTest, SelectedFoldersParentDeleted) {
215 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); 215 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
216 const BookmarkNode* root = model->bookmark_bar_node(); 216 const BookmarkNode* root = model->bookmark_bar_node();
217 [controller_ selectTestNodeInBrowser:folder_b_3_]; 217 [controller_ selectTestNodeInBrowser:folder_b_3_];
218 EXPECT_EQ(folder_b_3_, [controller_ selectedNode]); 218 EXPECT_EQ(folder_b_3_, [controller_ selectedNode]);
219 219
220 // Delete the selected node's parent, and verify it's no longer selected: 220 // Delete the selected node's parent, and verify it's no longer selected:
221 model->Remove(root, 1); 221 model->Remove(root->GetChild(1));
222 EXPECT_NE(folder_b_3_, [controller_ selectedNode]); 222 EXPECT_NE(folder_b_3_, [controller_ selectedNode]);
223 223
224 [controller_ cancel:nil]; 224 [controller_ cancel:nil];
225 } 225 }
226 226
227 TEST_F(BookmarkEditorBaseControllerTest, FolderAdded) { 227 TEST_F(BookmarkEditorBaseControllerTest, FolderAdded) {
228 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); 228 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
229 const BookmarkNode* root = model->bookmark_bar_node(); 229 const BookmarkNode* root = model->bookmark_bar_node();
230 230
231 // Add a folder node to the model, and verify it can be selected in the tree: 231 // Add a folder node to the model, and verify it can be selected in the tree:
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 reinterpret_cast<const BookmarkNode*>(&children); 270 reinterpret_cast<const BookmarkNode*>(&children);
271 BookmarkFolderInfo* info = 271 BookmarkFolderInfo* info =
272 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" 272 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
273 folderNode:fakeNode 273 folderNode:fakeNode
274 children:children]; 274 children:children];
275 EXPECT_TRUE(info); 275 EXPECT_TRUE(info);
276 EXPECT_EQ([info folderName], @"name"); 276 EXPECT_EQ([info folderName], @"name");
277 EXPECT_EQ([info children], children); 277 EXPECT_EQ([info children], children);
278 EXPECT_EQ([info folderNode], fakeNode); 278 EXPECT_EQ([info folderNode], fakeNode);
279 } 279 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698