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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/chooser_content_view_unittest.cc

Issue 2304213002: Show device connection and paired status in chooser on Mac (Closed)
Patch Set: use vector icons Created 4 years, 3 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/cocoa/website_settings/chooser_bubble_ui_cocoa.mm ('k') | chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc » ('j') | content/browser/bluetooth/bluetooth_device_chooser_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chooser_content_view_unittest.cc
diff --git a/chrome/browser/ui/views/chooser_content_view_unittest.cc b/chrome/browser/ui/views/chooser_content_view_unittest.cc
index 14cc52980285866a680dfad979b7fb7e75ade684..7d9ec83b5b70a3691587827f189ae479aa7d9d8a 100644
--- a/chrome/browser/ui/views/chooser_content_view_unittest.cc
+++ b/chrome/browser/ui/views/chooser_content_view_unittest.cc
@@ -94,8 +94,10 @@ TEST_F(ChooserContentViewTest, InitialState) {
TEST_F(ChooserContentViewTest, AddOption) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(0);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
EXPECT_EQ(1, table_view_->RowCount());
EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
// |table_view_| should be enabled since there is an option.
@@ -105,7 +107,8 @@ TEST_F(ChooserContentViewTest, AddOption) {
EXPECT_EQ(-1, table_view_->FirstSelectedRow());
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
EXPECT_EQ(2, table_view_->RowCount());
EXPECT_EQ(base::ASCIIToUTF16("b"), table_model_->GetText(1, 0));
EXPECT_TRUE(table_view_->enabled());
@@ -113,7 +116,8 @@ TEST_F(ChooserContentViewTest, AddOption) {
EXPECT_EQ(-1, table_view_->FirstSelectedRow());
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
EXPECT_EQ(3, table_view_->RowCount());
EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(2, 0));
EXPECT_TRUE(table_view_->enabled());
@@ -125,12 +129,16 @@ TEST_F(ChooserContentViewTest, RemoveOption) {
// Called from TableView::OnItemsRemoved().
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
EXPECT_EQ(2, table_view_->RowCount());
@@ -172,16 +180,21 @@ TEST_F(ChooserContentViewTest, RemoveOption) {
TEST_F(ChooserContentViewTest, UpdateOption) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(0);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionUpdated(
base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
- MockChooserController::kSignalStrengthLevel2Bar);
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
EXPECT_EQ(3, table_view_->RowCount());
EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
EXPECT_EQ(base::ASCIIToUTF16("d"), table_model_->GetText(1, 0));
@@ -195,19 +208,24 @@ TEST_F(ChooserContentViewTest, AddAndRemoveOption) {
// Called from TableView::OnItemsRemoved().
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
EXPECT_EQ(1, table_view_->RowCount());
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
EXPECT_EQ(2, table_view_->RowCount());
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
EXPECT_EQ(1, table_view_->RowCount());
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
EXPECT_EQ(2, table_view_->RowCount());
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar);
+ base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
EXPECT_EQ(3, table_view_->RowCount());
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
EXPECT_EQ(2, table_view_->RowCount());
@@ -219,16 +237,21 @@ TEST_F(ChooserContentViewTest, UpdateAndRemoveTheUpdatedOption) {
// Called from TableView::OnItemsRemoved().
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(1);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionUpdated(
base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
- MockChooserController::kSignalStrengthLevel2Bar);
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
EXPECT_EQ(2, table_view_->RowCount());
@@ -242,12 +265,16 @@ TEST_F(ChooserContentViewTest, UpdateAndRemoveTheUpdatedOption) {
TEST_F(ChooserContentViewTest, SelectAndDeselectAnOption) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(4);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
// Select option 0.
table_view_->Select(0);
@@ -273,12 +300,16 @@ TEST_F(ChooserContentViewTest, SelectAndDeselectAnOption) {
TEST_F(ChooserContentViewTest, SelectAnOptionAndThenSelectAnotherOption) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
// Select option 0.
table_view_->Select(0);
@@ -301,12 +332,16 @@ TEST_F(ChooserContentViewTest, SelectAnOptionAndRemoveAnotherOption) {
// TableView::OnItemsRemoved().
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
// Select option 1.
table_view_->Select(1);
@@ -331,12 +366,16 @@ TEST_F(ChooserContentViewTest, SelectAnOptionAndRemoveAnotherOption) {
TEST_F(ChooserContentViewTest, SelectAnOptionAndRemoveTheSelectedOption) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(2);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
// Select option 1.
table_view_->Select(1);
@@ -354,12 +393,16 @@ TEST_F(ChooserContentViewTest, SelectAnOptionAndRemoveTheSelectedOption) {
TEST_F(ChooserContentViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(1);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
// Select option 1.
table_view_->Select(1);
@@ -367,7 +410,8 @@ TEST_F(ChooserContentViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
// Update option 1.
mock_chooser_controller_->OptionUpdated(
base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
- MockChooserController::kSignalStrengthLevel2Bar);
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
EXPECT_EQ(1, table_view_->SelectedRowCount());
EXPECT_EQ(1, table_view_->FirstSelectedRow());
@@ -380,8 +424,10 @@ TEST_F(ChooserContentViewTest,
AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(2);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
// Select option 0.
table_view_->Select(0);
@@ -425,12 +471,17 @@ TEST_F(ChooserContentViewTest, AdapterOnAndOffAndOn) {
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN),
discovery_state_->text());
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
+
table_view_->Select(1);
mock_chooser_controller_->OnAdapterPresenceChanged(
@@ -471,12 +522,16 @@ TEST_F(ChooserContentViewTest, AdapterOnAndOffAndOn) {
TEST_F(ChooserContentViewTest, DiscoveringAndNoOptionAddedAndIdle) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(2);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
table_view_->Select(1);
mock_chooser_controller_->OnDiscoveryStateChanged(
@@ -512,18 +567,23 @@ TEST_F(ChooserContentViewTest, DiscoveringAndNoOptionAddedAndIdle) {
TEST_F(ChooserContentViewTest, DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
- mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
- MockChooserController::kNoImage);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+ base::ASCIIToUTF16("a"),
+ MockChooserController::kNoSignalStrengthLevelImage,
+ MockChooserController::kConnected, MockChooserController::kPaired);
+ mock_chooser_controller_->OptionAdded(
+ base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
table_view_->Select(1);
mock_chooser_controller_->OnDiscoveryStateChanged(
content::BluetoothChooser::DiscoveryState::DISCOVERING);
mock_chooser_controller_->OptionAdded(
- base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar);
+ base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar,
+ MockChooserController::kNotConnected, MockChooserController::kNotPaired);
EXPECT_TRUE(table_view_->visible());
EXPECT_EQ(1, table_view_->RowCount());
EXPECT_EQ(base::ASCIIToUTF16("d"), table_model_->GetText(0, 0));
« chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm ('K') | « chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm ('k') | chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc » ('j') | content/browser/bluetooth/bluetooth_device_chooser_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698