| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <tuple> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/spellchecker/spellcheck_factory.h" | 12 #include "chrome/browser/spellchecker/spellcheck_factory.h" |
| 11 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" | 13 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" |
| 12 #include "chrome/browser/spellchecker/spellcheck_service.h" | 14 #include "chrome/browser/spellchecker/spellcheck_service.h" |
| 13 #include "chrome/common/spellcheck_marker.h" | 15 #include "chrome/common/spellcheck_marker.h" |
| 14 #include "chrome/common/spellcheck_messages.h" | 16 #include "chrome/common/spellcheck_messages.h" |
| 15 #include "chrome/test/base/testing_profile.h" | 17 #include "chrome/test/base/testing_profile.h" |
| 16 #include "content/public/test/test_browser_thread_bundle.h" | 18 #include "content/public/test/test_browser_thread_bundle.h" |
| 17 #include "ipc/ipc_message.h" | 19 #include "ipc/ipc_message.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 scoped_refptr<TestingSpellCheckMessageFilter> filter( | 103 scoped_refptr<TestingSpellCheckMessageFilter> filter( |
| 102 new TestingSpellCheckMessageFilter); | 104 new TestingSpellCheckMessageFilter); |
| 103 filter->GetSpellcheckService()->GetCustomDictionary()->AddWord(kCustomWord); | 105 filter->GetSpellcheckService()->GetCustomDictionary()->AddWord(kCustomWord); |
| 104 filter->OnTextCheckComplete( | 106 filter->OnTextCheckComplete( |
| 105 kRouteId, kCallbackId, kMarkers, kSuccess, kText, results); | 107 kRouteId, kCallbackId, kMarkers, kSuccess, kText, results); |
| 106 EXPECT_EQ(static_cast<size_t>(1), filter->sent_messages.size()); | 108 EXPECT_EQ(static_cast<size_t>(1), filter->sent_messages.size()); |
| 107 | 109 |
| 108 SpellCheckMsg_RespondSpellingService::Param params; | 110 SpellCheckMsg_RespondSpellingService::Param params; |
| 109 bool ok = SpellCheckMsg_RespondSpellingService::Read( | 111 bool ok = SpellCheckMsg_RespondSpellingService::Read( |
| 110 filter->sent_messages[0], ¶ms); | 112 filter->sent_messages[0], ¶ms); |
| 111 int sent_identifier = base::get<0>(params); | 113 int sent_identifier = std::get<0>(params); |
| 112 bool sent_success = base::get<1>(params); | 114 bool sent_success = std::get<1>(params); |
| 113 base::string16 sent_text = base::get<2>(params); | 115 base::string16 sent_text = std::get<2>(params); |
| 114 std::vector<SpellCheckResult> sent_results = base::get<3>(params); | 116 std::vector<SpellCheckResult> sent_results = std::get<3>(params); |
| 115 EXPECT_TRUE(ok); | 117 EXPECT_TRUE(ok); |
| 116 EXPECT_EQ(kCallbackId, sent_identifier); | 118 EXPECT_EQ(kCallbackId, sent_identifier); |
| 117 EXPECT_EQ(kSuccess, sent_success); | 119 EXPECT_EQ(kSuccess, sent_success); |
| 118 EXPECT_EQ(kText, sent_text); | 120 EXPECT_EQ(kText, sent_text); |
| 119 EXPECT_EQ(static_cast<size_t>(1), sent_results.size()); | 121 EXPECT_EQ(static_cast<size_t>(1), sent_results.size()); |
| 120 EXPECT_EQ(kDecoration, sent_results[0].decoration); | 122 EXPECT_EQ(kDecoration, sent_results[0].decoration); |
| 121 EXPECT_EQ(kLocation, sent_results[0].location); | 123 EXPECT_EQ(kLocation, sent_results[0].location); |
| 122 EXPECT_EQ(kLength, sent_results[0].length); | 124 EXPECT_EQ(kLength, sent_results[0].length); |
| 123 EXPECT_EQ(kReplacement, sent_results[0].replacement); | 125 EXPECT_EQ(kReplacement, sent_results[0].replacement); |
| 124 } | 126 } |
| 125 | 127 |
| 126 TEST(SpellCheckMessageFilterTest, OnTextCheckCompleteTest) { | 128 TEST(SpellCheckMessageFilterTest, OnTextCheckCompleteTest) { |
| 127 std::vector<SpellCheckResult> results; | 129 std::vector<SpellCheckResult> results; |
| 128 results.push_back(SpellCheckResult( | 130 results.push_back(SpellCheckResult( |
| 129 SpellCheckResult::SPELLING, 0, 6, base::ASCIIToUTF16("Hello"))); | 131 SpellCheckResult::SPELLING, 0, 6, base::ASCIIToUTF16("Hello"))); |
| 130 results.push_back(SpellCheckResult( | 132 results.push_back(SpellCheckResult( |
| 131 SpellCheckResult::SPELLING, 7, 7, base::ASCIIToUTF16("world"))); | 133 SpellCheckResult::SPELLING, 7, 7, base::ASCIIToUTF16("world"))); |
| 132 | 134 |
| 133 scoped_refptr<TestingSpellCheckMessageFilter> filter( | 135 scoped_refptr<TestingSpellCheckMessageFilter> filter( |
| 134 new TestingSpellCheckMessageFilter); | 136 new TestingSpellCheckMessageFilter); |
| 135 filter->OnTextCheckComplete(1, 1, std::vector<SpellCheckMarker>(), | 137 filter->OnTextCheckComplete(1, 1, std::vector<SpellCheckMarker>(), |
| 136 true, base::ASCIIToUTF16("Helllo walrd"), results); | 138 true, base::ASCIIToUTF16("Helllo walrd"), results); |
| 137 EXPECT_EQ(static_cast<size_t>(1), filter->sent_messages.size()); | 139 EXPECT_EQ(static_cast<size_t>(1), filter->sent_messages.size()); |
| 138 | 140 |
| 139 SpellCheckMsg_RespondSpellingService::Param params; | 141 SpellCheckMsg_RespondSpellingService::Param params; |
| 140 bool ok = SpellCheckMsg_RespondSpellingService::Read( | 142 bool ok = SpellCheckMsg_RespondSpellingService::Read( |
| 141 filter->sent_messages[0], & params); | 143 filter->sent_messages[0], & params); |
| 142 base::string16 sent_text = base::get<2>(params); | 144 base::string16 sent_text = std::get<2>(params); |
| 143 std::vector<SpellCheckResult> sent_results = base::get<3>(params); | 145 std::vector<SpellCheckResult> sent_results = std::get<3>(params); |
| 144 EXPECT_TRUE(ok); | 146 EXPECT_TRUE(ok); |
| 145 EXPECT_EQ(static_cast<size_t>(2), sent_results.size()); | 147 EXPECT_EQ(static_cast<size_t>(2), sent_results.size()); |
| 146 } | 148 } |
| 147 #endif | 149 #endif |
| OLD | NEW |