Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors

ui/views/controls/combobox/combobox_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/combobox/combobox.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 99 matching lines @@
   void SetSeparators(const std::set<int>& separators) {
     separators_ = separators;
   }
 
  private:
   std::set<int> separators_;
 
   DISALLOW_COPY_AND_ASSIGN(TestComboboxModel);
 };
 
+// A combobox model which refers to a vector.
+class VectorComboboxModel : public ui::ComboboxModel {
+ public:
+  VectorComboboxModel(std::vector<std::string>* values)
+      : values_(values) {
+  }
+  virtual ~VectorComboboxModel() {}
+
+  // ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
+    return values_->size();
+  }
+  virtual base::string16 GetItemAt(int index) OVERRIDE {
+    return ASCIIToUTF16(values_->at(index));
+  }
+  virtual bool IsItemSeparatorAt(int index) OVERRIDE {
+    return false;
+  }
+
+ private:
+  std::vector<std::string>* values_;
+};
+
 class EvilListener : public ComboboxListener {
  public:
   EvilListener() : deleted_(false) {};
   virtual ~EvilListener() {};
 
   // ComboboxListener:
-  virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE {
+  virtual void OnPerformAction(Combobox* combobox) OVERRIDE {
     delete combobox;
     deleted_ = true;
   }
 
   bool deleted() const { return deleted_; }
 
  private:
   bool deleted_;
 
   DISALLOW_COPY_AND_ASSIGN(EvilListener);
 };
 
 class TestComboboxListener : public views::ComboboxListener {
  public:
   TestComboboxListener()
-      : on_selected_index_changed_called_(false),
-        on_combobox_text_button_clicked_called_(false) {
+      : perform_action_index_(-1),
+        on_perform_action_called_(false) {
   }
   virtual ~TestComboboxListener() {}
 
-  virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE {
-    on_selected_index_changed_called_ = true;
+  virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE {
+    perform_action_index_ = combobox->selected_index();
+    on_perform_action_called_ = true;
   }
 
-  virtual void OnComboboxTextButtonClicked(views::Combobox* combobox) OVERRIDE {
-    on_combobox_text_button_clicked_called_ = true;
+  int perform_action_index() const {
+    return perform_action_index_;
   }
 
-  bool on_selected_index_changed_called() const {
-    return on_selected_index_changed_called_;
-  }
-
-  bool on_combobox_text_button_clicked_called() const {
-    return on_combobox_text_button_clicked_called_;
+  bool on_perform_action_called() const {
+    return on_perform_action_called_;
   }
 
  private:
-  bool on_selected_index_changed_called_;
-  bool on_combobox_text_button_clicked_called_;
+  int perform_action_index_;
+  bool on_perform_action_called_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestComboboxListener);
 };
 
 }  // namespace
 
 class ComboboxTest : public ViewsTestBase {
  public:
   ComboboxTest() : widget_(NULL), combobox_(NULL), input_method_(NULL) {}
@@ skipping 256 matching lines @@
 // Verifies selecting the first matching value (and returning whether found).
 TEST_F(ComboboxTest, SelectValue) {
   InitCombobox();
   ASSERT_EQ(model_->GetDefaultIndex(), combobox_->selected_index());
   EXPECT_TRUE(combobox_->SelectValue(ASCIIToUTF16("PEANUT BUTTER")));
   EXPECT_EQ(0, combobox_->selected_index());
   EXPECT_TRUE(combobox_->SelectValue(ASCIIToUTF16("JELLY")));
   EXPECT_EQ(1, combobox_->selected_index());
   EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("BANANAS")));
   EXPECT_EQ(1, combobox_->selected_index());
+
+  // With the action style, the selected index is always 0.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
+  EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("PEANUT BUTTER")));
+  EXPECT_EQ(0, combobox_->selected_index());
+  EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("JELLY")));
+  EXPECT_EQ(0, combobox_->selected_index());
+  EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("BANANAS")));
+  EXPECT_EQ(0, combobox_->selected_index());
+}
+
+TEST_F(ComboboxTest, SelectIndexActionStyle) {
+  InitCombobox();
+
+  // With the action style, the selected index is always 0.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
+  combobox_->SetSelectedIndex(1);
+  EXPECT_EQ(0, combobox_->selected_index());
+  combobox_->SetSelectedIndex(2);
+  EXPECT_EQ(0, combobox_->selected_index());
+  combobox_->SetSelectedIndex(3);
+  EXPECT_EQ(0, combobox_->selected_index());
 }
 
 TEST_F(ComboboxTest, ListenerHandlesDelete) {
   TestComboboxModel model;
   TestCombobox* combobox = new TestCombobox(&model);  // Deleted on change.
   EvilListener evil_listener;
   combobox->set_listener(&evil_listener);
   ASSERT_NO_FATAL_FAILURE(combobox->ExecuteCommand(2));
+  base::MessageLoop::current()->RunUntilIdle();

[sky, 2014/02/03 16:58:19]

This shouldn't be necessary any where in this file.

[hajimehoshi, 2014/02/04 04:06:32]

Done.

   EXPECT_TRUE(evil_listener.deleted());
 }
 
 TEST_F(ComboboxTest, Click) {
   InitCombobox();
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   combobox_->Layout();
 
   // Click the left side. The menu is shown.
   TestMenuRunnerHandler* test_menu_runner_handler = new TestMenuRunnerHandler();
   scoped_ptr<MenuRunnerHandler> menu_runner_handler(test_menu_runner_handler);
   test::MenuRunnerTestAPI test_api(
       combobox_->dropdown_list_menu_runner_.get());
   test_api.SetMenuRunnerHandler(menu_runner_handler.Pass());
   PerformClick(gfx::Point(combobox_->x() + 1,
                           combobox_->y() + combobox_->height() / 2));
-  EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_FALSE(listener.on_perform_action_called());
   EXPECT_TRUE(test_menu_runner_handler->executed());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithReturnKey) {
   InitCombobox();
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_SHOW_DROP_DOWN_ON_CLICK, the click event is ignored.
+  // With STYLE_NORMAL, the click event is ignored.
   SendKeyEvent(ui::VKEY_RETURN);
-  EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_FALSE(listener.on_perform_action_called());
 
-  // With STYLE_NOTIFY_ON_CLICK, the click event is notified.
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  // With STYLE_ACTION, the click event is notified.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   SendKeyEvent(ui::VKEY_RETURN);
-  EXPECT_TRUE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_TRUE(listener.on_perform_action_called());
+  EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithSpaceKey) {
   InitCombobox();
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_SHOW_DROP_DOWN_ON_CLICK, the click event is ignored.
+  // With STYLE_NORMAL, the click event is ignored.
   SendKeyEvent(ui::VKEY_SPACE);
-  EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_FALSE(listener.on_perform_action_called());
   SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
-  EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_FALSE(listener.on_perform_action_called());
 
-  // With STYLE_NOTIFY_ON_CLICK, the click event is notified after releasing.
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  // With STYLE_ACTION, the click event is notified after releasing.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   SendKeyEvent(ui::VKEY_SPACE);
-  EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_FALSE(listener.on_perform_action_called());
   SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
-  EXPECT_TRUE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_TRUE(listener.on_perform_action_called());
+  EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithMouse) {
   InitCombobox();
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   combobox_->Layout();
 
   // Click the right side (arrow button). The menu is shown.
   TestMenuRunnerHandler* test_menu_runner_handler = new TestMenuRunnerHandler();
   scoped_ptr<MenuRunnerHandler> menu_runner_handler(test_menu_runner_handler);
   scoped_ptr<test::MenuRunnerTestAPI> test_api(
       new test::MenuRunnerTestAPI(combobox_->dropdown_list_menu_runner_.get()));
   test_api->SetMenuRunnerHandler(menu_runner_handler.Pass());
 
   PerformClick(gfx::Point(combobox_->x() + combobox_->width() - 1,
                           combobox_->y() + combobox_->height() / 2));
-  EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_FALSE(listener.on_perform_action_called());
   EXPECT_TRUE(test_menu_runner_handler->executed());
 
   // Click the left side (text button). The click event is notified.
   test_menu_runner_handler = new TestMenuRunnerHandler();
   menu_runner_handler.reset(test_menu_runner_handler);
   test_api.reset(
       new test::MenuRunnerTestAPI(combobox_->dropdown_list_menu_runner_.get()));
   test_api->SetMenuRunnerHandler(menu_runner_handler.Pass());
   PerformClick(gfx::Point(combobox_->x() + 1,
                           combobox_->y() + combobox_->height() / 2));
-  EXPECT_TRUE(listener.on_combobox_text_button_clicked_called());
+  base::MessageLoop::current()->RunUntilIdle();
+  EXPECT_TRUE(listener.on_perform_action_called());
   EXPECT_FALSE(test_menu_runner_handler->executed());
+  EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, ConsumingPressKeyEvents) {
   InitCombobox();
 
   EXPECT_FALSE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false)));
   EXPECT_FALSE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, 0, false)));
 
-  // When the combobox's style is STYLE_NOTIFY_ON_CLICK, pressing events of
-  // a space key or an enter key will be consumed.
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  // When the combobox's style is STYLE_ACTION, pressing events of a space key
+  // or an enter key will be consumed.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false)));
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, 0, false)));
 }
 
+TEST_F(ComboboxTest, ContentWidth) {
+  std::vector<std::string> values;
+
+  scoped_ptr<VectorComboboxModel> model(new VectorComboboxModel(&values));
+  combobox_ = new TestCombobox(model.get());
+
+  std::string long_item = "this is the long item";
+  std::string short_item = "s";
+
+  values.resize(1);
+  values[0] = long_item;
+  combobox_->ModelChanged();
+
+  const int long_item_width = combobox_->content_size_.width();
+
+  values[0] = short_item;
+  combobox_->ModelChanged();
+
+  const int short_item_width = combobox_->content_size_.width();
+
+  values.resize(2);
+  values[0] = short_item;
+  values[1] = long_item;
+  combobox_->ModelChanged();
+
+  // When the style is STYLE_NORMAL, the width will fit with the longest item.
+  combobox_->SetStyle(Combobox::STYLE_NORMAL);
+  EXPECT_EQ(long_item_width, combobox_->content_size_.width());
+
+  // When the style is STYLE_ACTION, the width will fit with the first items'
+  // width.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
+  EXPECT_EQ(short_item_width, combobox_->content_size_.width());
+}
+
 }  // namespace views