Merge IO v2 branch to bleeding edge

samples/tests/samples/chat/chat_server_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:io';
@@ skipping 34 matching lines @@
   int messagesToReceive;  // Numbe rof messages expected to be received.
   int port;  // TCP/IP port for server.
 
   String sessionId;  // Session id when connected.
   int sendMessageNumber;  // Number of messages sent.
   int joinCount;
   int messageCount;
   int receiveMessageNumber;  // Number of messages received.
 
   void leave() {
-    HttpClientRequest request;
-    HttpClientResponse response;
-
-    void leaveResponseHandler(String data) {
+    void leaveResponseHandler(response, String data) {
       Expect.equals(HttpStatus.OK, response.statusCode);
       var responseData = json.parse(data);
       Expect.equals("leave", responseData["response"]);
 
       // Test done.
       statusPort.send("Test succeeded", null);
     }
 
     Map leaveRequest = new Map();
     leaveRequest["request"] = "leave";
     leaveRequest["sessionId"] = sessionId;
-    HttpClientConnection conn = httpClient.post("127.0.0.1", port, "/leave");
-    conn.onRequest = (HttpClientRequest request) {
-      request.outputStream.writeString(json.stringify(leaveRequest));
-      request.outputStream.close();
-    };
-    conn.onResponse = (HttpClientResponse r) {
-      response = r;
-      StringInputStream stream = new StringInputStream(response.inputStream);
-      StringBuffer body = new StringBuffer();
-      stream.onData = () => body.add(stream.read());
-      stream.onClosed = () => leaveResponseHandler(body.toString());
-    };
+    httpClient.post("127.0.0.1", port, "/leave")
+      .then((HttpClientRequest request) {
+        request.addString(json.stringify(leaveRequest));
+        return request.close();
+      })
+      .then((HttpClientResponse response) {
+        StringBuffer body = new StringBuffer();
+        response.listen(
+          (data) => body.add(new String.fromCharCodes(data)),
+          onDone: () => leaveResponseHandler(response, body.toString()));
+      });
   }
 
   void receive() {
-    HttpClientRequest request;
-    HttpClientResponse response;
-
-    void receiveResponseHandler(String data) {
+    void receiveResponseHandler(response, String data) {
       Expect.equals(HttpStatus.OK, response.statusCode);
       var responseData = json.parse(data);
       Expect.equals("receive", responseData["response"]);
       Expect.equals(null, responseData["disconnect"]);
       for (int i = 0; i < responseData["messages"].length; i++) {
         Map message = responseData["messages"][i];
         if (message["type"] == "join") {
           joinCount++;
         } else if (message["type"] == "message") {
           messageCount++;
@@ skipping 21 matching lines @@
         Expect.equals(messagesToReceive, messageCount);
         Expect.equals(totalClients, joinCount);
         leave();
       }
     }
 
     Map receiveRequest = new Map();
     receiveRequest["request"] = "receive";
     receiveRequest["sessionId"] = sessionId;
     receiveRequest["nextMessage"] = receiveMessageNumber;
-    HttpClientConnection conn =
-        httpClient.post("127.0.0.1", port, "/receive");
-    conn.onRequest = (HttpClientRequest request) {
-      request.outputStream.writeString(json.stringify(receiveRequest));
-      request.outputStream.close();
-    };
-    conn.onResponse = (HttpClientResponse r) {
-      response = r;
-      StringInputStream stream = new StringInputStream(response.inputStream);
-      StringBuffer body = new StringBuffer();
-      stream.onData = () => body.add(stream.read());
-      stream.onClosed = () => receiveResponseHandler(body.toString());
-    };
+    httpClient.post("127.0.0.1", port, "/receive")
+      .then((HttpClientRequest request) {
+        request.addString(json.stringify(receiveRequest));
+        return request.close();
+      })
+      .then((HttpClientResponse response) {
+        StringBuffer body = new StringBuffer();
+        response.listen(
+          (data) => body.add(new String.fromCharCodes(data)),
+          onDone: () => receiveResponseHandler(response, body.toString()));
+      });
   }
 
   void sendMessage() {
-    HttpClientRequest request;
-    HttpClientResponse response;
-
-    void sendResponseHandler(String data) {
+    void sendResponseHandler(response, String data) {
       Expect.equals(HttpStatus.OK, response.statusCode);
       var responseData = json.parse(data);
       Expect.equals("message", responseData["response"]);
       sendMessageNumber++;
       if (sendMessageNumber < messagesToSend) {
         sendMessage();
       } else {
         receive();
       }
     }
 
     Map messageRequest = new Map();
     messageRequest["request"] = "message";
     messageRequest["sessionId"] = sessionId;
     messageRequest["message"] = "message $sendMessageNumber";
-    HttpClientConnection conn =
-        httpClient.post("127.0.0.1", port, "/message");
-    conn.onRequest = (HttpClientRequest request) {
-      request.outputStream.writeString(json.stringify(messageRequest));
-      request.outputStream.close();
-    };
-    conn.onResponse = (HttpClientResponse r) {
-      response = r;
-      StringInputStream stream = new StringInputStream(response.inputStream);
-      StringBuffer body = new StringBuffer();
-      stream.onData = () => body.add(stream.read());
-      stream.onClosed = () => sendResponseHandler(body.toString());
-    };
+    httpClient.post("127.0.0.1", port, "/message")
+      .then((HttpClientRequest request) {
+        request.addString(json.stringify(messageRequest));
+        return request.close();
+      })
+      .then((HttpClientResponse response) {
+        StringBuffer body = new StringBuffer();
+        response.listen(
+          (data) => body.add(new String.fromCharCodes(data)),
+          onDone: () => sendResponseHandler(response, body.toString()));
+      });
   }
 
   void join() {
-    HttpClientRequest request;
-    HttpClientResponse response;
-
-    void joinResponseHandler(String data) {
+    void joinResponseHandler(response, String data) {
       Expect.equals(HttpStatus.OK, response.statusCode);
       var responseData = json.parse(data);
       Expect.equals("join", responseData["response"]);
       sessionId = responseData["sessionId"];
       Expect.isTrue(sessionId != null);
 
       joinCount = 0;
       messageCount = 0;
       sendMessageNumber = 0;
       receiveMessageNumber = 0;
       sendMessage();
     }
 
     Map joinRequest = new Map();
     joinRequest["request"] = "join";
     joinRequest["handle"] = "test1";
-    HttpClientConnection conn = httpClient.post("127.0.0.1", port, "/join");
-    conn.onRequest = (HttpClientRequest request) {
-      request.outputStream.writeString(json.stringify(joinRequest));
-      request.outputStream.close();
-    };
-    conn.onResponse = (HttpClientResponse r) {
-      response = r;
-      StringInputStream stream = new StringInputStream(response.inputStream);
-      StringBuffer body = new StringBuffer();
-      stream.onData = () => body.add(stream.read());
-      stream.onClosed = () => joinResponseHandler(body.toString());
-    };
+    httpClient.post("127.0.0.1", port, "/join")
+      .then((HttpClientRequest request) {
+        request.addString(json.stringify(joinRequest));
+        return request.close();
+      })
+      .then((HttpClientResponse response) {
+        StringBuffer body = new StringBuffer();
+        response.listen(
+          (data) => body.add(new String.fromCharCodes(data)),
+          onDone: () => joinResponseHandler(response, body.toString()));
+      });
   }
 
   void dispatch(message, replyTo) {
     totalClients = message.totalClients;
     messagesToSend = message.messagesToSend;
     messagesToReceive = message.messagesToReceive;
     port = message.port;
     statusPort = replyTo;
 
     // Create a HTTP client factory.
@@ skipping 60 matching lines @@
 
       clientStatusPorts[i] = statusPort;
       clientPorts[i] = spawnFunction(startChatTestClient);
       liveClientsCount++;
       if (liveClientsCount == clientCount) {
         // Once all clients are running send server start message to
         // the server. Use port 0 for an ephemeral port. The actual
         // port will be returned with the server started
         // message. Use a backlog equal to the client count to avoid
         // connection issues.
-        serverPort.send(new ChatServerCommand.start("127.0.0.1",
-                                                    0,
-                                                    backlog: clientCount),
+        serverPort.send(new ChatServerCommand.start("127.0.0.1", 0),
                         serverStatusPort.toSendPort());
       }
     }
   }
 
   int clientCount;  // Number of clients to run.
   int messageCount;  // Number of messages per clients to send.
   int finishedClients;  // Number of clients finished.
 
   // Ports for communicating with the server.
@@ skipping 24 matching lines @@
   TestMain testMain = new TestMain.run(10, 2);
 }
 
 
 void main() {
   testOneClient();
   testTwoClients();
   testTwoClientsMoreMessages();
   testTenClients();
 }