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 a4ccce77ec73ae1cf18796fdae493a8d490244eb..683a74413f45cc3848727bb718a28a1a18961db9 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 |
@@ -17,7 +17,6 @@ |
#import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h" |
#include "chrome/browser/ui/cocoa/spinner_view.h" |
#include "chrome/grit/generated_resources.h" |
-#include "skia/ext/skia_utils_mac.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "testing/gtest_mac.h" |
@@ -36,10 +35,6 @@ |
const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR, |
IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR, |
IDR_SIGNAL_4_BAR}; |
-const int kSignalStrengthLevelImageSelectedIds[5] = { |
- IDR_SIGNAL_0_BAR_SELECTED, IDR_SIGNAL_1_BAR_SELECTED, |
- IDR_SIGNAL_2_BAR_SELECTED, IDR_SIGNAL_3_BAR_SELECTED, |
- IDR_SIGNAL_4_BAR_SELECTED}; |
} // namespace |
@@ -94,27 +89,24 @@ |
} |
void ExpectSignalStrengthLevelImageIs(int row, |
- int expected_signal_strength_level, |
- int expected_color) { |
+ int expected_signal_strength_level) { |
NSImageView* image_view = |
[chooser_content_view_ tableRowViewImage:static_cast<NSInteger>(row)]; |
ASSERT_TRUE(image_view); |
- int image_id = |
- expected_color == MockChooserController::kImageColorUnselected |
- ? kSignalStrengthLevelImageIds[expected_signal_strength_level] |
- : kSignalStrengthLevelImageSelectedIds |
- [expected_signal_strength_level]; |
- EXPECT_NSEQ(rb_.GetNativeImageNamed(image_id).ToNSImage(), |
- [image_view image]); |
+ EXPECT_NSEQ( |
+ rb_.GetNativeImageNamed( |
+ kSignalStrengthLevelImageIds[expected_signal_strength_level]) |
+ .ToNSImage(), |
+ [image_view image]); |
} |
- void ExpectRowImageIsConnectedImage(int row, SkColor expected_color) { |
+ void ExpectRowImageIsConnectedImage(int row) { |
NSImageView* image_view = |
[chooser_content_view_ tableRowViewImage:static_cast<NSInteger>(row)]; |
ASSERT_TRUE(image_view); |
EXPECT_TRUE(gfx::test::AreImagesEqual( |
gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BLUETOOTH_CONNECTED, |
- expected_color)), |
+ gfx::kChromeIconGrey)), |
gfx::Image([[image_view image] copy]))); |
} |
@@ -122,12 +114,6 @@ |
EXPECT_NSEQ(expected_text, |
[[chooser_content_view_ |
tableRowViewText:static_cast<NSInteger>(row)] stringValue]); |
- } |
- |
- void ExpectRowTextColorIs(int row, NSColor* expected_color) { |
- EXPECT_NSEQ(expected_color, |
- [[chooser_content_view_ |
- tableRowViewText:static_cast<NSInteger>(row)] textColor]); |
} |
bool IsRowPaired(int row) { |
@@ -142,13 +128,6 @@ |
} |
} |
- void ExpectPairedTextColorIs(int row, NSColor* expected_color) { |
- EXPECT_NSEQ( |
- expected_color, |
- [[chooser_content_view_ |
- tableRowViewPairedStatus:static_cast<NSInteger>(row)] textColor]); |
- } |
- |
ui::ResourceBundle& rb_; |
std::unique_ptr<ChooserDialogCocoa> chooser_dialog_; |
@@ -203,7 +182,7 @@ |
// |table_view_| should be enabled since there is an option. |
EXPECT_TRUE(table_view_.enabled); |
EXPECT_EQ(-1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
+ ExpectRowImageIsConnectedImage(0); |
ExpectRowTextIs(0, @"a"); |
EXPECT_TRUE(IsRowPaired(0)); |
EXPECT_FALSE(connect_button_.enabled); |
@@ -218,8 +197,7 @@ |
EXPECT_TRUE(table_view_.enabled); |
EXPECT_EQ(-1, table_view_.selectedRow); |
ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::kImageColorUnselected); |
+ 1, MockChooserController::kSignalStrengthLevel0Bar); |
ExpectRowTextIs(1, @"b"); |
EXPECT_FALSE(IsRowPaired(1)); |
@@ -231,8 +209,7 @@ |
EXPECT_TRUE(table_view_.enabled); |
EXPECT_EQ(-1, table_view_.selectedRow); |
ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
+ 2, MockChooserController::kSignalStrengthLevel1Bar); |
ExpectRowTextIs(2, @"c"); |
EXPECT_FALSE(IsRowPaired(2)); |
@@ -240,8 +217,7 @@ |
base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar, |
MockChooserController::ConnectedPairedStatus::NONE); |
ExpectSignalStrengthLevelImageIs( |
- 3, MockChooserController::kSignalStrengthLevel2Bar, |
- MockChooserController::kImageColorUnselected); |
+ 3, MockChooserController::kSignalStrengthLevel2Bar); |
ExpectRowTextIs(3, @"d"); |
EXPECT_FALSE(IsRowPaired(3)); |
@@ -249,8 +225,7 @@ |
base::ASCIIToUTF16("e"), MockChooserController::kSignalStrengthLevel3Bar, |
MockChooserController::ConnectedPairedStatus::NONE); |
ExpectSignalStrengthLevelImageIs( |
- 4, MockChooserController::kSignalStrengthLevel3Bar, |
- MockChooserController::kImageColorUnselected); |
+ 4, MockChooserController::kSignalStrengthLevel3Bar); |
ExpectRowTextIs(4, @"e"); |
EXPECT_FALSE(IsRowPaired(4)); |
@@ -258,8 +233,7 @@ |
base::ASCIIToUTF16("f"), MockChooserController::kSignalStrengthLevel4Bar, |
MockChooserController::ConnectedPairedStatus::NONE); |
ExpectSignalStrengthLevelImageIs( |
- 5, MockChooserController::kSignalStrengthLevel4Bar, |
- MockChooserController::kImageColorUnselected); |
+ 5, MockChooserController::kSignalStrengthLevel4Bar); |
ExpectRowTextIs(5, @"f"); |
EXPECT_FALSE(IsRowPaired(5)); |
} |
@@ -284,12 +258,11 @@ |
EXPECT_EQ(1, table_view_.numberOfColumns); |
EXPECT_TRUE(table_view_.enabled); |
EXPECT_EQ(-1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
+ ExpectRowImageIsConnectedImage(0); |
ExpectRowTextIs(0, @"a"); |
EXPECT_TRUE(IsRowPaired(0)); |
ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
+ 1, MockChooserController::kSignalStrengthLevel1Bar); |
ExpectRowTextIs(1, @"c"); |
EXPECT_FALSE(IsRowPaired(1)); |
@@ -348,15 +321,14 @@ |
EXPECT_EQ(1, table_view_.numberOfColumns); |
EXPECT_TRUE(table_view_.enabled); |
EXPECT_EQ(-1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
+ ExpectRowImageIsConnectedImage(0); |
ExpectRowTextIs(0, @"a"); |
EXPECT_TRUE(IsRowPaired(0)); |
- ExpectRowImageIsConnectedImage(1, gfx::kChromeIconGrey); |
+ ExpectRowImageIsConnectedImage(1); |
ExpectRowTextIs(1, @"d"); |
EXPECT_TRUE(IsRowPaired(1)); |
ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
+ 2, MockChooserController::kSignalStrengthLevel1Bar); |
ExpectRowTextIs(2, @"c"); |
EXPECT_FALSE(IsRowPaired(2)); |
} |
@@ -417,171 +389,13 @@ |
EXPECT_EQ(1, table_view_.numberOfColumns); |
EXPECT_TRUE(table_view_.enabled); |
EXPECT_EQ(-1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
+ ExpectRowImageIsConnectedImage(0); |
ExpectRowTextIs(0, @"a"); |
EXPECT_TRUE(IsRowPaired(0)); |
ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
+ 1, MockChooserController::kSignalStrengthLevel1Bar); |
ExpectRowTextIs(1, @"c"); |
EXPECT_FALSE(IsRowPaired(1)); |
-} |
- |
-TEST_F(ChooserDialogCocoaControllerTest, |
- RowImageAndTextChangeColorWhenSelectionChanges) { |
- CreateChooserDialog(); |
- |
- mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("a"), |
- MockChooserController::kNoSignalStrengthLevelImage, |
- MockChooserController::ConnectedPairedStatus::CONNECTED | |
- MockChooserController::ConnectedPairedStatus::PAIRED); |
- mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::ConnectedPairedStatus::NONE); |
- mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::ConnectedPairedStatus::NONE); |
- |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
- ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectRowTextColorIs(0, [NSColor blackColor]); |
- ExpectRowTextColorIs(1, [NSColor blackColor]); |
- ExpectRowTextColorIs(2, [NSColor blackColor]); |
- ExpectPairedTextColorIs( |
- 0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700)); |
- |
- // Option 0 shows a Bluetooth connected image, the following code tests the |
- // color of that image and text change when the option is selected or |
- // deselected. |
- // Select option 0. |
- [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0] |
- byExtendingSelection:NO]; |
- EXPECT_EQ(0, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, SK_ColorWHITE); |
- ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectRowTextColorIs(0, [NSColor whiteColor]); |
- ExpectRowTextColorIs(1, [NSColor blackColor]); |
- ExpectRowTextColorIs(2, [NSColor blackColor]); |
- ExpectPairedTextColorIs( |
- 0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen300)); |
- |
- // Deselect option 0. |
- [table_view_ deselectRow:0]; |
- EXPECT_EQ(-1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
- ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectRowTextColorIs(0, [NSColor blackColor]); |
- ExpectRowTextColorIs(1, [NSColor blackColor]); |
- ExpectRowTextColorIs(2, [NSColor blackColor]); |
- ExpectPairedTextColorIs( |
- 0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700)); |
- |
- // Option 1 shows a signal strengh level image, the following code tests the |
- // color of that image and text change when the option is selected or |
- // deselected. |
- // Select option 1. |
- [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1] |
- byExtendingSelection:NO]; |
- EXPECT_EQ(1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
- ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::kImageColorSelected); |
- ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectRowTextColorIs(0, [NSColor blackColor]); |
- ExpectRowTextColorIs(1, [NSColor whiteColor]); |
- ExpectRowTextColorIs(2, [NSColor blackColor]); |
- ExpectPairedTextColorIs( |
- 0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700)); |
- |
- // Deselect option 1. |
- [table_view_ deselectRow:1]; |
- EXPECT_EQ(-1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
- ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectRowTextColorIs(0, [NSColor blackColor]); |
- ExpectRowTextColorIs(1, [NSColor blackColor]); |
- ExpectRowTextColorIs(2, [NSColor blackColor]); |
- ExpectPairedTextColorIs( |
- 0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700)); |
- |
- // The following code tests the color of the image and text change when |
- // selecting another option without deselecting the first. |
- // Select option 0. |
- [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0] |
- byExtendingSelection:NO]; |
- |
- // Select option 1. |
- [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1] |
- byExtendingSelection:NO]; |
- EXPECT_EQ(1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
- ExpectSignalStrengthLevelImageIs( |
- 1, MockChooserController::kSignalStrengthLevel0Bar, |
- MockChooserController::kImageColorSelected); |
- ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
- ExpectRowTextColorIs(0, [NSColor blackColor]); |
- ExpectRowTextColorIs(1, [NSColor whiteColor]); |
- ExpectRowTextColorIs(2, [NSColor blackColor]); |
- ExpectPairedTextColorIs( |
- 0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700)); |
- |
- // The following code tests the color of the image and text of a selected |
- // option when it is updated. |
- // Select option 2. |
- [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:2] |
- byExtendingSelection:NO]; |
- |
- // Update option 2 from one signal strength to another. |
- mock_chooser_controller_->OptionUpdated( |
- base::ASCIIToUTF16("c"), base::ASCIIToUTF16("e"), |
- MockChooserController::kSignalStrengthLevel2Bar, |
- MockChooserController::ConnectedPairedStatus::NONE); |
- ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel2Bar, |
- MockChooserController::kImageColorSelected); |
- ExpectRowTextColorIs(0, [NSColor blackColor]); |
- ExpectRowTextColorIs(1, [NSColor blackColor]); |
- ExpectRowTextColorIs(2, [NSColor whiteColor]); |
- |
- // Update option 2 again from non-connected and non-paired to connected |
- // and paired. |
- mock_chooser_controller_->OptionUpdated( |
- base::ASCIIToUTF16("e"), base::ASCIIToUTF16("f"), |
- MockChooserController::kNoSignalStrengthLevelImage, |
- MockChooserController::ConnectedPairedStatus::CONNECTED | |
- MockChooserController::ConnectedPairedStatus::PAIRED); |
- ExpectRowImageIsConnectedImage(2, SK_ColorWHITE); |
- ExpectRowTextColorIs(0, [NSColor blackColor]); |
- ExpectRowTextColorIs(1, [NSColor blackColor]); |
- ExpectRowTextColorIs(2, [NSColor whiteColor]); |
- ExpectPairedTextColorIs( |
- 2, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen300)); |
} |
TEST_F(ChooserDialogCocoaControllerTest, SelectAndDeselectAnOption) { |
@@ -753,15 +567,14 @@ |
MockChooserController::ConnectedPairedStatus::PAIRED); |
EXPECT_EQ(1, table_view_.selectedRow); |
- ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey); |
+ ExpectRowImageIsConnectedImage(0); |
ExpectRowTextIs(0, @"a"); |
EXPECT_TRUE(IsRowPaired(0)); |
- ExpectRowImageIsConnectedImage(1, SK_ColorWHITE); |
+ ExpectRowImageIsConnectedImage(1); |
ExpectRowTextIs(1, @"d"); |
EXPECT_TRUE(IsRowPaired(1)); |
ExpectSignalStrengthLevelImageIs( |
- 2, MockChooserController::kSignalStrengthLevel1Bar, |
- MockChooserController::kImageColorUnselected); |
+ 2, MockChooserController::kSignalStrengthLevel1Bar); |
ExpectRowTextIs(2, @"c"); |
EXPECT_FALSE(IsRowPaired(2)); |
EXPECT_TRUE(connect_button_.enabled); |
@@ -1042,8 +855,7 @@ |
// No option selected. |
EXPECT_EQ(-1, table_view_.selectedRow); |
ExpectSignalStrengthLevelImageIs( |
- 0, MockChooserController::kSignalStrengthLevel2Bar, |
- MockChooserController::kImageColorUnselected); |
+ 0, MockChooserController::kSignalStrengthLevel2Bar); |
ExpectRowTextIs(0, @"d"); |
EXPECT_FALSE(IsRowPaired(0)); |
EXPECT_TRUE(spinner_.hidden); |