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

Unified Diff: ui/views/controls/combobox/native_combobox_views_unittest.cc

Issue 9875001: views: Rename Combobox "selected getter/setter" accessors to something more accurate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: combo box -> combobox Created 8 years, 9 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: ui/views/controls/combobox/native_combobox_views_unittest.cc
diff --git a/ui/views/controls/combobox/native_combobox_views_unittest.cc b/ui/views/controls/combobox/native_combobox_views_unittest.cc
index 4143d221ce7f31c7a54b0c1d8171bf43a1722ed2..651bb02554558d296dabfc7ef4586afb27a4a0cb 100644
--- a/ui/views/controls/combobox/native_combobox_views_unittest.cc
+++ b/ui/views/controls/combobox/native_combobox_views_unittest.cc
@@ -50,7 +50,7 @@ class TestCombobox : public views::Combobox {
DISALLOW_COPY_AND_ASSIGN(TestCombobox);
};
-// A concrete class is needed to test the combo box.
+// A concrete class is needed to test the combobox.
class TestComboboxModel : public ui::ComboboxModel {
public:
TestComboboxModel() {}
@@ -152,16 +152,16 @@ class NativeComboboxViewsTest : public ViewsTestBase {
TEST_F(NativeComboboxViewsTest, KeyTest) {
InitCombobox();
SendKeyEvent(ui::VKEY_END);
- EXPECT_EQ(combobox_->selected_item() + 1, model_->GetItemCount());
+ EXPECT_EQ(combobox_->selected_index() + 1, model_->GetItemCount());
SendKeyEvent(ui::VKEY_HOME);
- EXPECT_EQ(combobox_->selected_item(), 0);
+ EXPECT_EQ(combobox_->selected_index(), 0);
SendKeyEvent(ui::VKEY_DOWN);
SendKeyEvent(ui::VKEY_DOWN);
- EXPECT_EQ(combobox_->selected_item(), 2);
+ EXPECT_EQ(combobox_->selected_index(), 2);
SendKeyEvent(ui::VKEY_RIGHT);
- EXPECT_EQ(combobox_->selected_item(), 2);
+ EXPECT_EQ(combobox_->selected_index(), 2);
SendKeyEvent(ui::VKEY_LEFT);
- EXPECT_EQ(combobox_->selected_item(), 2);
+ EXPECT_EQ(combobox_->selected_index(), 2);
}
// Check that if a combobox is disabled before it has a native wrapper, then the
« no previous file with comments | « ui/views/controls/combobox/native_combobox_views.cc ('k') | ui/views/controls/combobox/native_combobox_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698