Bugfix in dart:io's WebSocketTransformer implementation, correctly test async behaviour of websocke…

dart/tests/standalone/io/web_socket_test.dart

 // Copyright (c) 2013, 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:async";
@@ skipping 25 matching lines @@
                                      certificateName: CERT_NAME)
              : HttpServer.bind(HOST_NAME,
                                0,
                                backlog: backlog);
 
   Future<WebSocket> createClient(int port) =>
     WebSocket.connect('${secure ? "wss" : "ws"}://$HOST_NAME:$port/');
 
   void testRequestResponseClientCloses(int totalConnections,
                                        int closeStatus,
-                                       String closeReason) {
+                                       String closeReason,
+                                       int numberOfMessages) {
+    assert (numberOfMessages >= 1);
+
+    asyncStart();
     createServer().then((server) {
       server.transform(new WebSocketTransformer()).listen((webSocket) {
+        asyncStart();
         webSocket.listen(
             webSocket.add,
             onDone: () {
               Expect.equals(closeStatus == null
                             ? WebSocketStatus.NO_STATUS_RECEIVED
                             : closeStatus, webSocket.closeCode);
               Expect.equals(
                   closeReason == null ? ""
                                       : closeReason, webSocket.closeReason);
+              asyncEnd();
             });
+        }, onDone: () {
+          asyncEnd();
         });
 
       int closeCount = 0;
       String messageText = "Hello, world!";
       for (int i = 0; i < totalConnections; i++) {
-        int messageCount = 0;
+        asyncStart();
         createClient(server.port).then((webSocket) {
           webSocket.add(messageText);
           webSocket.listen(
               (message) {
-                messageCount++;
-                if (messageCount < 1 ) {
-                  Expect.equals(messageText, message);
+                numberOfMessages--;
+                Expect.equals(messageText, message);
+
+                if (numberOfMessages > 0) {
                   webSocket.add(message);
                 } else {
                   webSocket.close(closeStatus, closeReason);
                 }
               },
               onDone: () {
                 Expect.equals(closeStatus == null
                               ? WebSocketStatus.NO_STATUS_RECEIVED
                               : closeStatus, webSocket.closeCode);
                 Expect.equals("", webSocket.closeReason);
                 closeCount++;
                 if (closeCount == totalConnections) {
                   server.close();
                 }
+                asyncEnd();
               });
           });
       }
     });
   }
 
   void testRequestResponseServerCloses(int totalConnections,
                                        int closeStatus,
                                        String closeReason) {
     createServer().then((server) {
@@ skipping 320 matching lines @@
       WebSocket.connect(url).then((websocket) {
         return websocket.listen((message) {
           Expect.equals("Hello", message);
           websocket.close();
         }).asFuture();
       }).then((_) => server.close());
     });
   }
 
   void runTests() {
-    testRequestResponseClientCloses(2, null, null);
-    testRequestResponseClientCloses(2, 3001, null);
-    testRequestResponseClientCloses(2, 3002, "Got tired");
+    testRequestResponseClientCloses(2, null, null, 1);
+    testRequestResponseClientCloses(2, 3001, null, 2);
+    testRequestResponseClientCloses(2, 3002, "Got tired", 3);
     testRequestResponseServerCloses(2, null, null);
     testRequestResponseServerCloses(2, 3001, null);
     testRequestResponseServerCloses(2, 3002, "Got tired");
     testMessageLength(125);
     testMessageLength(126);
     testMessageLength(127);
     testMessageLength(65535);
     testMessageLength(65536);
     testDoubleCloseClient();
     testDoubleCloseServer();
     testImmediateCloseServer();
     testImmediateCloseClient();
     testNoUpgrade();
     testUsePOST();
     testConnections(10, 3002, "Got tired");
     testIndividualUpgrade(5);
     testFromUpgradedSocket();
   }
 }
 
 
 void initializeSSL() {
   var testPkcertDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: testPkcertDatabase,
                           password: "dartdart");
 }
 
 
 main() {
-  asyncStart();
   new SecurityConfiguration(secure: false).runTests();
   initializeSSL();
   new SecurityConfiguration(secure: true).runTests();
-  asyncEnd();
 }