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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2330593002: Show device connection and paired status in chooser on non-Mac (Closed)
Patch Set: use ternary operator 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
« no previous file with comments | « chrome/browser/ui/views/chooser_content_view.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/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 7bc30af2985114e4184cbca1edf7330fe8127c53..b4f8f01a8019a993cee20e758c5d033963ea0082 100644
--- a/chrome/browser/ui/views/chooser_content_view_unittest.cc
+++ b/chrome/browser/ui/views/chooser_content_view_unittest.cc
@@ -100,7 +100,10 @@ TEST_F(ChooserContentViewTest, AddOption) {
MockChooserController::ConnectedPairedStatus::CONNECTED |
MockChooserController::ConnectedPairedStatus::PAIRED);
EXPECT_EQ(1, table_view_->RowCount());
- EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
msw 2016/09/09 23:16:03 nit: make a local helper like base::string16 GetPa
juncai 2016/09/15 17:43:55 Done.
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("a")),
+ table_model_->GetText(0, 0));
// |table_view_| should be enabled since there is an option.
EXPECT_TRUE(table_view_->enabled());
// No option selected.
@@ -144,7 +147,10 @@ TEST_F(ChooserContentViewTest, RemoveOption) {
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
EXPECT_EQ(2, table_view_->RowCount());
- EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("a")),
+ table_model_->GetText(0, 0));
EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(1, 0));
EXPECT_TRUE(table_view_->enabled());
EXPECT_EQ(0, table_view_->SelectedRowCount());
@@ -153,7 +159,10 @@ TEST_F(ChooserContentViewTest, RemoveOption) {
// Remove a non-existent option, the number of rows should not change.
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("non-existent"));
EXPECT_EQ(2, table_view_->RowCount());
- EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("a")),
+ table_model_->GetText(0, 0));
EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(1, 0));
EXPECT_TRUE(table_view_->enabled());
EXPECT_EQ(0, table_view_->SelectedRowCount());
@@ -161,7 +170,10 @@ TEST_F(ChooserContentViewTest, RemoveOption) {
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c"));
EXPECT_EQ(1, table_view_->RowCount());
- EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("a")),
+ table_model_->GetText(0, 0));
EXPECT_TRUE(table_view_->enabled());
EXPECT_EQ(0, table_view_->SelectedRowCount());
EXPECT_EQ(-1, table_view_->FirstSelectedRow());
@@ -200,8 +212,14 @@ TEST_F(ChooserContentViewTest, UpdateOption) {
MockChooserController::ConnectedPairedStatus::CONNECTED |
MockChooserController::ConnectedPairedStatus::PAIRED);
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));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("a")),
+ table_model_->GetText(0, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("d")),
+ table_model_->GetText(1, 0));
EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(2, 0));
EXPECT_TRUE(table_view_->enabled());
EXPECT_EQ(0, table_view_->SelectedRowCount());
@@ -263,7 +281,10 @@ TEST_F(ChooserContentViewTest, UpdateAndRemoveTheUpdatedOption) {
mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
EXPECT_EQ(2, table_view_->RowCount());
- EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("a")),
+ table_model_->GetText(0, 0));
EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(1, 0));
EXPECT_TRUE(table_view_->enabled());
EXPECT_EQ(0, table_view_->SelectedRowCount());
@@ -429,8 +450,14 @@ TEST_F(ChooserContentViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
EXPECT_EQ(1, table_view_->SelectedRowCount());
EXPECT_EQ(1, table_view_->FirstSelectedRow());
- EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
- EXPECT_EQ(base::ASCIIToUTF16("d"), table_model_->GetText(1, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("a")),
+ table_model_->GetText(0, 0));
+ EXPECT_EQ(l10n_util::GetStringFUTF16(
+ IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+ base::ASCIIToUTF16("d")),
+ table_model_->GetText(1, 0));
EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(2, 0));
}
« no previous file with comments | « chrome/browser/ui/views/chooser_content_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698