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

Side by Side Diff: sync/protocol/proto_value_conversions_unittest.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/notifier/sync_notifier_observer.h ('k') | sync/protocol/sync_protocol_error.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Keep this file in sync with the .proto files in this directory. 5 // Keep this file in sync with the .proto files in this directory.
6 6
7 #include "sync/protocol/proto_value_conversions.h" 7 #include "sync/protocol/proto_value_conversions.h"
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 29 matching lines...) Expand all
40 // We can't do much but make sure that the returned value has 40 // We can't do much but make sure that the returned value has
41 // something in it. 41 // something in it.
42 EXPECT_FALSE(value->empty()); 42 EXPECT_FALSE(value->empty());
43 } 43 }
44 }; 44 };
45 45
46 TEST_F(ProtoValueConversionsTest, ProtoChangeCheck) { 46 TEST_F(ProtoValueConversionsTest, ProtoChangeCheck) {
47 // If this number changes, that means we added or removed a data 47 // If this number changes, that means we added or removed a data
48 // type. Don't forget to add a unit test for {New 48 // type. Don't forget to add a unit test for {New
49 // type}SpecificsToValue below. 49 // type}SpecificsToValue below.
50 EXPECT_EQ(17, syncer::MODEL_TYPE_COUNT); 50 EXPECT_EQ(17, MODEL_TYPE_COUNT);
51 51
52 // We'd also like to check if we changed any field in our messages. 52 // We'd also like to check if we changed any field in our messages.
53 // However, that's hard to do: sizeof could work, but it's 53 // However, that's hard to do: sizeof could work, but it's
54 // platform-dependent. default_instance().ByteSize() won't change 54 // platform-dependent. default_instance().ByteSize() won't change
55 // for most changes, since most of our fields are optional. So we 55 // for most changes, since most of our fields are optional. So we
56 // just settle for comments in the proto files. 56 // just settle for comments in the proto files.
57 } 57 }
58 58
59 TEST_F(ProtoValueConversionsTest, EncryptedDataToValue) { 59 TEST_F(ProtoValueConversionsTest, EncryptedDataToValue) {
60 TestSpecificsToValue(EncryptedDataToValue); 60 TestSpecificsToValue(EncryptedDataToValue);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 SET_FIELD(password); 176 SET_FIELD(password);
177 SET_FIELD(preference); 177 SET_FIELD(preference);
178 SET_FIELD(search_engine); 178 SET_FIELD(search_engine);
179 SET_FIELD(session); 179 SET_FIELD(session);
180 SET_FIELD(theme); 180 SET_FIELD(theme);
181 SET_FIELD(typed_url); 181 SET_FIELD(typed_url);
182 182
183 #undef SET_FIELD 183 #undef SET_FIELD
184 184
185 scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(specifics)); 185 scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(specifics));
186 EXPECT_EQ(syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, 186 EXPECT_EQ(MODEL_TYPE_COUNT - FIRST_REAL_MODEL_TYPE,
187 static_cast<int>(value->size())); 187 static_cast<int>(value->size()));
188 } 188 }
189 189
190 namespace { 190 namespace {
191 // Returns whether the given value has specifics under the entries in the given 191 // Returns whether the given value has specifics under the entries in the given
192 // path. 192 // path.
193 bool ValueHasSpecifics(const DictionaryValue& value, 193 bool ValueHasSpecifics(const DictionaryValue& value,
194 const std::string& path) { 194 const std::string& path) {
195 ListValue* entities_list = NULL; 195 ListValue* entities_list = NULL;
196 DictionaryValue* entry_dictionary = NULL; 196 DictionaryValue* entry_dictionary = NULL;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 244
245 scoped_ptr<DictionaryValue> value_without_specifics( 245 scoped_ptr<DictionaryValue> value_without_specifics(
246 ClientToServerResponseToValue(message, false /* include_specifics */)); 246 ClientToServerResponseToValue(message, false /* include_specifics */));
247 EXPECT_FALSE(value_without_specifics->empty()); 247 EXPECT_FALSE(value_without_specifics->empty());
248 EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()), 248 EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()),
249 "get_updates.entries")); 249 "get_updates.entries"));
250 } 250 }
251 251
252 } // namespace 252 } // namespace
253 } // namespace syncer 253 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/notifier/sync_notifier_observer.h ('k') | sync/protocol/sync_protocol_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698