Merge 49197 - Submitting CL http://codereview.chromium.org/2324001 on behalf ...

chrome/browser/metrics/metrics_log_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2010 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 <string>
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/metrics/metrics_log.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 31 matching lines @@
       "<log clientid=\"bogus client ID\" buildtime=\"123456789\" "
       "appversion=\"%s\"/>", MetricsLog::GetVersionString().c_str());
 
   MetricsLog log("bogus client ID", 0);
   log.CloseLog();
 
   int size = log.GetEncodedLogSize();
   ASSERT_GT(size, 0);
 
   std::string encoded;
-  ASSERT_TRUE(log.GetEncodedLog(WriteInto(&encoded, size), size));
+  // Leave room for the NUL terminator.
+  ASSERT_TRUE(log.GetEncodedLog(WriteInto(&encoded, size + 1), size));
+  TrimWhitespaceASCII(encoded, TRIM_ALL, &encoded);
   NormalizeBuildtime(&encoded);
   NormalizeBuildtime(&expected_output);
 
   ASSERT_EQ(expected_output, encoded);
 }
 
+#if defined(OS_CHROMEOS)
+TEST(MetricsLogTest, ChromeOSEmptyRecord) {
+  std::string expected_output = StringPrintf(
+      "<log clientid=\"bogus client ID\" buildtime=\"123456789\" "
+      "appversion=\"%s\" hardwareclass=\"sample-class\"/>",
+      MetricsLog::GetVersionString().c_str());
+
+  MetricsLog log("bogus client ID", 0);
+  log.set_hardware_class("sample-class");
+  log.CloseLog();
+
+  int size = log.GetEncodedLogSize();
+  ASSERT_GT(size, 0);
+
+  std::string encoded;
+  // Leave room for the NUL terminator.
+  ASSERT_TRUE(log.GetEncodedLog(WriteInto(&encoded, size + 1), size));
+  TrimWhitespaceASCII(encoded, TRIM_ALL, &encoded);
+  NormalizeBuildtime(&encoded);
+  NormalizeBuildtime(&expected_output);
+
+  ASSERT_EQ(expected_output, encoded);
+}
+#endif  // OS_CHROMEOS
+
 namespace {
 
 class NoTimeMetricsLog : public MetricsLog {
  public:
   NoTimeMetricsLog(std::string client_id, int session_id):
       MetricsLog(client_id, session_id) {}
   virtual ~NoTimeMetricsLog() {}
 
   // Override this so that output is testable.
   virtual std::string GetCurrentTimeString() {
@@ skipping 21 matching lines @@
   log.RecordWindowEvent(MetricsLog::WINDOW_CLOSE, 1, 0);
   log.RecordWindowEvent(MetricsLog::WINDOW_DESTROY, 0, -1);
   log.CloseLog();
 
   ASSERT_EQ(4, log.num_events());
 
   int size = log.GetEncodedLogSize();
   ASSERT_GT(size, 0);
 
   std::string encoded;
-  ASSERT_TRUE(log.GetEncodedLog(WriteInto(&encoded, size), size));
+  // Leave room for the NUL terminator.
+  ASSERT_TRUE(log.GetEncodedLog(WriteInto(&encoded, size + 1), size));
+  TrimWhitespaceASCII(encoded, TRIM_ALL, &encoded);
   NormalizeBuildtime(&encoded);
   NormalizeBuildtime(&expected_output);
 
   ASSERT_EQ(expected_output, encoded);
 }
 
 TEST(MetricsLogTest, LoadEvent) {
   std::string expected_output = StringPrintf(
       "<log clientid=\"bogus client ID\" buildtime=\"123456789\" "
           "appversion=\"%s\">\n"
       " <document action=\"load\" docid=\"1\" window=\"3\" loadtime=\"7219\" "
           "origin=\"link\" session=\"0\" time=\"\"/>\n"
       "</log>", MetricsLog::GetVersionString().c_str());
 
   NoTimeMetricsLog log("bogus client ID", 0);
   log.RecordLoadEvent(3, GURL("http://google.com"), PageTransition::LINK,
                       1, TimeDelta::FromMilliseconds(7219));
 
   log.CloseLog();
 
   ASSERT_EQ(1, log.num_events());
 
   int size = log.GetEncodedLogSize();
   ASSERT_GT(size, 0);
 
   std::string encoded;
-  ASSERT_TRUE(log.GetEncodedLog(WriteInto(&encoded, size), size));
+  // Leave room for the NUL terminator.
+  ASSERT_TRUE(log.GetEncodedLog(WriteInto(&encoded, size + 1), size));
+  TrimWhitespaceASCII(encoded, TRIM_ALL, &encoded);
   NormalizeBuildtime(&encoded);
   NormalizeBuildtime(&expected_output);
 
   ASSERT_EQ(expected_output, encoded);
 }
 
 // Make sure our ID hashes are the same as what we see on the server side.
 TEST(MetricsLogTest, CreateHash) {
   static const struct {
     std::string input;
@@ skipping 11 matching lines @@
     // We're only checking the first 8 bytes, because that's what
     // the metrics server uses.
     std::string hash_hex = "0x";
     for (size_t j = 0; j < 8; j++) {
       StringAppendF(&hash_hex, "%02x",
                     static_cast<uint8>(hash_string.data()[j]));
     }
     EXPECT_EQ(cases[i].output, hash_hex);
   }
 };