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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 151963002: Remove duplicated code from sync related unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed a const qualifier. Created 6 years, 10 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
« no previous file with comments | « chrome/browser/search_engines/template_url_service_sync_unittest.cc ('k') | chrome/browser/sync/glue/favicon_cache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 df75fb56ed48fd7e7e797e6856fe431bd756803f..9323be7470409a4450f676928cd8b4f04338521e 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
@@ -18,6 +18,7 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/url_request/test_url_fetcher_factory.h"
#include "sync/api/sync_change.h"
+#include "sync/api/sync_change_processor_wrapper_for_test.h"
#include "sync/api/sync_data.h"
#include "sync/api/sync_error_factory.h"
#include "sync/api/sync_error_factory_mock.h"
@@ -111,32 +112,6 @@ class SpellcheckCustomDictionaryTest : public testing::Test {
net::TestURLFetcherFactory fetcher_factory_;
};
-// A wrapper around SpellcheckCustomDictionary that does not own the wrapped
-// object. An instance of this class can be inside of a scoped pointer safely
-// while the dictionary is managed by another scoped pointer.
-class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor {
- public:
- explicit SyncChangeProcessorDelegate(SpellcheckCustomDictionary* dictionary)
- : dictionary_(dictionary) {}
- virtual ~SyncChangeProcessorDelegate() {}
-
- // Overridden from syncer::SyncChangeProcessor:
- virtual syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
- const syncer::SyncChangeList& change_list) OVERRIDE {
- return dictionary_->ProcessSyncChanges(from_here, change_list);
- }
-
- virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
- OVERRIDE {
- return syncer::SyncDataList();
- }
-
- private:
- SpellcheckCustomDictionary* dictionary_;
- DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate);
-};
-
// An implementation of SyncErrorFactory that does not upload the error message
// and updates an outside error counter. This lets us know the number of error
// messages in an instance of this class after that instance is deleted.
@@ -485,13 +460,18 @@ TEST_F(SpellcheckCustomDictionaryTest, MergeDataAndStartSyncing) {
Apply(*custom_dictionary2, change2);
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
@@ -523,13 +503,18 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigBeforeSyncing) {
Apply(*custom_dictionary, change);
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
@@ -575,13 +560,18 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigAndServerFull) {
custom_dictionary2->GetWords().size());
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
@@ -626,13 +616,17 @@ TEST_F(SpellcheckCustomDictionaryTest, ServerTooBig) {
custom_dictionary2->GetWords().size());
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- GetAllSyncDataNoLimit(custom_dictionary2),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ GetAllSyncDataNoLimit(custom_dictionary2),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
@@ -672,13 +666,18 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToStartSyncing) {
custom_dictionary2->AddWord("baz");
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(custom_dictionary->IsSyncing());
@@ -715,13 +714,18 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionaryTooBigToContiueSyncing) {
Apply(*custom_dictionary, change);
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
@@ -760,13 +764,18 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadAfterSyncStart) {
custom_dictionary->AddWord("foo");
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
@@ -798,13 +807,18 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadAfterSyncStartTooBigToSync) {
custom_dictionary->AddWord("foo");
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
@@ -851,13 +865,18 @@ TEST_F(SpellcheckCustomDictionaryTest, LoadDuplicatesAfterSync) {
Apply(*custom_dictionary, SpellcheckCustomDictionary::Change(to_add));
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
@@ -968,13 +987,18 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncNotification) {
custom_dictionary2->AddObserver(&observer2);
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- custom_dictionary2->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(custom_dictionary2)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ custom_dictionary2->GetAllSyncData(
+ syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ custom_dictionary2)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
@@ -1016,13 +1040,18 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
Apply(*custom_dictionary, change);
int error_counter = 0;
- EXPECT_FALSE(custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- server_custom_dictionary->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(server_custom_dictionary)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ custom_dictionary
+ ->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ server_custom_dictionary->GetAllSyncData(syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ server_custom_dictionary)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_TRUE(custom_dictionary->IsSyncing());
EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS,
@@ -1059,13 +1088,18 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) {
// Associate the server and the client.
int error_counter = 0;
- EXPECT_FALSE(client_custom_dictionary->MergeDataAndStartSyncing(
- syncer::DICTIONARY,
- server_custom_dictionary->GetAllSyncData(syncer::DICTIONARY),
- scoped_ptr<syncer::SyncChangeProcessor>(
- new SyncChangeProcessorDelegate(server_custom_dictionary)),
- scoped_ptr<syncer::SyncErrorFactory>(
- new SyncErrorFactoryStub(&error_counter))).error().IsSet());
+ EXPECT_FALSE(
+ client_custom_dictionary
+ ->MergeDataAndStartSyncing(
+ syncer::DICTIONARY,
+ server_custom_dictionary->GetAllSyncData(syncer::DICTIONARY),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::SyncChangeProcessorWrapperForTest(
+ server_custom_dictionary)),
+ scoped_ptr<syncer::SyncErrorFactory>(
+ new SyncErrorFactoryStub(&error_counter)))
+ .error()
+ .IsSet());
EXPECT_EQ(0, error_counter);
EXPECT_FALSE(client_custom_dictionary->IsSyncing());
EXPECT_EQ(chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS * 2,
« no previous file with comments | « chrome/browser/search_engines/template_url_service_sync_unittest.cc ('k') | chrome/browser/sync/glue/favicon_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698