Send the ClientHello handshake message. Fix a bug in

net/quic/crypto/crypto_framer_test.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 <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/crypto_framer.h"
@@ skipping 16 matching lines @@
 }  // namespace
 
 namespace test {
 
 class TestCryptoVisitor : public ::net::CryptoFramerVisitorInterface {
  public:
   TestCryptoVisitor()
       : error_count_(0) {
   }
 
-  ~TestCryptoVisitor() {}
-
   virtual void OnError(CryptoFramer* framer) {
-    LOG(ERROR) << "CryptoFramer Error: " << framer->error();
-    error_count_++;
+    DLOG(ERROR) << "CryptoFramer Error: " << framer->error();
+    ++error_count_;
   }
 
   virtual void OnHandshakeMessage(const CryptoHandshakeMessage& message) {
-    message_tags_.push_back(message.tag);
-    message_maps_.push_back(map<CryptoTag, string>());
-    CryptoTagValueMap::const_iterator it = message.tag_value_map.begin();
-    while (it != message.tag_value_map.end()) {
-      message_maps_.back()[it->first] = it->second.as_string();
-      ++it;
-    }
+    messages_.push_back(message);
   }
 
   // Counters from the visitor callbacks.
   int error_count_;
 
-  CryptoTagVector message_tags_;
-  vector<map<CryptoTag, string> > message_maps_;
+  vector<CryptoHandshakeMessage> messages_;
 };
 
 }  // namespace test
 
 TEST(CryptoFramerTest, MakeCryptoTag) {
   CryptoTag tag = MAKE_TAG('A', 'B', 'C', 'D');
   char bytes[4];
   memcpy(bytes, &tag, 4);
   EXPECT_EQ('A', bytes[0]);
   EXPECT_EQ('B', bytes[1]);
@@ skipping 143 matching lines @@
     'a',  'b',  'c',  'd',
     'e',  'f',
     // value 2
     'g',  'h',  'i',  'j',
     'k',
   };
 
   EXPECT_TRUE(framer.ProcessInput(StringPiece(AsChars(input),
                                               arraysize(input))));
   EXPECT_EQ(0u, framer.InputBytesRemaining());
-  ASSERT_EQ(1u, visitor.message_tags_.size());
-  EXPECT_EQ(0xFFAA7733, visitor.message_tags_[0]);
-  ASSERT_EQ(1u, visitor.message_maps_.size());
-  EXPECT_EQ(2u, visitor.message_maps_[0].size());
-  EXPECT_EQ("abcdef",visitor.message_maps_[0][0x12345678]);
-  EXPECT_EQ("ghijk", visitor.message_maps_[0][0x12345679]);
+  ASSERT_EQ(1u, visitor.messages_.size());
+  EXPECT_EQ(0xFFAA7733, visitor.messages_[0].tag);
+  EXPECT_EQ(2u, visitor.messages_[0].tag_value_map.size());
+  EXPECT_EQ("abcdef",visitor.messages_[0].tag_value_map[0x12345678]);

[Ryan Hamilton, 2012/12/22 22:31:32]

nit: missing space.

+  EXPECT_EQ("ghijk", visitor.messages_[0].tag_value_map[0x12345679]);
 }
 
 TEST(CryptoFramerTest, ProcessInputWithThreeKeys) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
@@ skipping 20 matching lines @@
     'g',  'h',  'i',  'j',
     'k',
     // value 3
     'l',  'm',  'n',  'o',
     'p',  'q',  'r',
   };
 
   EXPECT_TRUE(framer.ProcessInput(StringPiece(AsChars(input),
                                               arraysize(input))));
   EXPECT_EQ(0u, framer.InputBytesRemaining());
-  ASSERT_EQ(1u, visitor.message_tags_.size());
-  EXPECT_EQ(0xFFAA7733, visitor.message_tags_[0]);
-  ASSERT_EQ(1u, visitor.message_maps_.size());
-  EXPECT_EQ(3u, visitor.message_maps_[0].size());
-  EXPECT_EQ("abcdef",visitor.message_maps_[0][0x12345678]);
-  EXPECT_EQ("ghijk", visitor.message_maps_[0][0x12345679]);
-  EXPECT_EQ("lmnopqr", visitor.message_maps_[0][0x1234567A]);
+  ASSERT_EQ(1u, visitor.messages_.size());
+  EXPECT_EQ(0xFFAA7733, visitor.messages_[0].tag);
+  EXPECT_EQ(3u, visitor.messages_[0].tag_value_map.size());
+  EXPECT_EQ("abcdef",visitor.messages_[0].tag_value_map[0x12345678]);

[Ryan Hamilton, 2012/12/22 22:31:32]

nit: missing space.

+  EXPECT_EQ("ghijk", visitor.messages_[0].tag_value_map[0x12345679]);
+  EXPECT_EQ("lmnopqr", visitor.messages_[0].tag_value_map[0x1234567A]);
 }
 
 TEST(CryptoFramerTest, ProcessInputIncrementally) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
@@ skipping 12 matching lines @@
     'e',  'f',
     // value 2
     'g',  'h',  'i',  'j',
     'k',
   };
 
   for (size_t i = 0; i < arraysize(input); i++) {
     EXPECT_TRUE(framer.ProcessInput(StringPiece(AsChars(input)+ i, 1)));
   }
   EXPECT_EQ(0u, framer.InputBytesRemaining());
-  ASSERT_EQ(1u, visitor.message_tags_.size());
-  EXPECT_EQ(0xFFAA7733, visitor.message_tags_[0]);
-  ASSERT_EQ(1u, visitor.message_maps_.size());
-  EXPECT_EQ(2u, visitor.message_maps_[0].size());
-  EXPECT_EQ("abcdef",visitor.message_maps_[0][0x12345678]);
-  EXPECT_EQ("ghijk", visitor.message_maps_[0][0x12345679]);
+  ASSERT_EQ(1u, visitor.messages_.size());
+  EXPECT_EQ(0xFFAA7733, visitor.messages_[0].tag);
+  EXPECT_EQ(2u, visitor.messages_[0].tag_value_map.size());
+  EXPECT_EQ("abcdef",visitor.messages_[0].tag_value_map[0x12345678]);

[Ryan Hamilton, 2012/12/22 22:31:32]

nit: missing space.

+  EXPECT_EQ("ghijk", visitor.messages_[0].tag_value_map[0x12345679]);
 }
 
 TEST(CryptoFramerTest, ProcessInputTagsOutOfOrder) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
@@ skipping 68 matching lines @@
     // padding
     0x05, 0x00,
   };
 
   EXPECT_FALSE(framer.ProcessInput(StringPiece(AsChars(input),
                                                arraysize(input))));
   EXPECT_EQ(QUIC_CRYPTO_INVALID_VALUE_LENGTH, framer.error());
 }
 
 }  // namespace net