| Index: chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc
|
| diff --git a/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc b/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc
|
| index 25f612c444d17fd21585a60e5475cfe3677014d8..fbb4e6e5ec50b7abb88b32bd22d598b6fc9f9b4a 100644
|
| --- a/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc
|
| +++ b/chrome/renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/stl_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/renderer/spellchecker/spellcheck_provider_test.h"
|
| -#include "components/spellcheck/common/spellcheck_marker.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
|
|
| @@ -20,9 +19,7 @@ namespace {
|
|
|
| TEST_F(SpellCheckProviderTest, UsingHunspell) {
|
| FakeTextCheckingCompletion completion;
|
| - provider_.RequestTextChecking(blink::WebString("hello"),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("hello"), &completion);
|
| EXPECT_EQ(completion.completion_count_, 1U);
|
| EXPECT_EQ(provider_.messages_.size(), 0U);
|
| EXPECT_EQ(provider_.pending_text_request_size(), 0U);
|
| @@ -36,47 +33,40 @@ TEST_F(SpellCheckProviderTest, MultiLineText) {
|
|
|
| // Verify that the SpellCheckProvider class does not spellcheck empty text.
|
| provider_.ResetResult();
|
| - provider_.RequestTextChecking(
|
| - blink::WebString(), &completion, std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString(), &completion);
|
| EXPECT_TRUE(provider_.text_.empty());
|
|
|
| // Verify that the SpellCheckProvider class does not spellcheck text while we
|
| // are typing a word.
|
| provider_.ResetResult();
|
| - provider_.RequestTextChecking(
|
| - blink::WebString("First"), &completion, std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("First"), &completion);
|
| EXPECT_TRUE(provider_.text_.empty());
|
|
|
| // Verify that the SpellCheckProvider class spellcheck the first word when we
|
| // type a space key, i.e. when we finish typing a word.
|
| provider_.ResetResult();
|
| - provider_.RequestTextChecking(blink::WebString("First "),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("First "), &completion);
|
| EXPECT_EQ(ASCIIToUTF16("First "), provider_.text_);
|
|
|
| // Verify that the SpellCheckProvider class spellcheck the first line when we
|
| // type a return key, i.e. when we finish typing a line.
|
| provider_.ResetResult();
|
| provider_.RequestTextChecking(blink::WebString("First Second\n"),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + &completion);
|
| EXPECT_EQ(ASCIIToUTF16("First Second\n"), provider_.text_);
|
|
|
| // Verify that the SpellCheckProvider class spellcheck the lines when we
|
| // finish typing a word "Third" to the second line.
|
| provider_.ResetResult();
|
| provider_.RequestTextChecking(blink::WebString("First Second\nThird "),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + &completion);
|
| EXPECT_EQ(ASCIIToUTF16("First Second\nThird "), provider_.text_);
|
|
|
| // Verify that the SpellCheckProvider class does not send a spellcheck request
|
| // when a user inserts whitespace characters.
|
| provider_.ResetResult();
|
| provider_.RequestTextChecking(blink::WebString("First Second\nThird "),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + &completion);
|
| EXPECT_TRUE(provider_.text_.empty());
|
|
|
| // Verify that the SpellCheckProvider class spellcheck the lines when we type
|
| @@ -84,8 +74,7 @@ TEST_F(SpellCheckProviderTest, MultiLineText) {
|
| provider_.ResetResult();
|
| provider_.RequestTextChecking(
|
| blink::WebString("First Second\nThird Fourth."),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + &completion);
|
| EXPECT_EQ(ASCIIToUTF16("First Second\nThird Fourth."), provider_.text_);
|
| }
|
|
|
| @@ -93,27 +82,21 @@ TEST_F(SpellCheckProviderTest, MultiLineText) {
|
| // spelling service when not necessary.
|
| TEST_F(SpellCheckProviderTest, CancelUnnecessaryRequests) {
|
| FakeTextCheckingCompletion completion;
|
| - provider_.RequestTextChecking(blink::WebString("hello."),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("hello."), &completion);
|
| EXPECT_EQ(completion.completion_count_, 1U);
|
| EXPECT_EQ(completion.cancellation_count_, 0U);
|
| EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
|
|
|
| // Test that the SpellCheckProvider does not send a request with the same text
|
| // as above.
|
| - provider_.RequestTextChecking(blink::WebString("hello."),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("hello."), &completion);
|
| EXPECT_EQ(completion.completion_count_, 2U);
|
| EXPECT_EQ(completion.cancellation_count_, 0U);
|
| EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
|
|
|
| // Test that the SpellCheckProvider class cancels an incoming request that
|
| // does not include any words.
|
| - provider_.RequestTextChecking(blink::WebString(":-)"),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString(":-)"), &completion);
|
| EXPECT_EQ(completion.completion_count_, 3U);
|
| EXPECT_EQ(completion.cancellation_count_, 1U);
|
| EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
|
| @@ -122,8 +105,7 @@ TEST_F(SpellCheckProviderTest, CancelUnnecessaryRequests) {
|
| // Russian word.
|
| const wchar_t kRussianWord[] = L"\x0431\x0451\x0434\x0440\x0430";
|
| provider_.RequestTextChecking(blink::WebString(WideToUTF16(kRussianWord)),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + &completion);
|
| EXPECT_EQ(completion.completion_count_, 4U);
|
| EXPECT_EQ(completion.cancellation_count_, 1U);
|
| EXPECT_EQ(provider_.spelling_service_call_count_, 2U);
|
| @@ -135,21 +117,17 @@ TEST_F(SpellCheckProviderTest, CompleteNecessaryRequests) {
|
| FakeTextCheckingCompletion completion;
|
|
|
| base::string16 text = ASCIIToUTF16("Icland is an icland ");
|
| - provider_.RequestTextChecking(
|
| - blink::WebString(text), &completion, std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString(text), &completion);
|
| EXPECT_EQ(0U, completion.cancellation_count_) << "Should finish checking \""
|
| << text << "\"";
|
|
|
| const int kSubstringLength = 18;
|
| base::string16 substring = text.substr(0, kSubstringLength);
|
| - provider_.RequestTextChecking(blink::WebString(substring),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString(substring), &completion);
|
| EXPECT_EQ(0U, completion.cancellation_count_) << "Should finish checking \""
|
| << substring << "\"";
|
|
|
| - provider_.RequestTextChecking(
|
| - blink::WebString(text), &completion, std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString(text), &completion);
|
| EXPECT_EQ(0U, completion.cancellation_count_) << "Should finish checking \""
|
| << text << "\"";
|
| }
|
| @@ -158,23 +136,17 @@ TEST_F(SpellCheckProviderTest, CompleteNecessaryRequests) {
|
| // a word.
|
| TEST_F(SpellCheckProviderTest, CancelMidWordRequests) {
|
| FakeTextCheckingCompletion completion;
|
| - provider_.RequestTextChecking(blink::WebString("hello "),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("hello "), &completion);
|
| EXPECT_EQ(completion.completion_count_, 1U);
|
| EXPECT_EQ(completion.cancellation_count_, 0U);
|
| EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
|
|
|
| - provider_.RequestTextChecking(blink::WebString("hello world"),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("hello world"), &completion);
|
| EXPECT_EQ(completion.completion_count_, 2U);
|
| EXPECT_EQ(completion.cancellation_count_, 1U);
|
| EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
|
|
|
| - provider_.RequestTextChecking(blink::WebString("hello world."),
|
| - &completion,
|
| - std::vector<SpellCheckMarker>());
|
| + provider_.RequestTextChecking(blink::WebString("hello world."), &completion);
|
| EXPECT_EQ(completion.completion_count_, 3U);
|
| EXPECT_EQ(completion.cancellation_count_, 1U);
|
| EXPECT_EQ(provider_.spelling_service_call_count_, 2U);
|
|
|