Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

net/tools/quic/spdy_balsa_utils_test.cc

Index: net/tools/quic/spdy_balsa_utils_test.cc
diff --git a/net/tools/quic/spdy_balsa_utils_test.cc b/net/tools/quic/spdy_balsa_utils_test.cc
index 0a7f2fabe25ca740873f84e7dd5d8c6bc8c50f88..c8591ea0df9b73f20606a4e03ace45a7a538acf3 100644
--- a/net/tools/quic/spdy_balsa_utils_test.cc
+++ b/net/tools/quic/spdy_balsa_utils_test.cc
@@ -4,9 +4,13 @@
 
 #include "net/tools/quic/spdy_balsa_utils.h"
 
+#include "base/strings/string_piece.h"
 #include "net/spdy/spdy_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::StringPiece;
+using testing::ElementsAre;
+
 namespace net {
 namespace test {
 namespace {
@@ -47,6 +51,8 @@ TEST(SpdyBalsaUtilsTest, SpdyHeadersToRequestHeaders) {
   spdy_headers[":path"] = "/foo";
   spdy_headers[":scheme"] = "https";
   spdy_headers[":method"] = "GET";
+  spdy_headers["foo"] = StringPiece("multi\0valued\0header", 19);
+  spdy_headers["bar"] = "";
 
   BalsaHeaders request_headers;
   SpdyBalsaUtils::SpdyHeadersToRequestHeaders(spdy_headers, &request_headers);
@@ -54,6 +60,11 @@ TEST(SpdyBalsaUtilsTest, SpdyHeadersToRequestHeaders) {
   EXPECT_EQ("HTTP/1.1", request_headers.request_version());
   EXPECT_EQ("/foo", request_headers.request_uri());
   EXPECT_EQ("www.google.com", request_headers.GetHeader("host"));
+  EXPECT_TRUE(request_headers.HasHeader("bar"));
+  EXPECT_EQ("", request_headers.GetHeader("bar"));
+  std::vector<StringPiece> pieces;
+  request_headers.GetAllOfHeader("foo", &pieces);
+  EXPECT_THAT(pieces, ElementsAre("multi", "valued", "header"));
 
   // Test :host header (and no GET).
   SpdyHeaderBlock spdy_headers1;
@@ -72,10 +83,17 @@ TEST(SpdyBalsaUtilsTest, SpdyHeadersToRequestHeaders) {
 TEST(SpdyBalsaUtilsTest, SpdyHeadersToResponseHeaders) {
   SpdyHeaderBlock spdy_headers;
   spdy_headers[":status"] = "200";
+  spdy_headers["foo"] = StringPiece("multi\0valued\0header", 19);
+  spdy_headers["bar"] = "";
 
   BalsaHeaders response_headers;
   SpdyBalsaUtils::SpdyHeadersToResponseHeaders(spdy_headers, &response_headers);
   EXPECT_EQ("200", response_headers.response_code());
+  EXPECT_TRUE(response_headers.HasHeader("bar"));
+  EXPECT_EQ("", response_headers.GetHeader("bar"));
+  std::vector<StringPiece> pieces;
+  response_headers.GetAllOfHeader("foo", &pieces);
+  EXPECT_THAT(pieces, ElementsAre("multi", "valued", "header"));
 }
 
 }  // namespace