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

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

Issue 8143021: aura: Fix views_unittests on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed textfield tests changes 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
« no previous file with comments | « views/controls/scrollbar/native_scroll_bar_wayland.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/textfield/textfield_views_model_unittest.cc
diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/views/controls/textfield/textfield_views_model_unittest.cc
index 3eba578773e9f9193bc1ccfebb1941e55b41c0a3..36f8fe64fe2050339f62413510939fa32c5d1c69 100644
--- a/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/views/controls/textfield/textfield_views_model_unittest.cc
@@ -502,7 +502,12 @@ TEST_F(TextfieldViewsModelTest, SetText) {
EXPECT_EQ(0U, model.GetCursorPosition());
}
-TEST_F(TextfieldViewsModelTest, Clipboard) {
+#if defined(USE_AURA) && defined(OS_LINUX)
+#define MAYBE_Clipboard DISABLED_Clipboard // http://crbug.com/97845
+#else
+#define MAYBE_Clipboard Clipboard
+#endif
+TEST_F(TextfieldViewsModelTest, MAYBE_Clipboard) {
ui::Clipboard* clipboard
= views::ViewsDelegate::views_delegate->GetClipboard();
string16 initial_clipboard_text;
@@ -1055,7 +1060,14 @@ TEST_F(TextfieldViewsModelTest, UndoRedo_SetText) {
EXPECT_FALSE(model.Redo());
}
-TEST_F(TextfieldViewsModelTest, UndoRedo_CutCopyPasteTest) {
+#if defined(USE_AURA) && defined(OS_LINUX)
+// This can be re-enabled when aura on linux has clipboard support.
+// http://crbug.com/97845
+#define MAYBE_UndoRedo_CutCopyPasteTest DISABLED_UndoRedo_CutCopyPasteTest
+#else
+#define MAYBE_UndoRedo_CutCopyPasteTest UndoRedo_CutCopyPasteTest
+#endif
+TEST_F(TextfieldViewsModelTest, MAYBE_UndoRedo_CutCopyPasteTest) {
TextfieldViewsModel model(NULL);
model.SetText(ASCIIToUTF16("ABCDE"));
EXPECT_FALSE(model.Redo()); // nothing to redo
« no previous file with comments | « views/controls/scrollbar/native_scroll_bar_wayland.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698