Chromium Code Reviews| Index: ui/base/ime/input_method_ibus_unittest.cc |
| diff --git a/ui/base/ime/input_method_ibus_unittest.cc b/ui/base/ime/input_method_ibus_unittest.cc |
| index 0ed408611aa4bec53f9702c4d3a18ad3b447ba9f..ddec0b682e02dfecceed492956dcc2e6dba7e409 100644 |
| --- a/ui/base/ime/input_method_ibus_unittest.cc |
| +++ b/ui/base/ime/input_method_ibus_unittest.cc |
| @@ -1147,9 +1147,8 @@ TEST_F(InputMethodIBusTest, SurroundingText_NoSelectionTest) { |
| selection_range_ = ui::Range(3, 3); |
| // Set the verifier for SetSurroundingText mock call. |
| - SetSurroundingTextVerifier verifier(UTF16ToUTF8(surrounding_text_), |
| - selection_range_.start(), |
| - selection_range_.end()); |
| + SetSurroundingTextVerifier verifier(UTF16ToUTF8(surrounding_text_), 3, 3); |
| + |
| mock_ibus_input_context_client_->set_set_surrounding_text_handler( |
| base::Bind(&SetSurroundingTextVerifier::Verify, |
| @@ -1178,9 +1177,36 @@ TEST_F(InputMethodIBusTest, SurroundingText_SelectionTest) { |
| selection_range_ = ui::Range(2, 5); |
| // Set the verifier for SetSurroundingText mock call. |
| - SetSurroundingTextVerifier verifier(UTF16ToUTF8(surrounding_text_), |
| - selection_range_.start(), |
| - selection_range_.end()); |
| + SetSurroundingTextVerifier verifier(UTF16ToUTF8(surrounding_text_), 2, 5); |
| + |
| + mock_ibus_input_context_client_->set_set_surrounding_text_handler( |
| + base::Bind(&SetSurroundingTextVerifier::Verify, |
| + base::Unretained(&verifier))); |
| + ime_->OnCaretBoundsChanged(this); |
| + |
| + // Check the call count. |
| + EXPECT_EQ(1, |
| + mock_ibus_input_context_client_->set_surrounding_text_call_count()); |
| +} |
| + |
| +TEST_F(InputMethodIBusTest, SurroundingText_PartialText) { |
| + SetCreateContextSuccessHandler(); |
| + ime_->Init(true); |
| + // Click a text input form. |
| + input_type_ = TEXT_INPUT_TYPE_TEXT; |
| + ime_->OnTextInputTypeChanged(this); |
| + // Start the daemon. |
| + chromeos::DBusThreadManager::Get()->InitIBusBus("dummy address", |
| + base::Bind(&base::DoNothing)); |
| + mock_ibus_daemon_controller_->EmulateConnect(); |
| + |
| + // Set the TextInputClient behaviors. |
| + surrounding_text_ = UTF8ToUTF16("abcdefghij"); |
| + text_range_ = ui::Range(5, 10); |
| + selection_range_ = ui::Range(7, 9); |
| + |
| + // Set the verifier for SetSurroundingText mock call. |
| + SetSurroundingTextVerifier verifier("fghij", 2, 4); |
|
kinaba
2013/04/10 04:30:04
please add comment about how the (2, 4) came up.
Seigo Nonaka
2013/04/10 05:15:54
Done.
|
| mock_ibus_input_context_client_->set_set_surrounding_text_handler( |
| base::Bind(&SetSurroundingTextVerifier::Verify, |