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

Unified Diff: chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc

Issue 2177343002: Componentize spellcheck [2]: move common/ files to component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move message generator to component Created 4 years, 5 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
Index: chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
index 8ed2ebe6a4b428fa3264754f3578d9cb61496073..ae3435c33bfac773ad2d9ea31d23fd021781f641 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
@@ -22,8 +22,8 @@
#include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
#include "chrome/browser/spellchecker/spellcheck_service.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/spellcheck_common.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/spellcheck/common/spellcheck_common.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/url_request/test_url_fetcher_factory.h"
#include "sync/api/sync_change.h"
@@ -334,33 +334,31 @@ TEST_F(SpellcheckCustomDictionaryTest, GetAllSyncDataHasLimit) {
&profile_)->GetCustomDictionary();
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
- i++) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS - 1; i++) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*dictionary, change);
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS - 1,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
dictionary->AddWord("baz");
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
dictionary->AddWord("bar");
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
dictionary->AddWord("snafoo");
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 2,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 2,
dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
dictionary->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -449,17 +447,13 @@ TEST_F(SpellcheckCustomDictionaryTest, MergeDataAndStartSyncing) {
spellcheck_service2->GetCustomDictionary();
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS / 2; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*custom_dictionary, change);
SpellcheckCustomDictionary::Change change2;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS / 2; ++i) {
change2.AddWord("bar" + base::Uint64ToString(i));
}
Apply(*custom_dictionary2, change2);
@@ -550,9 +544,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigBeforeSyncing) {
spellcheck_service2->GetCustomDictionary();
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*custom_dictionary, change);
@@ -572,14 +564,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigBeforeSyncing) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -598,9 +590,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigAndServerFull) {
SpellcheckCustomDictionary::Change change;
SpellcheckCustomDictionary::Change change2;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
change2.AddWord("bar" + base::Uint64ToString(i));
}
@@ -608,9 +598,9 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigAndServerFull) {
Apply(*custom_dictionary, change);
Apply(*custom_dictionary2, change2);
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
int error_counter = 0;
@@ -628,14 +618,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigAndServerFull) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -654,18 +644,16 @@ TEST_F(SpellcheckCustomDictionaryTest, ServerTooBig) {
SpellcheckCustomDictionary::Change change;
SpellcheckCustomDictionary::Change change2;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
change2.AddWord("bar" + base::Uint64ToString(i));
}
Apply(*custom_dictionary, change);
Apply(*custom_dictionary2, change2);
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary2->GetWords().size());
int error_counter = 0;
@@ -683,14 +671,14 @@ TEST_F(SpellcheckCustomDictionaryTest, ServerTooBig) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 2,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS * 2 + 2,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -708,9 +696,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToStartSyncing) {
spellcheck_service2->GetCustomDictionary();
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS - 1; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*custom_dictionary, change);
@@ -733,14 +719,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToStartSyncing) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -758,9 +744,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToContiueSyncing) {
spellcheck_service2->GetCustomDictionary();
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS - 1;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS - 1; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*custom_dictionary, change);
@@ -788,14 +772,14 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToContiueSyncing) {
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -874,23 +858,21 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadAfterSyncStartTooBigToSync) {
std::unique_ptr<std::set<std::string>> custom_words(
new std::set<std::string>);
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS; ++i) {
custom_words->insert(custom_words->end(), "foo" + base::Uint64ToString(i));
}
OnLoaded(*custom_dictionary, std::move(custom_words));
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS + 1,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -908,9 +890,7 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadDuplicatesAfterSync) {
spellcheck_service2->GetCustomDictionary();
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS / 2; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*custom_dictionary, change);
@@ -935,14 +915,14 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadDuplicatesAfterSync) {
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary2->GetWords().size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary->GetAllSyncData(syncer::DICTIONARY).size());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS / 2,
custom_dictionary2->GetAllSyncData(syncer::DICTIONARY).size());
}
@@ -1083,9 +1063,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
spellcheck_service->GetCustomDictionary();
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS; ++i) {
change.AddWord("foo" + base::Uint64ToString(i));
}
Apply(*custom_dictionary, change);
@@ -1105,12 +1083,12 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
.IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
custom_dictionary->GetWords().size());
}
// The sync server now has the maximum number of words.
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
server_custom_dictionary->GetWords().size());
// Associate the sync server with a client that also has the maximum number of
@@ -1130,9 +1108,7 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
// Add the maximum number of words to the client. These words are all
// different from those on the server.
SpellcheckCustomDictionary::Change change;
- for (size_t i = 0;
- i < chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
- ++i) {
+ for (size_t i = 0; i < spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS; ++i) {
change.AddWord("bar" + base::Uint64ToString(i));
}
Apply(*client_custom_dictionary, change);
@@ -1153,13 +1129,13 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
.IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(client_custom_dictionary->IsSyncing());
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS * 2,
client_custom_dictionary->GetWords().size());
}
// The sync server should not receive more words, because it has the maximum
// number of words already.
- EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
+ EXPECT_EQ(spellcheck::MAX_SYNCABLE_DICTIONARY_WORDS,
server_custom_dictionary->GetWords().size());
}

Powered by Google App Engine
This is Rietveld 408576698