Refactor the HTTP parser to collect headers

tests/standalone/io/http_parser_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:math';
 import 'dart:scalarlist';
 
+part '../../../sdk/lib/io/http.dart';
+part '../../../sdk/lib/io/http_headers.dart';
 part '../../../sdk/lib/io/http_parser.dart';
 
 class HttpParserTest {
   static void runAllTests() {
     testParseRequest();
     testParseResponse();
     testParseInvalidRequest();
     testParseInvalidResponse();
   }
 
   static void _testParseRequest(String request,
                                 String expectedMethod,
                                 String expectedUri,
                                 {int expectedContentLength: 0,
                                  int expectedBytesReceived: 0,
                                  Map expectedHeaders: null,
                                  bool chunked: false,
                                  bool upgrade: false,
                                  int unparsedLength: 0,
                                  bool connectionClose: false,
                                  String expectedVersion: "1.1"}) {
     _HttpParser httpParser;
     bool headersCompleteCalled;
     bool dataEndCalled;
     String method;
     String uri;
     String version;
-    Map headers;
+    HttpHeaders headers;
     int contentLength;
     int bytesReceived;
 
     void reset() {
       httpParser = new _HttpParser.requestParser();
-      httpParser.requestStart = (m, u, v) { method = m; uri = u; version = v; };
-      httpParser.responseStart = (s, r, v) { Expect.fail("Expected request"); };
-      httpParser.headerReceived = (f, v) {
-        Expect.isFalse(headersCompleteCalled);
-        headers[f] = v;
-      };
-      httpParser.headersComplete = () {
-        Expect.isFalse(headersCompleteCalled);
+      httpParser.requestStart = (m, u, v, h) {
+        method = m;
+        uri = u;
+        version = v;
+        headers = h;
+        headersCompleteCalled = true;
         if (!chunked) {
           Expect.equals(expectedContentLength, httpParser.contentLength);
         } else {
           Expect.equals(-1, httpParser.contentLength);
         }
         if (expectedHeaders != null) {
           expectedHeaders.forEach(
               (String name, String value) =>
-                  Expect.equals(value, headers[name]));
+              Expect.equals(value, headers[name][0]));
         }
         Expect.equals(upgrade, httpParser.upgrade);
         Expect.equals(connectionClose, !httpParser.persistentConnection);
         headersCompleteCalled = true;
       };
+      httpParser.responseStart = (s, r, v, h) {
+        Expect.fail("Expected request");
+      };
       httpParser.dataReceived = (List<int> data) {
         Expect.isTrue(headersCompleteCalled);
         bytesReceived += data.length;
       };
       httpParser.dataEnd = (close) {
         Expect.isFalse(close);
         dataEndCalled = true;
       };
       httpParser.closed = () { };
 
@@ skipping 93 matching lines @@
                                   bool upgrade: false,
                                   int unparsedLength: 0,
                                   String expectedVersion: "1.1"}) {
     _HttpParser httpParser;
     bool headersCompleteCalled;
     bool dataEndCalled;
     bool dataEndClose;
     int statusCode;
     String reasonPhrase;
     String version;
-    Map headers;
+    HttpHeaders headers;
     int contentLength;
     int bytesReceived;
 
     void reset() {
       httpParser = new _HttpParser.responseParser();
       if (responseToMethod != null) {
         httpParser.responseToMethod = responseToMethod;
       }
-      httpParser.requestStart = (m, u, v) => Expect.fail("Expected response");
-      httpParser.responseStart = (s, r, v) {
+      httpParser.requestStart = (m, u, v, h) {
+        Expect.fail("Expected response");
+      };
+      httpParser.responseStart = (s, r, v, h) {
         statusCode = s;
         reasonPhrase = r;
         version = v;
-      };
-      httpParser.headerReceived = (f, v) {
-        Expect.isFalse(headersCompleteCalled);
-        headers[f] = v;
-      };
-      httpParser.headersComplete = () {
+        headers = h;
         Expect.isFalse(headersCompleteCalled);
         if (!chunked && !close) {
           Expect.equals(expectedContentLength, httpParser.contentLength);
         } else {
           Expect.equals(-1, httpParser.contentLength);
         }
         if (expectedHeaders != null) {
           expectedHeaders.forEach((String name, String value) {
-            Expect.equals(value, headers[name]);
+            Expect.equals(value, headers[name][0]);
           });
         }
         Expect.equals(upgrade, httpParser.upgrade);
         headersCompleteCalled = true;
       };
       httpParser.dataReceived = (List<int> data) {
         Expect.isTrue(headersCompleteCalled);
         bytesReceived += data.length;
       };
       httpParser.dataEnd = (close) {
@@ skipping 103 matching lines @@
         // Methods with HTTP prefix.
         "H", "HT", "HTT", "HTTP", "HX", "HTX", "HTTX", "HTTPX"];
     methods.forEach((method) {
        request = "$method / HTTP/1.1\r\n\r\n";
       _testParseRequest(request, method, "/");
        request = "$method /index.html HTTP/1.1\r\n\r\n";
       _testParseRequest(request, method, "/index.html");
     });
 
     request = "GET / HTTP/1.0\r\n\r\n";
-    _testParseRequest(request, "GET", "/", expectedVersion: "1.0", connectionClose: true);
+    _testParseRequest(request, "GET", "/",
+                      expectedVersion: "1.0",
+                      connectionClose: true);
 
     request = "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n";
     _testParseRequest(request, "GET", "/", expectedVersion: "1.0");
 
     request = """
 POST /test HTTP/1.1\r
 AAA: AAA\r
 \r
 """;
     _testParseRequest(request, "POST", "/test");
@@ skipping 242 matching lines @@
     response = "HTTP/1.1 100 Continue\r\nContent-Length: 0\r\n\r\n";
     _testParseResponse(response, 100, "Continue", expectedContentLength: 0);
 
     response = "HTTP/1.1 100 Continue\r\nContent-Length: 10\r\n\r\n";
     _testParseResponse(response,
                        100,
                        "Continue",
                        expectedContentLength: 10,
                        expectedBytesReceived: 0);
 
-    response = "HTTP/1.1 200 OK\r\nContent-Length: 0\r\nConnection: Close\r\n\r\n";
+    response = "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n"
+               "Connection: Close\r\n\r\n";
     _testParseResponse(response,
                        200,
                        "OK",
                        expectedContentLength: 0,
                        connectionClose: true);
 
     response = "HTTP/1.0 200 OK\r\nContent-Length: 0\r\n\r\n";
     _testParseResponse(response,
                        200,
                        "OK",
                        expectedContentLength: 0,
                        expectedVersion: "1.0",
                        connectionClose: true);
 
-    response = "HTTP/1.0 200 OK\r\nContent-Length: 0\r\nConnection: Keep-Alive\r\n\r\n";
-    _testParseResponse(response, 200, "OK", expectedContentLength: 0, expectedVersion: "1.0");
+    response = "HTTP/1.0 200 OK\r\nContent-Length: 0\r\n"
+               "Connection: Keep-Alive\r\n\r\n";
+    _testParseResponse(response,
+                       200,
+                       "OK",
+                       expectedContentLength: 0,
+                       expectedVersion: "1.0");
 
     response = "HTTP/1.1 204 No Content\r\nContent-Length: 11\r\n\r\n";
     _testParseResponse(response,
                        204,
                        "No Content",
                        expectedContentLength: 11,
                        expectedBytesReceived: 0);
 
     response = "HTTP/1.1 304 Not Modified\r\nContent-Length: 12\r\n\r\n";
     _testParseResponse(response,
@@ skipping 227 matching lines @@
 0123456789012345678901234567890\r
 0\r\n\r\n""";
     _testParseInvalidResponse(response);
   }
 }
 
 
 void main() {
   HttpParserTest.runAllTests();
 }