focus reverse traversal was not working for TextfieldViews.

views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2010 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 "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/event.h"
+#include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 #define EXPECT_STR_EQ(ascii, utf16) \
   EXPECT_EQ(ASCIIToWide(ascii), UTF16ToWide(utf16))
 
 // TODO(oshima): Move tests that are independent of TextfieldViews to
 // textfield_unittests.cc once we move the test utility functions
 // from chrome/browser/automation/ to app/test/.
@@ skipping 26 matching lines @@
   }
 
   virtual bool HandleKeyEvent(Textfield* sender,
                               const KeyEvent& key_event) {
 
     // TODO(oshima): figure out how to test the keystroke.
     return false;
   }
 
   void InitTextfield(Textfield::StyleFlags style) {
+    InitTextfields(style, 1);
+  }
+
+  void InitTextfields(Textfield::StyleFlags style, int count) {
     ASSERT_FALSE(textfield_);
     textfield_ = new Textfield(style);
     textfield_->SetController(this);
     widget_ = Widget::CreatePopupWidget(
         Widget::NotTransparent,
         Widget::AcceptEvents,
         Widget::DeleteOnDestroy,
         Widget::DontMirrorOriginInRTL);
     widget_->Init(NULL, gfx::Rect());
-    widget_->SetContentsView(textfield_);
+
+    View* container = new View();
+    widget_->SetContentsView(container);
+    container->AddChildView(textfield_);
     textfield_view_
         = static_cast<NativeTextfieldViews*>(textfield_->native_wrapper());
+    textfield_->SetID(1);
+
+    for (int i = 1; i < count; i++) {
+      Textfield* textfield = new Textfield(style);
+      container->AddChildView(textfield);
+      textfield->SetID(i + 1);
+    }
+
     DCHECK(textfield_view_);
     model_ = textfield_view_->model_.get();
   }
 
+ protected:
   bool SendKeyEventToTextfieldViews(app::KeyboardCode key_code,
                                     bool shift,
                                     bool control,
                                     bool capslock) {
     int flags = (shift ? KeyEvent::EF_SHIFT_DOWN : 0) |
         (control ? KeyEvent::EF_CONTROL_DOWN : 0) |
         (capslock ? KeyEvent::EF_CAPS_LOCK_DOWN : 0);
     KeyEvent event(KeyEvent::ET_KEY_PRESSED, key_code, flags, 1, 0);
-    return textfield_view_->OnKeyPressed(event);
+    return textfield_->OnKeyPressed(event);
   }
 
   bool SendKeyEventToTextfieldViews(app::KeyboardCode key_code,
                                     bool shift,
                                     bool control) {
     return SendKeyEventToTextfieldViews(key_code, shift, control, false);
   }
 
   bool SendKeyEventToTextfieldViews(app::KeyboardCode key_code) {
     return SendKeyEventToTextfieldViews(key_code, false, false);
   }
 
- protected:
+  View* GetFocusedView() {
+    return widget_->GetFocusManager()->GetFocusedView();
+  }
+
   // We need widget to populate wrapper class.
   Widget* widget_;
 
   Textfield* textfield_;
   NativeTextfieldViews* textfield_view_;
   TextfieldViewsModel* model_;
 
   // A fake message loop for view's drawing events.
   MessageLoop message_loop_;
 
@@ skipping 127 matching lines @@
 
 TEST_F(NativeTextfieldViewsTest, PasswordTest) {
   InitTextfield(Textfield::STYLE_PASSWORD);
   textfield_->SetText(ASCIIToUTF16("my password"));
   // Just to make sure the text() and callback returns
   // the actual text instead of "*".
   EXPECT_STR_EQ("my password", textfield_->text());
   EXPECT_STR_EQ("my password", last_contents_);
 }
 
-TEST_F(NativeTextfieldViewsTest, TestOnKeyPressReturnValue) {
+TEST_F(NativeTextfieldViewsTest, OnKeyPressReturnValueTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   EXPECT_TRUE(SendKeyEventToTextfieldViews(app::VKEY_A));
   // F24, up/down key won't be handled.
   EXPECT_FALSE(SendKeyEventToTextfieldViews(app::VKEY_F24));
   EXPECT_FALSE(SendKeyEventToTextfieldViews(app::VKEY_UP));
   EXPECT_FALSE(SendKeyEventToTextfieldViews(app::VKEY_DOWN));
 }
 
 TEST_F(NativeTextfieldViewsTest, CursorMovement) {
   InitTextfield(Textfield::STYLE_DEFAULT);
@@ skipping 38 matching lines @@
 
   // Ctrl+Left to move the cursor to the beginning of the first word.
   SendKeyEventToTextfieldViews(app::VKEY_LEFT, false, true);
   // Ctrl+Left again should move the cursor back to the very beginning.
   SendKeyEventToTextfieldViews(app::VKEY_LEFT, false, true);
   SendKeyEventToTextfieldViews(app::VKEY_DELETE);
   EXPECT_STR_EQ("one two", textfield_->text());
   EXPECT_STR_EQ("one two", last_contents_);
 }
 
+TEST_F(NativeTextfieldViewsTest, FocusTraversalTest) {
+  InitTextfields(Textfield::STYLE_DEFAULT, 3);
+  textfield_->RequestFocus();
+
+  EXPECT_EQ(1, GetFocusedView()->GetID());
+  widget_->GetFocusManager()->AdvanceFocus(false);
+  EXPECT_EQ(2, GetFocusedView()->GetID());
+  widget_->GetFocusManager()->AdvanceFocus(false);
+  EXPECT_EQ(3, GetFocusedView()->GetID());
+  // Cycle back to the first textfield.
+  widget_->GetFocusManager()->AdvanceFocus(false);
+  EXPECT_EQ(1, GetFocusedView()->GetID());
+
+  widget_->GetFocusManager()->AdvanceFocus(true);
+  EXPECT_EQ(3, GetFocusedView()->GetID());
+  widget_->GetFocusManager()->AdvanceFocus(true);
+  EXPECT_EQ(2, GetFocusedView()->GetID());
+  widget_->GetFocusManager()->AdvanceFocus(true);
+  EXPECT_EQ(1, GetFocusedView()->GetID());
+  // Cycle back to the last textfield.
+  widget_->GetFocusManager()->AdvanceFocus(true);
+  EXPECT_EQ(3, GetFocusedView()->GetID());
+
+  // Request focus should still work.
+  textfield_->RequestFocus();
+  EXPECT_EQ(1, GetFocusedView()->GetID());
+}
+
 }  // namespace views