Refactoring of the HTTP library

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_parser.dart';
 
 class HttpParserTest {
@@ skipping 19 matching lines @@
     bool headersCompleteCalled;
     bool dataEndCalled;
     String method;
     String uri;
     String version;
     Map headers;
     int contentLength;
     int bytesReceived;
 
     void reset() {
-      httpParser = new _HttpParser();
+      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);
         if (!chunked) {
           Expect.equals(expectedContentLength, httpParser.contentLength);
@@ skipping 10 matching lines @@
         headersCompleteCalled = true;
       };
       httpParser.dataReceived = (List<int> data) {
         Expect.isTrue(headersCompleteCalled);
         bytesReceived += data.length;
       };
       httpParser.dataEnd = (close) {
         Expect.isFalse(close);
         dataEndCalled = true;
       };
+      httpParser.closed = () { };
 
       headersCompleteCalled = false;
       dataEndCalled = false;
       method = null;
       uri = null;
       headers = new Map();
       bytesReceived = 0;
     }
 
     void testWrite(List<int> requestData, [int chunkSize = -1]) {
       if (chunkSize == -1) chunkSize = requestData.length;
       reset();
       int written = 0;
       int unparsed;
       for (int pos = 0; pos < requestData.length; pos += chunkSize) {
         int remaining = requestData.length - pos;
         int writeLength = min(chunkSize, remaining);
         written += writeLength;
-        httpParser.writeList(requestData, pos, writeLength);
+        httpParser.streamData(requestData.getRange(pos, writeLength));
         unparsed = httpParser.readUnparsedData().length;
         if (httpParser.upgrade) {
           unparsed += requestData.length - written;
           break;
         } else {
           Expect.equals(0, unparsed);
         }
       }
       Expect.equals(expectedMethod, method);
       Expect.equals(expectedUri, uri);
@@ skipping 14 matching lines @@
     testWrite(requestData);
     testWrite(requestData, 10);
     testWrite(requestData, 1);
   }
 
   static void _testParseInvalidRequest(String request) {
     _HttpParser httpParser;
     bool errorCalled;
 
     void reset() {
-      httpParser = new _HttpParser();
+      httpParser = new _HttpParser.requestParser();
       httpParser.responseStart = (s, r) { Expect.fail("Expected request"); };
       httpParser.error = (e) {
         errorCalled = true;
       };
+      httpParser.closed = () { };
 
       errorCalled = false;
     }
 
     void testWrite(List<int> requestData, [int chunkSize = -1]) {
       if (chunkSize == -1) chunkSize = requestData.length;
       reset();
       for (int pos = 0;
            pos < requestData.length && !errorCalled;
            pos += chunkSize) {
         int remaining = requestData.length - pos;
         int writeLength = min(chunkSize, remaining);
-        httpParser.writeList(requestData, pos, writeLength);
+        httpParser.streamData(requestData.getRange(pos, writeLength));
       }
       Expect.isTrue(errorCalled);
     }
 
     // Test parsing the request three times delivering the data in
     // different chunks.
     List<int> requestData = request.charCodes;
     testWrite(requestData);
     testWrite(requestData, 10);
     testWrite(requestData, 1);
@@ skipping 17 matching lines @@
     bool dataEndCalled;
     bool dataEndClose;
     int statusCode;
     String reasonPhrase;
     String version;
     Map headers;
     int contentLength;
     int bytesReceived;
 
     void reset() {
-      httpParser = new _HttpParser();
+      httpParser = new _HttpParser.responseParser();
       if (responseToMethod != null) {
         httpParser.responseToMethod = responseToMethod;
       }
       httpParser.requestStart = (m, u, v) => Expect.fail("Expected response");
       httpParser.responseStart = (s, r, v) {
         statusCode = s;
         reasonPhrase = r;
         version = v;
       };
       httpParser.headerReceived = (f, v) {
@@ skipping 16 matching lines @@
         headersCompleteCalled = true;
       };
       httpParser.dataReceived = (List<int> data) {
         Expect.isTrue(headersCompleteCalled);
         bytesReceived += data.length;
       };
       httpParser.dataEnd = (close) {
         dataEndCalled = true;
         dataEndClose = close;
       };
+      httpParser.closed = () { };
 
       headersCompleteCalled = false;
       dataEndCalled = false;
       dataEndClose = null;
       statusCode = -1;
       reasonPhrase = null;
       headers = new Map();
       bytesReceived = 0;
     }
 
     void testWrite(List<int> requestData, [int chunkSize = -1]) {
       if (chunkSize == -1) chunkSize = requestData.length;
       reset();
       int written = 0;
       int unparsed;
       for (int pos = 0; pos < requestData.length; pos += chunkSize) {
         int remaining = requestData.length - pos;
         int writeLength = min(chunkSize, remaining);
         written += writeLength;
-        httpParser.writeList(requestData, pos, writeLength);
+        httpParser.streamData(requestData.getRange(pos, writeLength));
         unparsed = httpParser.readUnparsedData().length;
         if (httpParser.upgrade) {
           unparsed += requestData.length - written;
           break;
         } else {
           Expect.equals(0, unparsed);
         }
       }
-      if (close) httpParser.connectionClosed();
+      if (close) httpParser.streamDone();
       Expect.equals(expectedVersion, version);
       Expect.equals(expectedStatusCode, statusCode);
       Expect.equals(expectedReasonPhrase, reasonPhrase);
       Expect.isTrue(headersCompleteCalled);
       Expect.equals(expectedBytesReceived, bytesReceived);
       if (!upgrade) {
         Expect.isTrue(dataEndCalled);
         if (close) Expect.isTrue(dataEndClose);
         Expect.equals(dataEndClose, connectionClose);
       }
@@ skipping 10 matching lines @@
     testWrite(responseData);
     testWrite(responseData, 10);
     testWrite(responseData, 1);
   }
 
   static void _testParseInvalidResponse(String response, [bool close = false]) {
     _HttpParser httpParser;
     bool errorCalled;
 
     void reset() {
-      httpParser = new _HttpParser();
+      httpParser = new _HttpParser.responseParser();
       httpParser.requestStart = (m, u) => Expect.fail("Expected response");
       httpParser.error = (e) => errorCalled = true;
+      httpParser.closed = () { };
 
       errorCalled = false;
     }
 
     void testWrite(List<int> requestData, [int chunkSize = -1]) {
       if (chunkSize == -1) chunkSize = requestData.length;
       reset();
       for (int pos = 0;
            pos < requestData.length && !errorCalled;
            pos += chunkSize) {
         int remaining = requestData.length - pos;
         int writeLength = min(chunkSize, remaining);
-        httpParser.writeList(requestData, pos, writeLength);
+        httpParser.streamData(requestData.getRange(pos, writeLength));
       }
-      if (close) httpParser.connectionClosed();
+      if (close) httpParser.streamDone();
       Expect.isTrue(errorCalled);
     }
 
     // Test parsing the request three times delivering the data in
     // different chunks.
     List<int> responseData = response.charCodes;
     testWrite(responseData);
     testWrite(responseData, 10);
     testWrite(responseData, 1);
   }
@@ skipping 538 matching lines @@
 0123456789012345678901234567890\r
 0\r\n\r\n""";
     _testParseInvalidResponse(response);
   }
 }
 
 
 void main() {
   HttpParserTest.runAllTests();
 }