| Index: views/controls/textfield/native_textfield_views_unittest.cc
|
| diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
|
| index 54844f39e78990aab5bf3c24ba7695a3d3d4e177..ea8e023b0c44edc4ea94db0df99c5d676f8b3bf0 100644
|
| --- a/views/controls/textfield/native_textfield_views_unittest.cc
|
| +++ b/views/controls/textfield/native_textfield_views_unittest.cc
|
| @@ -225,6 +225,11 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
|
| gfx::SelectionModel(cursor_pos), false).x();
|
| }
|
|
|
| + // Wrap for visibility in test classes.
|
| + ui::TextInputType GetTextInputType() {
|
| + return textfield_view_->GetTextInputType();
|
| + }
|
| +
|
| // We need widget to populate wrapper class.
|
| Widget* widget_;
|
|
|
| @@ -399,6 +404,8 @@ TEST_F(NativeTextfieldViewsTest, InsertionDeletionTest) {
|
| TEST_F(NativeTextfieldViewsTest, PasswordTest) {
|
| InitTextfield(Textfield::STYLE_PASSWORD);
|
|
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, GetTextInputType());
|
| +
|
| last_contents_.clear();
|
| textfield_->SetText(ASCIIToUTF16("my password"));
|
| // Just to make sure the text() and callback returns
|
| @@ -407,6 +414,53 @@ TEST_F(NativeTextfieldViewsTest, PasswordTest) {
|
| EXPECT_TRUE(last_contents_.empty());
|
| }
|
|
|
| +TEST_F(NativeTextfieldViewsTest, InputTypeSetsPassword) {
|
| + InitTextfield(Textfield::STYLE_DEFAULT);
|
| +
|
| + // Defaults to TEXT
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
|
| +
|
| + // Setting to passwords also sets password state of textfield.
|
| + textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, GetTextInputType());
|
| + EXPECT_TRUE(textfield_->IsPassword());
|
| +}
|
| +
|
| +TEST_F(NativeTextfieldViewsTest, PasswordSetsInputType) {
|
| + InitTextfield(Textfield::STYLE_DEFAULT);
|
| +
|
| + // Defaults to TEXT
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
|
| +
|
| + textfield_->SetPassword(true);
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, GetTextInputType());
|
| +
|
| + textfield_->SetPassword(false);
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
|
| +}
|
| +
|
| +TEST_F(NativeTextfieldViewsTest, TextInputType) {
|
| + InitTextfield(Textfield::STYLE_DEFAULT);
|
| +
|
| + // Defaults to TEXT
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, GetTextInputType());
|
| +
|
| + // And can be set.
|
| + textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_URL, GetTextInputType());
|
| +
|
| + // Readonly textfields have type NONE
|
| + textfield_->SetReadOnly(true);
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, GetTextInputType());
|
| +
|
| + textfield_->SetReadOnly(false);
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_URL, GetTextInputType());
|
| +
|
| + // As do disabled textfields
|
| + textfield_->SetEnabled(false);
|
| + EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, GetTextInputType());
|
| +}
|
| +
|
| TEST_F(NativeTextfieldViewsTest, OnKeyPressReturnValueTest) {
|
| InitTextfield(Textfield::STYLE_DEFAULT);
|
|
|
|
|