| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/memory/scoped_nsobject.h" | 7 #include "base/memory/scoped_nsobject.h" |
| 8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 [controller_ selectTestNodeInBrowser:folder_b_3_]; | 143 [controller_ selectTestNodeInBrowser:folder_b_3_]; |
| 144 const BookmarkNode* node = [controller_ selectedNode]; | 144 const BookmarkNode* node = [controller_ selectedNode]; |
| 145 EXPECT_EQ(node, folder_b_3_); | 145 EXPECT_EQ(node, folder_b_3_); |
| 146 [controller_ cancel:nil]; | 146 [controller_ cancel:nil]; |
| 147 } | 147 } |
| 148 | 148 |
| 149 TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) { | 149 TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) { |
| 150 EXPECT_EQ(2, folder_b_3_->child_count()); | 150 EXPECT_EQ(2, folder_b_3_->child_count()); |
| 151 [controller_ selectTestNodeInBrowser:folder_b_3_]; | 151 [controller_ selectTestNodeInBrowser:folder_b_3_]; |
| 152 NSString* expectedName = | 152 NSString* expectedName = |
| 153 l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); | 153 l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); |
| 154 [controller_ setDisplayName:expectedName]; | 154 [controller_ setDisplayName:expectedName]; |
| 155 [controller_ newFolder:nil]; | 155 [controller_ newFolder:nil]; |
| 156 NSArray* selectionPaths = [controller_ tableSelectionPaths]; | 156 NSArray* selectionPaths = [controller_ tableSelectionPaths]; |
| 157 EXPECT_EQ(1U, [selectionPaths count]); | 157 EXPECT_EQ(1U, [selectionPaths count]); |
| 158 NSIndexPath* selectionPath = [selectionPaths objectAtIndex:0]; | 158 NSIndexPath* selectionPath = [selectionPaths objectAtIndex:0]; |
| 159 EXPECT_EQ(4U, [selectionPath length]); | 159 EXPECT_EQ(4U, [selectionPath length]); |
| 160 BookmarkFolderInfo* newFolderInfo = [controller_ selectedFolder]; | 160 BookmarkFolderInfo* newFolderInfo = [controller_ selectedFolder]; |
| 161 EXPECT_TRUE(newFolderInfo); | 161 EXPECT_TRUE(newFolderInfo); |
| 162 NSString* newFolderName = [newFolderInfo folderName]; | 162 NSString* newFolderName = [newFolderInfo folderName]; |
| 163 EXPECT_NSEQ(expectedName, newFolderName); | 163 EXPECT_NSEQ(expectedName, newFolderName); |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 reinterpret_cast<const BookmarkNode*>(&children); | 252 reinterpret_cast<const BookmarkNode*>(&children); |
| 253 BookmarkFolderInfo* info = | 253 BookmarkFolderInfo* info = |
| 254 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" | 254 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" |
| 255 folderNode:fakeNode | 255 folderNode:fakeNode |
| 256 children:children]; | 256 children:children]; |
| 257 EXPECT_TRUE(info); | 257 EXPECT_TRUE(info); |
| 258 EXPECT_EQ([info folderName], @"name"); | 258 EXPECT_EQ([info folderName], @"name"); |
| 259 EXPECT_EQ([info children], children); | 259 EXPECT_EQ([info children], children); |
| 260 EXPECT_EQ([info folderNode], fakeNode); | 260 EXPECT_EQ([info folderNode], fakeNode); |
| 261 } | 261 } |
| OLD | NEW |