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

Side by Side Diff: chrome/browser/cocoa/tab_view_picker_table_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 #import "chrome/browser/cocoa/tab_view_picker_table.h" 7 #import "chrome/browser/cocoa/tab_view_picker_table.h"
8 8
9 #import "base/cocoa_protocols_mac.h" 9 #import "base/cocoa_protocols_mac.h"
10 #include "base/scoped_nsobject.h" 10 #include "base/scoped_nsobject.h"
11 #import "chrome/browser/cocoa/cocoa_test_helper.h" 11 #import "chrome/browser/cocoa/cocoa_test_helper.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #import "testing/gtest_mac.h"
13 #include "testing/platform_test.h" 14 #include "testing/platform_test.h"
14 15
15 @interface TabViewPickerTableTestPing : NSObject <NSTabViewDelegate> { 16 @interface TabViewPickerTableTestPing : NSObject <NSTabViewDelegate> {
16 @public 17 @public
17 BOOL didSelectItemCalled_; 18 BOOL didSelectItemCalled_;
18 } 19 }
19 @end 20 @end
20 21
21 @implementation TabViewPickerTableTestPing 22 @implementation TabViewPickerTableTestPing
22 - (void) tabView:(NSTabView*)tabView 23 - (void) tabView:(NSTabView*)tabView
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 EXPECT_TRUE(ping_.get()->didSelectItemCalled_); 94 EXPECT_TRUE(ping_.get()->didSelectItemCalled_);
94 } 95 }
95 96
96 TEST_F(TabViewPickerTableTest, RowsCorrect) { 97 TEST_F(TabViewPickerTableTest, RowsCorrect) {
97 EXPECT_EQ(2, [view_ numberOfRows]); 98 EXPECT_EQ(2, [view_ numberOfRows]);
98 EXPECT_EQ(2, 99 EXPECT_EQ(2,
99 [[view_ dataSource] outlineView:view_ numberOfChildrenOfItem:nil]); 100 [[view_ dataSource] outlineView:view_ numberOfChildrenOfItem:nil]);
100 101
101 id item; 102 id item;
102 item = [[view_ dataSource] outlineView:view_ child:0 ofItem:nil]; 103 item = [[view_ dataSource] outlineView:view_ child:0 ofItem:nil];
103 EXPECT_TRUE([@"label 1" isEqualToString:[[view_ dataSource] 104 EXPECT_NSEQ(@"label 1",
104 outlineView:view_ 105 [[view_ dataSource] outlineView:view_
105 objectValueForTableColumn:nil // ignored 106 objectValueForTableColumn:nil // ignored
106 byItem:item]]); 107 byItem:item]);
107 item = [[view_ dataSource] outlineView:view_ child:1 ofItem:nil]; 108 item = [[view_ dataSource] outlineView:view_ child:1 ofItem:nil];
108 EXPECT_TRUE([@"label 2" isEqualToString:[[view_ dataSource] 109 EXPECT_NSEQ(@"label 2",
109 outlineView:view_ 110 [[view_ dataSource] outlineView:view_
110 objectValueForTableColumn:nil // ignored 111 objectValueForTableColumn:nil // ignored
111 byItem:item]]); 112 byItem:item]);
112 } 113 }
113 114
114 TEST_F(TabViewPickerTableTest, TestListUpdatesTabView) { 115 TEST_F(TabViewPickerTableTest, TestListUpdatesTabView) {
115 [view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0] 116 [view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
116 byExtendingSelection:NO]; 117 byExtendingSelection:NO];
117 EXPECT_EQ(0, [view_ selectedRow]); // sanity 118 EXPECT_EQ(0, [view_ selectedRow]); // sanity
118 EXPECT_EQ(0, [tabView_ indexOfTabViewItem:[tabView_ selectedTabViewItem]]); 119 EXPECT_EQ(0, [tabView_ indexOfTabViewItem:[tabView_ selectedTabViewItem]]);
119 } 120 }
120 121
121 TEST_F(TabViewPickerTableTest, TestWithHeadingNotEmpty) { 122 TEST_F(TabViewPickerTableTest, TestWithHeadingNotEmpty) {
122 [view_ setHeading:@"disregard this"]; 123 [view_ setHeading:@"disregard this"];
123 124
124 EXPECT_EQ(2, [view_ selectedRow]); 125 EXPECT_EQ(2, [view_ selectedRow]);
125 126
126 [tabView_ selectTabViewItemAtIndex:0]; 127 [tabView_ selectTabViewItemAtIndex:0];
127 EXPECT_EQ(1, [view_ selectedRow]); 128 EXPECT_EQ(1, [view_ selectedRow]);
128 [tabView_ selectTabViewItemAtIndex:1]; 129 [tabView_ selectTabViewItemAtIndex:1];
129 EXPECT_EQ(2, [view_ selectedRow]); 130 EXPECT_EQ(2, [view_ selectedRow]);
130 131
131 [view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1] 132 [view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1]
132 byExtendingSelection:NO]; 133 byExtendingSelection:NO];
133 EXPECT_EQ(1, [view_ selectedRow]); // sanity 134 EXPECT_EQ(1, [view_ selectedRow]); // sanity
134 EXPECT_EQ(0, [tabView_ indexOfTabViewItem:[tabView_ selectedTabViewItem]]); 135 EXPECT_EQ(0, [tabView_ indexOfTabViewItem:[tabView_ selectedTabViewItem]]);
135 } 136 }
136 137
137 } // namespace 138 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698