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

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

Issue 6004010: Implement clipboard features in views textfield. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: code style fixes Created 9 years, 11 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/textfield/textfield_views_model.cc ('k') | views/test/test_views_delegate.h » ('j') | 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 fa09efa745fda63c7676143574b4f0622d282434..388c8c3953fb7e8bd6448f72036c251013c2af26 100644
--- a/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/views/controls/textfield/textfield_views_model_unittest.cc
@@ -2,9 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/message_loop.h"
+#include "base/scoped_ptr.h"
#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/clipboard/clipboard.h"
+#include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "views/controls/textfield/textfield_views_model.h"
+#include "views/test/test_views_delegate.h"
+#include "views/views_delegate.h"
namespace views {
@@ -282,4 +288,57 @@ TEST(TextfieldViewsModelTest, SetText) {
EXPECT_EQ(0U, model.cursor_pos());
}
+TEST(TextfieldViewsModelTest, Clipboard) {
+ views::ViewsDelegate::views_delegate = new TestViewsDelegate();
+ ui::Clipboard* clipboard
+ = views::ViewsDelegate::views_delegate->GetClipboard();
+ string16 initial_clipboard_text;
+ clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &initial_clipboard_text);
+ string16 clipboard_text;
+ TextfieldViewsModel model;
+ model.Append(ASCIIToUTF16("HELLO WORLD"));
+ model.MoveCursorToEnd(false);
+
+ // Test for cut: Empty selection.
+ EXPECT_FALSE(model.Cut());
+ clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
+ EXPECT_STR_EQ(UTF16ToUTF8(initial_clipboard_text), clipboard_text);
+ EXPECT_STR_EQ("HELLO WORLD", model.text());
+ EXPECT_EQ(11U, model.cursor_pos());
+
+ // Test for cut: Non-empty selection.
+ model.MoveCursorToPreviousWord(true);
+ EXPECT_TRUE(model.Cut());
+ clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
+ EXPECT_STR_EQ("WORLD", clipboard_text);
+ EXPECT_STR_EQ("HELLO ", model.text());
+ EXPECT_EQ(6U, model.cursor_pos());
+
+ // Test for copy: Empty selection.
+ model.Copy();
+ clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
+ EXPECT_STR_EQ("WORLD", clipboard_text);
+ EXPECT_STR_EQ("HELLO ", model.text());
+ EXPECT_EQ(6U, model.cursor_pos());
+
+ // Test for copy: Non-empty selection.
+ model.Append(ASCIIToUTF16("HELLO WORLD"));
+ model.SelectAll();
+ model.Copy();
+ clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
+ EXPECT_STR_EQ("HELLO HELLO WORLD", clipboard_text);
+ EXPECT_STR_EQ("HELLO HELLO WORLD", model.text());
+ EXPECT_EQ(0U, model.cursor_pos());
+
+ // Test for paste.
+ model.ClearSelection();
+ model.MoveCursorToEnd(false);
+ model.MoveCursorToPreviousWord(true);
+ EXPECT_TRUE(model.Paste());
+ clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
+ EXPECT_STR_EQ("HELLO HELLO WORLD", clipboard_text);
+ EXPECT_STR_EQ("HELLO HELLO HELLO HELLO WORLD", model.text());
+ EXPECT_EQ(29U, model.cursor_pos());
+}
+
} // namespace views
« no previous file with comments | « views/controls/textfield/textfield_views_model.cc ('k') | views/test/test_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698