Log the sync communication that happens between client and server.

sync/protocol/proto_value_conversions_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_value_conversions.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ skipping 169 matching lines @@
   SET_FIELD(theme);
   SET_FIELD(typed_url);
 
 #undef SET_FIELD
 
   scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(specifics));
   EXPECT_EQ(syncable::MODEL_TYPE_COUNT - syncable::FIRST_REAL_MODEL_TYPE,
             static_cast<int>(value->size()));
 }
 
+namespace {
+void VerifySpecifics(DictionaryValue* value,

[akalin, 2012/03/19 21:31:38]

I think it would be cleaner to have this something like:

// Returns whether the given value has specifics under the entries in the given
path.
bool ValueHasSpecifics(const DictionaryValue& value, const std::string&
entries_path) {
  ...

  return entry_dictionary->GetDictionary(...);
}

and move the asserts to the tests themselves

[lipalani1, 2012/03/20 19:24:41]

Done.

+                     const std::string& path,
+                     bool include_specifics) {
+  ListValue* entities_list;

[akalin, 2012/03/19 21:31:38]

initialize to NULL

[lipalani1, 2012/03/20 19:24:41]

Done.

+  DictionaryValue* entry_dictionary;
+  DictionaryValue* specifics_dictionary;
+  EXPECT_TRUE(value->GetList(path, &entities_list));

[akalin, 2012/03/19 21:31:38]

use

if(!...) {
  return false;
}

[lipalani1, 2012/03/20 19:24:41]

Done.

+  EXPECT_TRUE(entities_list->GetDictionary(0, &entry_dictionary));
+  EXPECT_EQ(entry_dictionary->GetDictionary("specifics",
+                                            &specifics_dictionary),
+            include_specifics);
+}
+}  // namespace
+
+TEST_F(ProtoValueConversionsTest, ClientToServerMessageToValue) {

[akalin, 2012/03/19 21:31:38]

add test-level comment.  Something like

// Create a ClientToServerMessage with an EntitySpecifics.  Converting it to a
value should respect the |include_specifics| flag.

[lipalani1, 2012/03/20 19:24:41]

Done.

+  sync_pb::ClientToServerMessage message;
+  sync_pb::CommitMessage* commit_message = message.mutable_commit();
+  sync_pb::SyncEntity* entity = commit_message->add_entries();
+  sync_pb::EntitySpecifics* specifics = entity->mutable_specifics();
+
+  scoped_ptr<DictionaryValue> value_with_specifics(
+      ClientToServerMessageToValue(message, true /* include_specifics */));
+  EXPECT_FALSE(value_with_specifics->empty());
+  VerifySpecifics(value_with_specifics.get(), "commit.entries", true);

[akalin, 2012/03/19 21:31:38]

true -> true /* include_specifics */

(everywhere else you call VerifySpecifics, too)

[lipalani1, 2012/03/20 19:24:41]

The param is removed.
On 2012/03/19 21:31:38, akalin wrote:
Done.

+
+  scoped_ptr<DictionaryValue> value_without_specifics(
+      ClientToServerMessageToValue(message, false /* include_specifics */));
+  EXPECT_FALSE(value_without_specifics->empty());
+  VerifySpecifics(value_without_specifics.get(), "commit.entries", false);
+}
+
+TEST_F(ProtoValueConversionsTest, ClientToServerResponseToValue) {

[akalin, 2012/03/19 21:31:38]

add test-level comment

[lipalani1, 2012/03/20 19:24:41]

Done.

+  sync_pb::ClientToServerResponse message;
+  sync_pb::GetUpdatesResponse* response = message.mutable_get_updates();
+  sync_pb::SyncEntity* entity = response->add_entries();
+  sync_pb::EntitySpecifics* specifics = entity->mutable_specifics();
+
+  scoped_ptr<DictionaryValue> value_with_specifics(
+      ClientToServerResponseToValue(message, true /* include_specifics */));
+  EXPECT_FALSE(value_with_specifics->empty());
+  VerifySpecifics(value_with_specifics.get(), "get_updates.entries", true);
+
+
+  scoped_ptr<DictionaryValue> value_without_specifics(
+      ClientToServerResponseToValue(message, false /* include_specifics */));
+  EXPECT_FALSE(value_without_specifics->empty());
+  VerifySpecifics(value_without_specifics.get(), "get_updates.entries", false);
+}
+
 }  // namespace
 }  // namespace browser_sync