Added chunked upload support for embedded_test_server

net/test/embedded_test_server/http_request_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 "net/test/embedded_test_server/http_request.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test_server {
@@ skipping 58 matching lines @@
   parser.ProcessChunk("Content-Length: 0\r\n\r\n");
   ASSERT_EQ(HttpRequestParser::ACCEPTED, parser.ParseRequest());
 
   scoped_ptr<HttpRequest> request = parser.GetRequest();
   EXPECT_EQ("", request->content);
   EXPECT_TRUE(request->has_content);
   EXPECT_EQ(1u, request->headers.count("Content-Length"));
   EXPECT_EQ("0", request->headers["Content-Length"]);
 }
 
+TEST(HttpRequestTest, ParseRequestWithChunkedBody) {
+  HttpRequestParser parser;
+
+  parser.ProcessChunk("POST /foobar.html HTTP/1.1\r\n");
+  parser.ProcessChunk("Transfer-Encoding: chunked\r\n\r\n");
+  parser.ProcessChunk("5\r\nhello\r\n");
+  parser.ProcessChunk("1\r\n \r\n");
+  parser.ProcessChunk("5\r\nworld\r\n");
+  parser.ProcessChunk("0\r\n\r\n");
+  ASSERT_EQ(HttpRequestParser::ACCEPTED, parser.ParseRequest());
+
+  scoped_ptr<HttpRequest> request = parser.GetRequest();

[mmenke, 2015/02/13 17:53:29]

Should include base/memory/scoped_ptr (File already depends on it, but it's not
explicitly being included)

[xunjieli, 2015/02/13 18:36:14]

Done.

+  EXPECT_EQ("hello world", request->content);
+  EXPECT_TRUE(request->has_content);
+  EXPECT_EQ(1u, request->headers.count("Transfer-Encoding"));
+  EXPECT_EQ("chunked", request->headers["Transfer-Encoding"]);
+}
+
+TEST(HttpRequestTest, ParseRequestWithChunkedBodySlow) {
+  HttpRequestParser parser;
+
+  parser.ProcessChunk("POST /foobar.html HTTP/1.1\r\n");
+  parser.ProcessChunk("Transfer-Encoding: chunked\r\n\r\n");
+  parser.ProcessChunk("5\r\nhello\r\n");
+  ASSERT_EQ(HttpRequestParser::WAITING, parser.ParseRequest());
+  parser.ProcessChunk("0\r\n\r\n");

[mmenke, 2015/02/13 17:53:29]

You need to send partial chunks here, not entire chunks at once.  That was the
whole point processing the response character-by-character.

[xunjieli, 2015/02/13 18:36:14]

Right, that's why I called parser.ParseRequest() on line 103, and again on line
105. Should I stop at line 104 then? 

[mmenke, 2015/02/13 18:43:29]

You're still calling it at chunk boundaries...So if you're using the chunked
decoder incorrectly, but in a way that works as long as you only call it at
chunk boundaries, this test would incorrectly pass.  Should append data one
character at a time and then call ParseRequest, to make sure sure everything
works (In my earlier example, hadn't realized ProcessChunk doesn't call into
ParseRequest)

+  ASSERT_EQ(HttpRequestParser::ACCEPTED, parser.ParseRequest());
+  scoped_ptr<HttpRequest> request = parser.GetRequest();
+  EXPECT_EQ("hello", request->content);
+  EXPECT_TRUE(request->has_content);
+  EXPECT_EQ(1u, request->headers.count("Transfer-Encoding"));
+  EXPECT_EQ("chunked", request->headers["Transfer-Encoding"]);
+}
+
 TEST(HttpRequestTest, ParseRequestWithoutBody) {
   HttpRequestParser parser;
 
   parser.ProcessChunk("POST /foobar.html HTTP/1.1\r\n\r\n");
   ASSERT_EQ(HttpRequestParser::ACCEPTED, parser.ParseRequest());
 
   scoped_ptr<HttpRequest> request = parser.GetRequest();
   EXPECT_EQ("", request->content);
   EXPECT_FALSE(request->has_content);
 }
 
 TEST(HttpRequestTest, ParseGet) {
   HttpRequestParser parser;
 
   parser.ProcessChunk("GET /foobar.html HTTP/1.1\r\n\r\n");
   ASSERT_EQ(HttpRequestParser::ACCEPTED, parser.ParseRequest());
 
   scoped_ptr<HttpRequest> request = parser.GetRequest();
   EXPECT_EQ("/foobar.html", request->relative_url);
   EXPECT_EQ("GET", request->method_string);
   EXPECT_EQ(METHOD_GET, request->method);
   EXPECT_EQ("", request->content);
   EXPECT_FALSE(request->has_content);
 }
 
 }  // namespace test_server
 }  // namespace net