Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: views/controls/textfield/native_textfield_views_unittest.cc

Issue 8143021: aura: Fix views_unittests on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mark test as DISABLED_ rather than FAILED_ Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d2da8921524913322099629788fa56a195cb6660..2cdf465f25d2a6df7d1dda146cac67530c29e63e 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -34,24 +34,26 @@
#include "views/widget/native_widget_private.h"
#include "views/widget/widget.h"
-// Bug 99128.
+// Bugs http://crbug.com/99128, and http://crbug.com/97845
#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
+#define MAYBE_KeyTest DISABLED_KeyTest
sky 2011/10/05 20:28:03 These don't crash on windows (as far as I know). C
sadrul 2011/10/05 20:42:36 It turns out just the drag-n-drop related tests cr
+#define MAYBE_ControlAndSelectTest DISABLED_ControlAndSelectTest
+#define MAYBE_InsertionDeletionTest DISABLED_InsertionDeletionTest
+#define MAYBE_OnKeyPressReturnValueTest DISABLED_OnKeyPressReturnValueTest
+#define MAYBE_CursorMovement DISABLED_CursorMovement
+#define MAYBE_DragAndDrop_ToTheRight DISABLED_DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_ToTheLeft DISABLED_DragAndDrop_ToTheLeft
+#define MAYBE_ReadOnlyTest DISABLED_ReadOnlyTest
+#define MAYBE_TextInputClientTest DISABLED_TextInputClientTest
+#define MAYBE_UndoRedoTest DISABLED_UndoRedoTest
+#define MAYBE_TextCursorDisplayTest DISABLED_TextCursorDisplayTest
+#define MAYBE_TextCursorDisplayInRTLTest DISABLED_TextCursorDisplayInRTLTest
+#define MAYBE_HitOutsideTextAreaTest DISABLED_HitOutsideTextAreaTest
+#define MAYBE_HitOutsideTextAreaInRTLTest DISABLED_HitOutsideTextAreaInRTLTest
+#define MAYBE_OverflowTest DISABLED_OverflowTest
+#define MAYBE_OverflowInRTLTest DISABLED_OverflowInRTLTest
+#define MAYBE_DragAndDrop_InitiateDrag DISABLED_DragAndDrop_InitiateDrag
+#define MAYBE_DragAndDrop_Canceled DISABLED_DragAndDrop_Canceled
#else
#define MAYBE_KeyTest KeyTest
#define MAYBE_ControlAndSelectTest ControlAndSelectTest
@@ -810,7 +812,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_AcceptDrop) {
#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"));
@@ -954,7 +956,7 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_ToTheLeft) {
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"));
« no previous file with comments | « views/controls/scrollbar/native_scroll_bar_wayland.cc ('k') | views/controls/textfield/textfield_views_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698