Enable standalone/io/http_test, splitting it into three separate tests.

tests/standalone/io/http_advanced_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.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
 #import("dart:isolate");
@@ skipping 74 matching lines @@
   bool get isError() => _state == ERROR;
 
   int get port() => _port;
 
   int _state;
   int _port;
 }
 
 
 class TestServer extends Isolate {
-  // Echo the request content back to the response.
-  void _echoHandler(HttpRequest request, HttpResponse response) {
-    Expect.equals("POST", request.method);
-    response.contentLength = request.contentLength;
-    request.inputStream.pipe(response.outputStream);
-  }
-
-  // Echo the request content back to the response.
-  void _zeroToTenHandler(HttpRequest request, HttpResponse response) {
-    Expect.equals("GET", request.method);
-    request.inputStream.onData = () {};
-    request.inputStream.onClosed = () {
-      response.outputStream.writeString("01234567890");
-      response.outputStream.close();
-    };
-  }
-
   // Return a 404.
   void _notFoundHandler(HttpRequest request, HttpResponse response) {
     response.statusCode = HttpStatus.NOT_FOUND;
     response.headers.set("Content-Type", "text/html; charset=UTF-8");
     response.outputStream.writeString("Page not found");
     response.outputStream.close();
   }
 
-  // Return a 301 with a custom reason phrase.
-  void _reasonForMovingHandler(HttpRequest request, HttpResponse response) {
-    response.statusCode = HttpStatus.MOVED_PERMANENTLY;
-    response.reasonPhrase = "Don't come looking here any more";
-    response.outputStream.close();
-  }
-
   // Check the "Host" header.
   void _hostHandler(HttpRequest request, HttpResponse response) {
     Expect.equals(1, request.headers["Host"].length);
     Expect.equals("www.dartlang.org:1234", request.headers["Host"][0]);
     Expect.equals("www.dartlang.org", request.headers.host);
     Expect.equals(1234, request.headers.port);
     response.statusCode = HttpStatus.OK;
     response.outputStream.close();
   }
 
@@ skipping 34 matching lines @@
     response.headers.set(HttpHeaders.CONTENT_TYPE,
                          "text/html;  charset = utf-8");
     response.outputStream.close();
   }
 
   void _cookie1Handler(HttpRequest request, HttpResponse response) {
     // No cookies passed with this request.
     Expect.equals(0, request.cookies.length);
 
     Cookie cookie1 = new Cookie("name1", "value1");
-    TimeZone utc = new TimeZone.utc();
-    Date date = new Date.withTimeZone(2014, Date.JAN, 5, 23, 59, 59, 0, utc);
+    Date date = new Date(2014, Date.JAN, 5, 23, 59, 59, 0, isUtc: true);
     cookie1.expires = date;
     cookie1.domain = "www.example.com";
     cookie1.httpOnly = true;
     response.cookies.add(cookie1);
     Cookie cookie2 = new Cookie("name2", "value2");
     cookie2.maxAge = 100;
     cookie2.domain = ".example.com";
     cookie2.path = "/shop";
     response.cookies.add(cookie2);
     response.outputStream.close();
   }
 
   void _cookie2Handler(HttpRequest request, HttpResponse response) {
     // Two cookies passed with this request.
     Expect.equals(2, request.cookies.length);
     response.outputStream.close();
   }
 
   void main() {
     // Setup request handlers.
     _requestHandlers = new Map();
-    _requestHandlers["/echo"] = (HttpRequest request, HttpResponse response) {
-      _echoHandler(request, response);
-    };
-    _requestHandlers["/0123456789"] =
-        (HttpRequest request, HttpResponse response) {
-          _zeroToTenHandler(request, response);
-        };
-    _requestHandlers["/reasonformoving"] =
-        (HttpRequest request, HttpResponse response) {
-          _reasonForMovingHandler(request, response);
-        };
     _requestHandlers["/host"] =
         (HttpRequest request, HttpResponse response) {
           _hostHandler(request, response);
         };
     _requestHandlers["/expires1"] =
         (HttpRequest request, HttpResponse response) {
           _expires1Handler(request, response);
         };
     _requestHandlers["/expires2"] =
         (HttpRequest request, HttpResponse response) {
@@ skipping 45 matching lines @@
     } else {
       _notFoundHandler(request, response);
     }
   }
 
   HttpServer _server;  // HTTP server instance.
   Map _requestHandlers;
   bool _chunkedEncoding = false;
 }
 
-
-void testStartStop() {
-  TestServerMain testServerMain = new TestServerMain();
-  testServerMain.setServerStartedHandler((int port) {
-    testServerMain.shutdown();
-  });
-  testServerMain.start();
-}
-
-
-void testGET() {
-  TestServerMain testServerMain = new TestServerMain();
-  testServerMain.setServerStartedHandler((int port) {
-    HttpClient httpClient = new HttpClient();
-    HttpClientConnection conn =
-        httpClient.get("127.0.0.1", port, "/0123456789");
-    conn.onResponse = (HttpClientResponse response) {
-      Expect.equals(HttpStatus.OK, response.statusCode);
-      StringInputStream stream = new StringInputStream(response.inputStream);
-      StringBuffer body = new StringBuffer();
-      stream.onData = () => body.add(stream.read());
-      stream.onClosed = () {
-        Expect.equals("01234567890", body.toString());
-        httpClient.shutdown();
-        testServerMain.shutdown();
-      };
-    };
-  });
-  testServerMain.start();
-}
-
-
-void testPOST(bool chunkedEncoding) {
-  String data = "ABCDEFGHIJKLMONPQRSTUVWXYZ";
-  final int kMessageCount = 10;
-
-  TestServerMain testServerMain = new TestServerMain();
-
-  void runTest(int port) {
-    int count = 0;
-    HttpClient httpClient = new HttpClient();
-    void sendRequest() {
-      HttpClientConnection conn =
-          httpClient.post("127.0.0.1", port, "/echo");
-      conn.onRequest = (HttpClientRequest request) {
-        if (chunkedEncoding) {
-          request.outputStream.writeString(data.substring(0, 10));
-          request.outputStream.writeString(data.substring(10, data.length));
-        } else {
-          request.contentLength = data.length;
-          request.outputStream.write(data.charCodes());
-        }
-        request.outputStream.close();
-      };
-      conn.onResponse = (HttpClientResponse response) {
-        Expect.equals(HttpStatus.OK, response.statusCode);
-        StringInputStream stream = new StringInputStream(response.inputStream);
-        StringBuffer body = new StringBuffer();
-        stream.onData = () => body.add(stream.read());
-        stream.onClosed = () {
-          Expect.equals(data, body.toString());
-          count++;
-          if (count < kMessageCount) {
-            sendRequest();
-          } else {
-            httpClient.shutdown();
-            testServerMain.shutdown();
-          }
-        };
-      };
-    }
-
-    sendRequest();
-  }
-
-  testServerMain.setServerStartedHandler(runTest);
-  if (chunkedEncoding) {
-    testServerMain.chunkedEncoding();
-  }
-  testServerMain.start();
-}
-
-
-void testReadInto(bool chunkedEncoding) {
-  String data = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  final int kMessageCount = 10;
-
-  TestServerMain testServerMain = new TestServerMain();
-
-  void runTest(int port) {
-    int count = 0;
-    HttpClient httpClient = new HttpClient();
-    void sendRequest() {
-      HttpClientConnection conn =
-          httpClient.post("127.0.0.1", port, "/echo");
-      conn.onRequest = (HttpClientRequest request) {
-        if (chunkedEncoding) {
-          request.outputStream.writeString(data.substring(0, 10));
-          request.outputStream.writeString(data.substring(10, data.length));
-        } else {
-          request.contentLength = data.length;
-          request.outputStream.write(data.charCodes());
-        }
-        request.outputStream.close();
-      };
-      conn.onResponse = (HttpClientResponse response) {
-        Expect.equals(HttpStatus.OK, response.statusCode);
-        InputStream stream = response.inputStream;
-        List<int> body = new List<int>();
-        stream.onData = () {
-          List tmp = new List(3);
-          int bytes = stream.readInto(tmp);
-          body.addAll(tmp.getRange(0, bytes));
-        };
-        stream.onClosed = () {
-          Expect.equals(data, new String.fromCharCodes(body));
-          count++;
-          if (count < kMessageCount) {
-            sendRequest();
-          } else {
-            httpClient.shutdown();
-            testServerMain.shutdown();
-          }
-        };
-      };
-    }
-
-    sendRequest();
-  }
-
-  testServerMain.setServerStartedHandler(runTest);
-  if (chunkedEncoding) {
-    testServerMain.chunkedEncoding();
-  }
-  testServerMain.start();
-}
-
-
-void testReadShort(bool chunkedEncoding) {
-  String data = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  final int kMessageCount = 10;
-
-  TestServerMain testServerMain = new TestServerMain();
-
-  void runTest(int port) {
-    int count = 0;
-    HttpClient httpClient = new HttpClient();
-    void sendRequest() {
-      HttpClientConnection conn =
-          httpClient.post("127.0.0.1", port, "/echo");
-      conn.onRequest = (HttpClientRequest request) {
-        if (chunkedEncoding) {
-          request.outputStream.writeString(data.substring(0, 10));
-          request.outputStream.writeString(data.substring(10, data.length));
-        } else {
-          request.contentLength = data.length;
-          request.outputStream.write(data.charCodes());
-        }
-        request.outputStream.close();
-      };
-      conn.onResponse = (HttpClientResponse response) {
-        Expect.equals(HttpStatus.OK, response.statusCode);
-        InputStream stream = response.inputStream;
-        List<int> body = new List<int>();
-        stream.onData = () {
-          List tmp = stream.read(2);
-          body.addAll(tmp);
-        };
-        stream.onClosed = () {
-          Expect.equals(data, new String.fromCharCodes(body));
-          count++;
-          if (count < kMessageCount) {
-            sendRequest();
-          } else {
-            httpClient.shutdown();
-            testServerMain.shutdown();
-          }
-        };
-      };
-    }
-
-    sendRequest();
-  }
-
-  testServerMain.setServerStartedHandler(runTest);
-  if (chunkedEncoding) {
-    testServerMain.chunkedEncoding();
-  }
-  testServerMain.start();
-}
-
-
-void test404() {
-  TestServerMain testServerMain = new TestServerMain();
-  testServerMain.setServerStartedHandler((int port) {
-    HttpClient httpClient = new HttpClient();
-    HttpClientConnection conn =
-        httpClient.get("127.0.0.1", port, "/thisisnotfound");
-    conn.onResponse = (HttpClientResponse response) {
-      Expect.equals(HttpStatus.NOT_FOUND, response.statusCode);
-      httpClient.shutdown();
-      testServerMain.shutdown();
-    };
-  });
-  testServerMain.start();
-}
-
-
-void testReasonPhrase() {
-  TestServerMain testServerMain = new TestServerMain();
-  testServerMain.setServerStartedHandler((int port) {
-    HttpClient httpClient = new HttpClient();
-    HttpClientConnection conn =
-        httpClient.get("127.0.0.1", port, "/reasonformoving");
-    conn.followRedirects = false;
-    conn.onResponse = (HttpClientResponse response) {
-      Expect.equals(HttpStatus.MOVED_PERMANENTLY, response.statusCode);
-      Expect.equals("Don't come looking here any more", response.reasonPhrase);
-      httpClient.shutdown();
-      testServerMain.shutdown();
-    };
-  });
-  testServerMain.start();
-}
-
-
 void testHost() {
   TestServerMain testServerMain = new TestServerMain();
   testServerMain.setServerStartedHandler((int port) {
     HttpClient httpClient = new HttpClient();
     HttpClientConnection conn =
         httpClient.get("127.0.0.1", port, "/host");
     conn.onRequest = (HttpClientRequest request) {
       Expect.equals("127.0.0.1:$port", request.headers["host"][0]);
       request.headers.host = "www.dartlang.com";
       Expect.equals("www.dartlang.com:$port", request.headers["host"][0]);
@@ skipping 110 matching lines @@
     int responses = 0;
     HttpClient httpClient = new HttpClient();
 
     HttpClientConnection conn1 =
         httpClient.get("127.0.0.1", port, "/cookie1");
     conn1.onResponse = (HttpClientResponse response) {
       Expect.equals(2, response.cookies.length);
       response.cookies.forEach((cookie) {
         if (cookie.name == "name1") {
           Expect.equals("value1", cookie.value);
-          TimeZone utc = new TimeZone.utc();
-          Date date =
-              new Date.withTimeZone(2014, Date.JAN, 5, 23, 59, 59, 0, utc);
+          Date date = new Date(2014, Date.JAN, 5, 23, 59, 59, 0, isUtc: true);
           Expect.equals(date, cookie.expires);
           Expect.equals("www.example.com", cookie.domain);
           Expect.isTrue(cookie.httpOnly);
         } else if (cookie.name == "name2") {
           Expect.equals("value2", cookie.value);
           Expect.equals(100, cookie.maxAge);
           Expect.equals(".example.com", cookie.domain);
           Expect.equals("/shop", cookie.path);
         } else {
           Expect.fail("Unexpected cookie");
         }
       });
       HttpClientConnection conn2 =
           httpClient.get("127.0.0.1", port, "/cookie2");
       conn2.onRequest = (HttpClientRequest request) {
         request.cookies.add(response.cookies[0]);
         request.cookies.add(response.cookies[1]);
         request.outputStream.close();
       };
-      conn2.onResponse = (HttpClientRequest request) {
+      conn2.onResponse = (HttpClientResponse ignored) {
         httpClient.shutdown();
         testServerMain.shutdown();
       };
     };
   });
   testServerMain.start();
 }
 
 void main() {
-  testStartStop();
-  testGET();
-  testPOST(true);
-  testPOST(false);
-  testReadInto(true);
-  testReadInto(false);
-  testReadShort(true);
-  testReadShort(false);
-  test404();
-  testReasonPhrase();
   testHost();
   testExpires();
   testContentType();
   testCookies();
 }