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

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

Issue 3095004: [Mac] Use the new {EXPECT,ASSERT}_NS{EQ,NE} macros where possible. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix compile Created 10 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util_mac.h" 7 #include "app/l10n_util_mac.h"
8 #include "base/scoped_nsobject.h" 8 #include "base/scoped_nsobject.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/sys_string_conversions.h"
10 #import "chrome/browser/cocoa/bookmark_editor_controller.h" 10 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
11 #include "chrome/browser/cocoa/browser_test_helper.h" 11 #include "chrome/browser/cocoa/browser_test_helper.h"
12 #import "chrome/browser/cocoa/cocoa_test_helper.h" 12 #import "chrome/browser/cocoa/cocoa_test_helper.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #import "testing/gtest_mac.h"
15 #include "testing/platform_test.h" 16 #include "testing/platform_test.h"
16 17
17 class BookmarkEditorBaseControllerTest : public CocoaTest { 18 class BookmarkEditorBaseControllerTest : public CocoaTest {
18 public: 19 public:
19 BrowserTestHelper browser_helper_; 20 BrowserTestHelper browser_helper_;
20 BookmarkEditorBaseController* controller_; // weak 21 BookmarkEditorBaseController* controller_; // weak
21 const BookmarkNode* group_a_; 22 const BookmarkNode* group_a_;
22 const BookmarkNode* group_b_; 23 const BookmarkNode* group_b_;
23 const BookmarkNode* group_b_0_; 24 const BookmarkNode* group_b_0_;
24 const BookmarkNode* group_b_3_; 25 const BookmarkNode* group_b_3_;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); 148 l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME);
148 [controller_ setDisplayName:expectedName]; 149 [controller_ setDisplayName:expectedName];
149 [controller_ newFolder:nil]; 150 [controller_ newFolder:nil];
150 NSArray* selectionPaths = [controller_ tableSelectionPaths]; 151 NSArray* selectionPaths = [controller_ tableSelectionPaths];
151 EXPECT_EQ(1U, [selectionPaths count]); 152 EXPECT_EQ(1U, [selectionPaths count]);
152 NSIndexPath* selectionPath = [selectionPaths objectAtIndex:0]; 153 NSIndexPath* selectionPath = [selectionPaths objectAtIndex:0];
153 EXPECT_EQ(4U, [selectionPath length]); 154 EXPECT_EQ(4U, [selectionPath length]);
154 BookmarkFolderInfo* newFolderInfo = [controller_ selectedFolder]; 155 BookmarkFolderInfo* newFolderInfo = [controller_ selectedFolder];
155 EXPECT_TRUE(newFolderInfo); 156 EXPECT_TRUE(newFolderInfo);
156 NSString* newFolderName = [newFolderInfo folderName]; 157 NSString* newFolderName = [newFolderInfo folderName];
157 EXPECT_TRUE([newFolderName isEqualToString:expectedName]); 158 EXPECT_NSEQ(expectedName, newFolderName);
158 [controller_ createNewFolders]; 159 [controller_ createNewFolders];
159 // Verify that the tab folder was added to the new folder. 160 // Verify that the tab folder was added to the new folder.
160 EXPECT_EQ(3, group_b_3_->GetChildCount()); 161 EXPECT_EQ(3, group_b_3_->GetChildCount());
161 [controller_ cancel:nil]; 162 [controller_ cancel:nil];
162 } 163 }
163 164
164 TEST_F(BookmarkEditorBaseControllerTest, CreateTwoFolders) { 165 TEST_F(BookmarkEditorBaseControllerTest, CreateTwoFolders) {
165 BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel(); 166 BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
166 const BookmarkNode* bar = model->GetBookmarkBarNode(); 167 const BookmarkNode* bar = model->GetBookmarkBarNode();
167 // Create 2 folders which are children of the bar. 168 // Create 2 folders which are children of the bar.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 reinterpret_cast<const BookmarkNode*>(&children); 223 reinterpret_cast<const BookmarkNode*>(&children);
223 BookmarkFolderInfo* info = 224 BookmarkFolderInfo* info =
224 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name" 225 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
225 folderNode:fakeNode 226 folderNode:fakeNode
226 children:children]; 227 children:children];
227 EXPECT_TRUE(info); 228 EXPECT_TRUE(info);
228 EXPECT_EQ([info folderName], @"name"); 229 EXPECT_EQ([info folderName], @"name");
229 EXPECT_EQ([info children], children); 230 EXPECT_EQ([info children], children);
230 EXPECT_EQ([info folderNode], fakeNode); 231 EXPECT_EQ([info folderNode], fakeNode);
231 } 232 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698