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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc

Issue 2257743003: Add signal strength indicator icon to WebBluetooth chooser on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth_signal_strength
Patch Set: added signal strength indicator icon to WebBluetooth chooser on Mac 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm ('K') | « chrome/browser/ui/views/chooser_content_view_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc
diff --git a/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc b/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc
index 0c679c635a787829ebfa26df64ef8823cabdb38f..9068e3e7bdbbbd9737484549c0480df0da82a88f 100644
--- a/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc
+++ b/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc
@@ -75,9 +75,12 @@ TEST_F(ChooserDialogViewTest, InitialState) {
}
TEST_F(ChooserDialogViewTest, SelectAndDeselectAnOption) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
// OK button is disabled since no option is selected.
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -108,9 +111,12 @@ TEST_F(ChooserDialogViewTest, SelectAndDeselectAnOption) {
}
TEST_F(ChooserDialogViewTest, SelectAnOptionAndThenSelectAnotherOption) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -131,9 +137,12 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndThenSelectAnotherOption) {
}
TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveAnotherOption) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -154,9 +163,12 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveAnotherOption) {
}
TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveTheSelectedOption) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -173,9 +185,12 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveTheSelectedOption) {
}
TEST_F(ChooserDialogViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -185,8 +200,9 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
EXPECT_TRUE(cancel_button_->enabled());
// Update option 1.
- mock_chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
- base::ASCIIToUTF16("d"));
+ mock_chooser_controller_->OptionUpdated(
+ base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
+ MockChooserController::kSignalStrengthLevel2Bar);
EXPECT_TRUE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -198,7 +214,8 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
TEST_F(ChooserDialogViewTest,
AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -235,9 +252,12 @@ TEST_F(ChooserDialogViewTest, AdapterOnAndOffAndOn) {
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -259,9 +279,12 @@ TEST_F(ChooserDialogViewTest, AdapterOnAndOffAndOn) {
}
TEST_F(ChooserDialogViewTest, DiscoveringAndNoOptionAddedAndIdle) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
table_view_->Select(1);
EXPECT_TRUE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
@@ -280,14 +303,18 @@ TEST_F(ChooserDialogViewTest, DiscoveringAndNoOptionAddedAndIdle) {
}
TEST_F(ChooserDialogViewTest, DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+ mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
+ MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
table_view_->Select(1);
mock_chooser_controller_->OnDiscoveryStateChanged(
content::BluetoothChooser::DiscoveryState::DISCOVERING);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("d"));
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar);
// OK button is disabled since no option is selected.
EXPECT_FALSE(ok_button_->enabled());
EXPECT_TRUE(cancel_button_->enabled());
« chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm ('K') | « chrome/browser/ui/views/chooser_content_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698