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

Unified Diff: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

Issue 2192953002: Chooser spinner should disappear as soon as one device shows up (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
index 61a403d8a68ca945195aacddd5eb2c454b24af68..dd3c442e8ac14ddda0545fc2fec6979c377e4ddd 100644
--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
@@ -421,7 +421,7 @@ TEST_F(ChooserDialogCocoaControllerTest, AdapterOnAndOffAndOn) {
ASSERT_TRUE(cancel_button_.enabled);
}
-TEST_F(ChooserDialogCocoaControllerTest, DiscoveringAndIdle) {
+TEST_F(ChooserDialogCocoaControllerTest, DiscoveringAndNoOptionAddedAndIdle) {
CreateChooserDialog();
// Add options
@@ -469,6 +469,50 @@ TEST_F(ChooserDialogCocoaControllerTest, DiscoveringAndIdle) {
ASSERT_TRUE(cancel_button_.enabled);
}
+TEST_F(ChooserDialogCocoaControllerTest,
+ DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
+ CreateChooserDialog();
+
+ chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+ chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
+ chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1]
+ byExtendingSelection:NO];
+
+ chooser_controller_->OnDiscoveryStateChanged(
+ content::BluetoothChooser::DiscoveryState::DISCOVERING);
+ chooser_controller_->OptionAdded(base::ASCIIToUTF16("d"));
+ EXPECT_FALSE(table_view_.hidden);
+ // |table_view_| should be enabled since there is an option.
+ ASSERT_TRUE(table_view_.enabled);
+ EXPECT_EQ(1, table_view_.numberOfRows);
+ // No option selected.
+ EXPECT_EQ(-1, table_view_.selectedRow);
+ EXPECT_TRUE(spinner_.hidden);
+ EXPECT_FALSE(status_.hidden);
+ EXPECT_TRUE(rescan_button_.hidden);
+ // OK button is disabled since no option is selected.
+ ASSERT_FALSE(connect_button_.enabled);
+ ASSERT_TRUE(cancel_button_.enabled);
+ [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
+ byExtendingSelection:NO];
+ EXPECT_EQ(0, table_view_.selectedRow);
+ ASSERT_TRUE(connect_button_.enabled);
+ ASSERT_TRUE(cancel_button_.enabled);
+
+ chooser_controller_->OnDiscoveryStateChanged(
+ content::BluetoothChooser::DiscoveryState::IDLE);
+ EXPECT_FALSE(table_view_.hidden);
+ ASSERT_TRUE(table_view_.enabled);
+ EXPECT_EQ(1, table_view_.numberOfRows);
+ EXPECT_EQ(0, table_view_.selectedRow);
+ EXPECT_TRUE(spinner_.hidden);
+ EXPECT_TRUE(status_.hidden);
+ EXPECT_FALSE(rescan_button_.hidden);
+ ASSERT_TRUE(connect_button_.enabled);
+ ASSERT_TRUE(cancel_button_.enabled);
+}
+
TEST_F(ChooserDialogCocoaControllerTest, PressRescanButton) {
CreateChooserDialog();
« no previous file with comments | « chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm ('k') | chrome/browser/ui/views/chooser_content_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698