Quick fix for NativeTextfieldViewsTest on win aura.

views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 16 matching lines @@
 #include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/ime/mock_input_method.h"
 #include "views/ime/text_input_client.h"
 #include "views/test/test_views_delegate.h"
 #include "views/test/views_test_base.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget_private.h"
 #include "views/widget/widget.h"
 
-// Bug 99128.
-#if defined(USE_AURA)
-#define MAYBE_KeyTest FAILS_KeyTest
-#define MAYBE_ControlAndSelectTest FAILS_ControlAndSelectTest
-#define MAYBE_InsertionDeletionTest FAILS_InsertionDeletionTest
-#define MAYBE_OnKeyPressReturnValueTest FAILS_OnKeyPressReturnValueTest
-#define MAYBE_CursorMovement FAILS_CursorMovement
-#define MAYBE_DragAndDrop_ToTheRight FAILS_DragAndDrop_ToTheRight
-#define MAYBE_DragAndDrop_ToTheLeft FAILS_DragAndDrop_ToTheLeft
-#define MAYBE_ReadOnlyTest FAILS_ReadOnlyTest
-#define MAYBE_TextInputClientTest FAILS_TextInputClientTest
-#define MAYBE_UndoRedoTest FAILS_UndoRedoTest
-#define MAYBE_TextCursorDisplayTest FAILS_TextCursorDisplayTest
-#define MAYBE_TextCursorDisplayInRTLTest FAILS_TextCursorDisplayInRTLTest
-#define MAYBE_HitOutsideTextAreaTest FAILS_HitOutsideTextAreaTest
-#define MAYBE_HitOutsideTextAreaInRTLTest FAILS_HitOutsideTextAreaInRTLTest
-#define MAYBE_OverflowTest FAILS_OverflowTest
-#define MAYBE_OverflowInRTLTest FAILS_OverflowInRTLTest
-#else
+// Bug http://crbug.com/99128
+#if defined(OS_WIN)

[sadrul, 2011/10/05 22:54:02]

I think the simplest would be to make this

#if defined(USE_AURA) && defined(OS_LINUX)

Keep the FAILS_ bit, turn some into DISABLED_, and remove the #else block.

[sadrul, 2011/10/05 22:57:18]

Clearly the #else block should remain as it is.

 #define MAYBE_KeyTest KeyTest
 #define MAYBE_ControlAndSelectTest ControlAndSelectTest
 #define MAYBE_InsertionDeletionTest InsertionDeletionTest
 #define MAYBE_OnKeyPressReturnValueTest OnKeyPressReturnValueTest
 #define MAYBE_CursorMovement CursorMovement
+#define MAYBE_DragAndDrop_InitiateDrag DragAndDrop_InitiateDrag
+#define MAYBE_DragAndDrop_ToTheLeft DragAndDrop_ToTheLeft
 #define MAYBE_DragAndDrop_ToTheRight DragAndDrop_ToTheRight
-#define MAYBE_DragAndDrop_ToTheLeft DragAndDrop_ToTheLeft
+#define MAYBE_DragAndDrop_Canceled DragAndDrop_Canceled
 #define MAYBE_ReadOnlyTest ReadOnlyTest
 #define MAYBE_TextInputClientTest TextInputClientTest
 #define MAYBE_UndoRedoTest UndoRedoTest
 #define MAYBE_TextCursorDisplayTest TextCursorDisplayTest
 #define MAYBE_TextCursorDisplayInRTLTest TextCursorDisplayInRTLTest
 #define MAYBE_HitOutsideTextAreaTest HitOutsideTextAreaTest
 #define MAYBE_HitOutsideTextAreaInRTLTest HitOutsideTextAreaInRTLTest
 #define MAYBE_OverflowTest OverflowTest
 #define MAYBE_OverflowInRTLTest OverflowInRTLTest
-#endif
+#else  // OS_WIN
+
+#define MAYBE_KeyTest FAILS_KeyTest
+#define MAYBE_ControlAndSelectTest FAILS_ControlAndSelectTest
+#define MAYBE_InsertionDeletionTest FAILS_InsertionDeletionTest
+#define MAYBE_OnKeyPressReturnValueTest FAILS_OnKeyPressReturnValueTest
+#define MAYBE_CursorMovement FAILS_CursorMovement
+#define MAYBE_ReadOnlyTest FAILS_ReadOnlyTest
+#define MAYBE_TextInputClientTest FAILS_TextInputClientTest
+#define MAYBE_UndoRedoTest FAILS_UndoRedoTest
+#define MAYBE_TextCursorDisplayTest FAILS_TextCursorDisplayTest
+#define MAYBE_TextCursorDisplayInRTLTest FAILS_TextCursorDisplayInRTLTest
+#define MAYBE_HitOutsideTextAreaTest FAILS_HitOutsideTextAreaTest
+#define MAYBE_HitOutsideTextAreaInRTLTest FAILS_HitOutsideTextAreaInRTLTest
+#define MAYBE_OverflowTest FAILS_OverflowTest
+#define MAYBE_OverflowInRTLTest FAILS_OverflowInRTLTest
+
+// Drag and drop for aura in linux hasn't been implemented yet.
+// Bug http://crbug.com/97845
+#if defined(USE_AURA)
+#define MAYBE_DragAndDrop_InitiateDrag DISABLED_DragAndDrop_InitiateDrag
+#define MAYBE_DragAndDrop_ToTheLeft DISABLED_DragAndDrop_ToTheLeft
+#define MAYBE_DragAndDrop_ToTheRight DISABLED_DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_Canceled DISABLED_DragAndDrop_Canceled
+#else  // USE_AURA
+#define MAYBE_DragAndDrop_InitiateDrag FAILS_DragAndDrop_InitiateDrag
+#define MAYBE_DragAndDrop_ToTheLeft FAILS_DragAndDrop_ToTheLeft
+#define MAYBE_DragAndDrop_ToTheRight FAILS_DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_Canceled FAILS_DragAndDrop_Canceled
+#endif  // USE_AURA
+
+#endif  // OS_WIN
 
 namespace {
 
 // A wrapper of Textfield to intercept the result of OnKeyPressed() and
 // OnKeyReleased() methods.
 class TestTextfield : public views::Textfield {
  public:
   TestTextfield()
       : key_handled_(false),
         key_received_(false) {
@@ skipping 720 matching lines @@
 #else
   // Skip OSExchangeDataProviderWin::SetURL, which also sets CF_TEXT / STRING.
   bad_data.SetURL(GURL("x.org"), string16(ASCIIToUTF16("x")));
   bad_data.SetPickledData(GDK_SELECTION_PRIMARY, Pickle());
 #endif
   EXPECT_FALSE(textfield_view_->CanDrop(bad_data));
 }
 #endif
 
 #if !defined(TOUCH_UI)
-TEST_F(NativeTextfieldViewsTest, DragAndDrop_InitiateDrag) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_InitiateDrag) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello string world"));
 
   // Ensure the textfield will provide selected text for drag data.
   string16 string;
   ui::OSExchangeData data;
   textfield_->SelectSelectionModel(gfx::SelectionModel(6, 12));
   const gfx::Point kStringPoint(GetCursorPositionX(9), 0);
   textfield_view_->WriteDragDataForView(NULL, kStringPoint, &data);
   EXPECT_TRUE(data.GetString(&string));
@@ skipping 123 matching lines @@
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("", textfield_->text());
   SendKeyEvent(ui::VKEY_Y, false, true);
   EXPECT_STR_EQ("hello world", textfield_->text());
   SendKeyEvent(ui::VKEY_Y, false, true);
   EXPECT_STR_EQ("h worlellod", textfield_->text());
   SendKeyEvent(ui::VKEY_Y, false, true);
   EXPECT_STR_EQ("h worlellod", textfield_->text());
 }
 
-TEST_F(NativeTextfieldViewsTest, DragAndDrop_Canceled) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_Canceled) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
 
   // Start dragging "worl".
   textfield_->SelectSelectionModel(gfx::SelectionModel(6, 10));
   MouseEvent click(ui::ET_MOUSE_PRESSED, GetCursorPositionX(8), 0,
                    ui::EF_LEFT_BUTTON_DOWN);
   textfield_view_->OnMousePressed(click);
   ui::OSExchangeData data;
   textfield_view_->WriteDragDataForView(NULL, click.location(), &data);
@@ skipping 599 matching lines @@
   EXPECT_EQ(0U, textfield_->GetCursorPosition());
 #else
   EXPECT_EQ(500U, textfield_->GetCursorPosition());
 #endif
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views