#include "base/basictypes.h"
#include "base/strings/utf_string_conversions.h"
+#include "ui/base/ime/text_input_client.h"
#include "ui/base/models/combobox_model.h"
#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/controls/combobox/combobox_listener.h"
#include "ui/views/controls/menu/menu_runner.h"
// shown or not.
class TestMenuRunnerHandler : public MenuRunnerHandler {
public:
- TestMenuRunnerHandler()
- : executed_(false) {}
+ TestMenuRunnerHandler() : executed_(false) {}
bool executed() const { return executed_; }
explicit TestCombobox(ui::ComboboxModel* model)
: Combobox(model),
key_handled_(false),
- key_received_(false) {
- }
+ key_received_(false) {}
virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE {
key_received_ = true;
DISALLOW_COPY_AND_ASSIGN(TestComboboxModel);
};
+// A combobox model which refers to a vector.
+class VectorComboboxModel : public ui::ComboboxModel {
+ public:
+ explicit VectorComboboxModel(std::vector<std::string>* values)
+ : values_(values) {}
+ virtual ~VectorComboboxModel() {}
+
+ // ui::ComboboxModel:
+ virtual int GetItemCount() const OVERRIDE {
+ return (int)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) {};
+ EvilListener() : deleted_(false) {}
virtual ~EvilListener() {};
// ComboboxListener:
- virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE {
+ virtual void OnPerformAction(Combobox* combobox) OVERRIDE {
delete combobox;
deleted_ = true;
}
class TestComboboxListener : public views::ComboboxListener {
public:
- TestComboboxListener()
- : on_selected_index_changed_called_(false),
- on_combobox_text_button_clicked_called_(false) {
- }
+ TestComboboxListener() : perform_action_index_(-1), actions_performed_(0) {}
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();
+ actions_performed_++;
}
- 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_perform_action_called() const {
+ return actions_performed_ > 0;
}
- bool on_combobox_text_button_clicked_called() const {
- return on_combobox_text_button_clicked_called_;
+ int actions_performed() const {
+ return actions_performed_;
}
private:
- bool on_selected_index_changed_called_;
- bool on_combobox_text_button_clicked_called_;
+ int perform_action_index_;
+ int actions_performed_;
private:
DISALLOW_COPY_AND_ASSIGN(TestComboboxListener);
class ComboboxTest : public ViewsTestBase {
public:
- ComboboxTest() : widget_(NULL), combobox_(NULL), input_method_(NULL) {}
+ ComboboxTest() : widget_(NULL), combobox_(NULL) {}
virtual void TearDown() OVERRIDE {
if (widget_)
widget_->SetContentsView(container);
container->AddChildView(combobox_);
- input_method_ = new MockInputMethod();
- widget_->ReplaceInputMethod(input_method_);
+ widget_->ReplaceInputMethod(new MockInputMethod);
// Assumes the Widget is always focused.
- input_method_->OnFocus();
+ widget_->GetInputMethod()->OnFocus();
combobox_->RequestFocus();
combobox_->SizeToPreferredSize();
void SendKeyEventWithType(ui::KeyboardCode key_code, ui::EventType type) {
ui::KeyEvent event(type, key_code, 0, false);
- input_method_->DispatchKeyEvent(event);
+ widget_->GetInputMethod()->DispatchKeyEvent(event);
}
View* GetFocusedView() {
// Combobox does not take ownership of the model, hence it needs to be scoped.
scoped_ptr<TestComboboxModel> model_;
-
- // For testing input method related behaviors.
- MockInputMethod* input_method_;
};
TEST_F(ComboboxTest, KeyTest) {
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);
+
+ // |combobox| will be deleted on change.
+ TestCombobox* combobox = new TestCombobox(&model);
+ scoped_ptr<EvilListener> evil_listener(new EvilListener());
+ combobox->set_listener(evil_listener.get());
+ ASSERT_NO_FATAL_FAILURE(combobox->ExecuteCommand(2));
+ EXPECT_TRUE(evil_listener->deleted());
+
+ // With STYLE_ACTION
+ // |combobox| will be deleted on change.
+ combobox = new TestCombobox(&model);
+ evil_listener.reset(new EvilListener());
+ combobox->set_listener(evil_listener.get());
+ combobox->SetStyle(Combobox::STYLE_ACTION);
ASSERT_NO_FATAL_FAILURE(combobox->ExecuteCommand(2));
- EXPECT_TRUE(evil_listener.deleted());
+ EXPECT_TRUE(evil_listener->deleted());
}
TEST_F(ComboboxTest, Click) {
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());
+ EXPECT_FALSE(listener.on_perform_action_called());
EXPECT_TRUE(test_menu_runner_handler->executed());
}
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());
+ 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());
+ EXPECT_TRUE(listener.on_perform_action_called());
+ EXPECT_EQ(0, listener.perform_action_index());
}
TEST_F(ComboboxTest, NotifyOnClickWithSpaceKey) {
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());
+ EXPECT_FALSE(listener.on_perform_action_called());
SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
- EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+ 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());
+ EXPECT_FALSE(listener.on_perform_action_called());
SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
- EXPECT_TRUE(listener.on_combobox_text_button_clicked_called());
+ EXPECT_TRUE(listener.on_perform_action_called());
+ EXPECT_EQ(0, listener.perform_action_index());
}
TEST_F(ComboboxTest, NotifyOnClickWithMouse) {
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.
PerformClick(gfx::Point(combobox_->x() + combobox_->width() - 1,
combobox_->y() + combobox_->height() / 2));
- EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
+ 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_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());
+ 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) {
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)));
}
+// Disabled because of memory leaks, see http://crbug.com/341042.
+TEST_F(ComboboxTest, DISABLED_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());
+}
+
+TEST_F(ComboboxTest, TypingPrefixNotifiesListener) {
+ InitCombobox();
+
+ TestComboboxListener listener;
+ combobox_->set_listener(&listener);
+
+ // Type the first character of the second menu item ("JELLY").
+ combobox_->GetTextInputClient()->InsertChar('J', ui::EF_NONE);
+ EXPECT_EQ(1, listener.actions_performed());
+ EXPECT_EQ(1, listener.perform_action_index());
+
+ // Type the second character of "JELLY", item shouldn't change and
+ // OnPerformAction() shouldn't be re-called.
+ combobox_->GetTextInputClient()->InsertChar('E', ui::EF_NONE);
+ EXPECT_EQ(1, listener.actions_performed());
+ EXPECT_EQ(1, listener.perform_action_index());
+
+ // Clears the typed text.
+ combobox_->OnBlur();
+
+ // Type the first character of "PEANUT BUTTER", which should change the
+ // selected index and perform an action.
+ combobox_->GetTextInputClient()->InsertChar('P', ui::EF_NONE);
+ EXPECT_EQ(2, listener.actions_performed());
+ EXPECT_EQ(2, listener.perform_action_index());
+}
+
} // namespace views
projects / platform / framework / web / crosswalk.git / blobdiff