diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 05:11:54 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 05:11:54 +0000 |
| commit | 81ad8eaac9d33c92acd40a710266d939d7deef3e (patch) | |
| tree | 4312e7ca0f809c8c5e63e34e3496934f8ade35c3 /views/controls | |
| parent | 1d37bd41e8a7b10d1ae7fade5e894d521ef27f37 (diff) | |
| download | chromium_src-81ad8eaac9d33c92acd40a710266d939d7deef3e.zip chromium_src-81ad8eaac9d33c92acd40a710266d939d7deef3e.tar.gz chromium_src-81ad8eaac9d33c92acd40a710266d939d7deef3e.tar.bz2 | |
Fix flakyness with TextfieldViewsModelTest.Clipboard.
Set the clipboard text initially rather than using
whatever happened to be in the clipboard at the time
of the test.
BUG=none
TEST=Copy some non-ASCII text before running TextfieldViewsModelTest.Clipboard.
Then, run the test. It should not fail.
Review URL: http://codereview.chromium.org/8486024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/textfield/textfield_views_model_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/views/controls/textfield/textfield_views_model_unittest.cc index d56f47b..991f595 100644 --- a/views/controls/textfield/textfield_views_model_unittest.cc +++ b/views/controls/textfield/textfield_views_model_unittest.cc @@ -510,8 +510,9 @@ TEST_F(TextfieldViewsModelTest, SetText) { TEST_F(TextfieldViewsModelTest, MAYBE_Clipboard) { ui::Clipboard* clipboard = views::ViewsDelegate::views_delegate->GetClipboard(); - string16 initial_clipboard_text; - clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &initial_clipboard_text); + string16 initial_clipboard_text = ASCIIToUTF16("initial text"); + ui::ScopedClipboardWriter(clipboard).WriteText(initial_clipboard_text); + string16 clipboard_text; TextfieldViewsModel model(NULL); model.Append(ASCIIToUTF16("HELLO WORLD")); |