[Sync] Add timestamp to TrafficRecorder records

sync/engine/traffic_recorder_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.
 
+#include "base/values.h"
+
 #include "sync/engine/traffic_recorder.h"
 
 #include "sync/protocol/sync.pb.h"
+#include "sync/test/engine/fake_traffic_recorder.h"
+#include "sync/util/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 const unsigned int kMaxMessages = 10;
 const unsigned int kMaxMessageSize = 5 * 1024;
 
 // Ensure the number of records don't exceed |kMaxMessages|.
 TEST(TrafficRecorderTest, MaxRecordsTest) {
   TrafficRecorder recorder(kMaxMessages, kMaxMessageSize);
@@ skipping 14 matching lines @@
   error->set_error_description(error_description);
 
   TrafficRecorder recorder(kMaxMessages, kMaxMessageSize);
   recorder.RecordClientToServerResponse(response);
 
   TrafficRecorder::TrafficRecord record = recorder.records().front();
   EXPECT_TRUE(record.truncated);
   EXPECT_TRUE(record.message.empty());
 }
 
+// Ensure that timestamp is recorded correctly in traffic record

[rlarocque, 2013/01/31 19:13:10]

nit: Please put periods after comments throughout this file.

+TEST(TrafficRecorderTest, TimestampTest) {
+  sync_pb::ClientToServerResponse response;
+
+  FakeTrafficRecorder recorder(kMaxMessages, kMaxMessageSize);
+  recorder.SetTime(3);
+  recorder.RecordClientToServerResponse(response);
+
+  base::Time expect_time = ProtoTimeToTime(3);
+  TrafficRecorder::TrafficRecord record = recorder.records().front();
+  EXPECT_EQ(expect_time, record.timestamp);
+}
+
+// Ensure that timestamps are recorded correctly in traffic records
+TEST(TrafficRecorderTest, MultipleTimestampTest) {
+  sync_pb::ClientToServerResponse response;
+  base::Time sample_time_1 = ProtoTimeToTime(1359484676659324);
+  base::Time sample_time_2 = ProtoTimeToTime(1359484676659324 * 2);
+
+  FakeTrafficRecorder recorder(kMaxMessages, kMaxMessageSize);
+  recorder.SetTime(sample_time_1);
+  recorder.RecordClientToServerResponse(response);
+  recorder.SetTime(sample_time_2);
+  recorder.RecordClientToServerResponse(response);
+
+  TrafficRecorder::TrafficRecord record_1 = recorder.records().front();
+  TrafficRecorder::TrafficRecord record_2 = recorder.records().back();
+  EXPECT_EQ(sample_time_1, record_1.timestamp);
+  EXPECT_EQ(sample_time_2, record_2.timestamp);
+}
+
+// Ensure that timestamp is added to ListValue of DictionaryValues in ToValue()
+TEST(TrafficRecorderTest, ToValueTimestampTest) {
+  sync_pb::ClientToServerResponse response;
+  base::Time sample_time = ProtoTimeToTime(1359484676659324);
+  std::string expect_time_str = GetTimeDebugString(sample_time);
+
+  FakeTrafficRecorder recorder(kMaxMessages, kMaxMessageSize);
+  recorder.SetTime(sample_time);
+  recorder.RecordClientToServerResponse(response);
+
+  ListValue* value = recorder.ToValue();
+  DictionaryValue* record_value;
+  std::string time_str;
+
+  EXPECT_TRUE(value->GetDictionary(0, &record_value));

[rlarocque, 2013/01/31 19:13:10]

Make this ASSERT_TRUE?  ASSERTs will abort the test, which is probably the right
thing to do here.  If GetDictionary were to fail, then the next line would
likely crash.  

+  EXPECT_TRUE(record_value->GetString("timestamp", &time_str));
+  EXPECT_EQ(expect_time_str, time_str);
+}
+

[rlarocque, 2013/01/31 19:13:10]

nit: Please remove extra whitespace.

+
 }  // namespace syncer