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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

Issue 2242943002: Update device name in chooser when device changes name (desktops) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address more comments Created 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h" 5 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/strings/sys_string_conversions.h"
12 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/chooser_controller/mock_chooser_controller.h" 14 #include "chrome/browser/chooser_controller/mock_chooser_controller.h"
14 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h" 15 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
15 #import "chrome/browser/ui/cocoa/cocoa_profile_test.h" 16 #import "chrome/browser/ui/cocoa/cocoa_profile_test.h"
16 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" 17 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
17 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h" 18 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
18 #include "chrome/browser/ui/cocoa/spinner_view.h" 19 #include "chrome/browser/ui/cocoa/spinner_view.h"
19 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
20 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
21 #include "testing/gtest_mac.h" 22 #include "testing/gtest_mac.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("a")); 154 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("a"));
154 // There is no option shown now. But since "No devices found." 155 // There is no option shown now. But since "No devices found."
155 // needs to be displayed on the |table_view_|, the number of rows is 1. 156 // needs to be displayed on the |table_view_|, the number of rows is 1.
156 EXPECT_EQ(1, table_view_.numberOfRows); 157 EXPECT_EQ(1, table_view_.numberOfRows);
157 EXPECT_EQ(1, table_view_.numberOfColumns); 158 EXPECT_EQ(1, table_view_.numberOfColumns);
158 // |table_view_| should be disabled since all options are removed. 159 // |table_view_| should be disabled since all options are removed.
159 ASSERT_FALSE(table_view_.enabled); 160 ASSERT_FALSE(table_view_.enabled);
160 EXPECT_EQ(-1, table_view_.selectedRow); 161 EXPECT_EQ(-1, table_view_.selectedRow);
161 } 162 }
162 163
164 TEST_F(ChooserDialogCocoaControllerTest, UpdateOption) {
165 CreateChooserDialog();
166
167 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
168 chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
169 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
170
171 chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
172 base::ASCIIToUTF16("d"));
173
174 EXPECT_EQ(3, table_view_.numberOfRows);
175 EXPECT_EQ(1, table_view_.numberOfColumns);
176 ASSERT_TRUE(table_view_.enabled);
177 EXPECT_EQ(-1, table_view_.selectedRow);
178
179 NSCell* cell = [table_view_ preparedCellAtColumn:0 row:1];
180 EXPECT_EQ(base::ASCIIToUTF16("d"),
181 base::SysNSStringToUTF16([cell stringValue]));
182 }
183
163 TEST_F(ChooserDialogCocoaControllerTest, AddAndRemoveOption) { 184 TEST_F(ChooserDialogCocoaControllerTest, AddAndRemoveOption) {
164 CreateChooserDialog(); 185 CreateChooserDialog();
165 186
166 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a")); 187 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
167 EXPECT_EQ(1, table_view_.numberOfRows); 188 EXPECT_EQ(1, table_view_.numberOfRows);
168 chooser_controller_->OptionAdded(base::ASCIIToUTF16("b")); 189 chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
169 EXPECT_EQ(2, table_view_.numberOfRows); 190 EXPECT_EQ(2, table_view_.numberOfRows);
170 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b")); 191 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
171 EXPECT_EQ(1, table_view_.numberOfRows); 192 EXPECT_EQ(1, table_view_.numberOfRows);
172 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c")); 193 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
173 EXPECT_EQ(2, table_view_.numberOfRows); 194 EXPECT_EQ(2, table_view_.numberOfRows);
174 chooser_controller_->OptionAdded(base::ASCIIToUTF16("d")); 195 chooser_controller_->OptionAdded(base::ASCIIToUTF16("d"));
175 EXPECT_EQ(3, table_view_.numberOfRows); 196 EXPECT_EQ(3, table_view_.numberOfRows);
176 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d")); 197 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
177 EXPECT_EQ(2, table_view_.numberOfRows); 198 EXPECT_EQ(2, table_view_.numberOfRows);
178 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c")); 199 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c"));
179 EXPECT_EQ(1, table_view_.numberOfRows); 200 EXPECT_EQ(1, table_view_.numberOfRows);
180 } 201 }
181 202
203 TEST_F(ChooserDialogCocoaControllerTest, UpdateAndRemoveTheUpdatedOption) {
204 CreateChooserDialog();
205
206 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
207 chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
208 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
209
210 chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
211 base::ASCIIToUTF16("d"));
212
213 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
214
215 EXPECT_EQ(2, table_view_.numberOfRows);
216 EXPECT_EQ(1, table_view_.numberOfColumns);
217 ASSERT_TRUE(table_view_.enabled);
218 EXPECT_EQ(-1, table_view_.selectedRow);
219
220 NSCell* cell_a = [table_view_ preparedCellAtColumn:0 row:0];
221 EXPECT_EQ(base::ASCIIToUTF16("a"),
222 base::SysNSStringToUTF16([cell_a stringValue]));
223
224 NSCell* cell_c = [table_view_ preparedCellAtColumn:0 row:1];
225 EXPECT_EQ(base::ASCIIToUTF16("c"),
226 base::SysNSStringToUTF16([cell_c stringValue]));
227 }
228
182 TEST_F(ChooserDialogCocoaControllerTest, SelectAndDeselectAnOption) { 229 TEST_F(ChooserDialogCocoaControllerTest, SelectAndDeselectAnOption) {
183 CreateChooserDialog(); 230 CreateChooserDialog();
184 231
185 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a")); 232 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
186 chooser_controller_->OptionAdded(base::ASCIIToUTF16("b")); 233 chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
187 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c")); 234 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
188 235
189 // Select option 0. 236 // Select option 0.
190 [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0] 237 [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
191 byExtendingSelection:NO]; 238 byExtendingSelection:NO];
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // Remove option 1 329 // Remove option 1
283 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b")); 330 chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
284 EXPECT_EQ(2, table_view_.numberOfRows); 331 EXPECT_EQ(2, table_view_.numberOfRows);
285 // No option selected. 332 // No option selected.
286 EXPECT_EQ(-1, table_view_.selectedRow); 333 EXPECT_EQ(-1, table_view_.selectedRow);
287 // Since no option selected, the "Connect" button should be disabled. 334 // Since no option selected, the "Connect" button should be disabled.
288 ASSERT_FALSE(connect_button_.enabled); 335 ASSERT_FALSE(connect_button_.enabled);
289 } 336 }
290 337
291 TEST_F(ChooserDialogCocoaControllerTest, 338 TEST_F(ChooserDialogCocoaControllerTest,
339 SelectAnOptionAndUpdateTheSelectedOption) {
340 CreateChooserDialog();
341
342 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
343 chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
344 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
345
346 // Select option 1.
347 [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1]
348 byExtendingSelection:NO];
349
350 // Update option 1.
351 chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
352 base::ASCIIToUTF16("d"));
353
354 EXPECT_EQ(1, table_view_.selectedRow);
355 ASSERT_TRUE(connect_button_.enabled);
356
357 NSCell* cell = [table_view_ preparedCellAtColumn:0 row:1];
358 EXPECT_EQ(base::ASCIIToUTF16("d"),
359 base::SysNSStringToUTF16([cell stringValue]));
360 }
361
362 TEST_F(ChooserDialogCocoaControllerTest,
292 AddAnOptionAndSelectItAndRemoveTheSelectedOption) { 363 AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
293 CreateChooserDialog(); 364 CreateChooserDialog();
294 365
295 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a")); 366 chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
296 367
297 // Select option 0. 368 // Select option 0.
298 [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0] 369 [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
299 byExtendingSelection:NO]; 370 byExtendingSelection:NO];
300 EXPECT_EQ(1, table_view_.numberOfRows); 371 EXPECT_EQ(1, table_view_.numberOfRows);
301 EXPECT_EQ(0, table_view_.selectedRow); 372 EXPECT_EQ(0, table_view_.selectedRow);
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c")); 599 chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
529 600
530 // Select option 0 and press "Get help" button. 601 // Select option 0 and press "Get help" button.
531 [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0] 602 [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
532 byExtendingSelection:NO]; 603 byExtendingSelection:NO];
533 EXPECT_CALL(*chooser_controller_, Select(testing::_)).Times(0); 604 EXPECT_CALL(*chooser_controller_, Select(testing::_)).Times(0);
534 EXPECT_CALL(*chooser_controller_, Cancel()).Times(0); 605 EXPECT_CALL(*chooser_controller_, Cancel()).Times(0);
535 EXPECT_CALL(*chooser_controller_, OpenHelpCenterUrl()).Times(1); 606 EXPECT_CALL(*chooser_controller_, OpenHelpCenterUrl()).Times(1);
536 [help_button_ performClick:chooser_dialog_controller_]; 607 [help_button_ performClick:chooser_dialog_controller_];
537 } 608 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm ('k') | chrome/browser/ui/views/chooser_content_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698