Change the handling of closing sockets

tests/standalone/src/EchoServerTest.dart

 // Copyright (c) 2011, 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.
 //
 // Echo server test program for testing sockets.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
 class EchoServerTest {
 
   static void testMain() {
     EchoServerGame echoServerGame = new EchoServerGame.start();
   }
 }
 
 class EchoServerGame {
 
   static final MSGSIZE = 10;
   static final SERVERINIT = 0;
   static final SERVERSHUTDOWN = -1;
-  static final MESSAGES = 200;
+  static final MESSAGES = 100;
   static final FIRSTCHAR = 65;
 
   EchoServerGame.start()
       : _receivePort = new ReceivePort(),
         _sendPort = null,
         _buffer = new List<int>(MSGSIZE),
         _messages = 0 {
     for (int i = 0; i < MSGSIZE; i++) {
       _buffer[i] = FIRSTCHAR + i;
     }
@@ skipping 31 matching lines @@
             sendData();
           } else {
             shutdown();
           }
         }
       }
 
       handleRead();
     }
 
-    void closeHandler() {
-      _socket.close();
-    }
-
     void errorHandler() {
-      print("Socket error");
-      _socket.close();
+      Expect.fail("Socket error");
     }
 
     void connectHandler() {
 
       void writeMessage() {
         int bytesWritten = 0;
 
         void handleWrite() {
           bytesWritten += _socket.writeList(
               _buffer, bytesWritten, MSGSIZE - bytesWritten);
           if (bytesWritten < MSGSIZE) {
             _socket.writeHandler = handleWrite;
           }
         }
 
         handleWrite();
       }
 
       _socket.dataHandler = messageHandler;
-      _socket.closeHandler = closeHandler;
       _socket.errorHandler = errorHandler;
       writeMessage();
     }
 
     _socket = new Socket(EchoServer.HOST, _port);
     if (_socket !== null) {
       _socket.connectHandler = connectHandler;
     } else {
-      Expect.fail("socket creation failed");
+      Expect.fail("Socket creation failed");
     }
   }
 
   void start() {
     _receivePort.receive((var message, SendPort replyTo) {
       _port = message;
       sendData();
     });
     _sendPort.send(SERVERINIT, _receivePort.toSendPort());
   }
@@ skipping 45 matching lines @@
               void writeMessage() {
 
                 int bytesWritten = 0;
 
                 void handleWrite() {
                   int written = _client.writeList(
                         buffer, bytesWritten, msgSize - bytesWritten);
                   bytesWritten += written;
                   if (bytesWritten < msgSize) {
                     _client.writeHandler = handleWrite;
+                  } else {
+                    _client.close(true);
                   }
                 }
                 handleWrite();
               }
               writeMessage();
             }
           }
         }
 
         handleRead();
       }
 
       void closeHandler() {
         _client.close();
       }
 
       void errorHandler() {
-        print("Socket error");
-        _client.close();
+        Expect.fail("Socket error");
       }
 
       _client = _server.accept();
       _client.dataHandler = messageHandler;
       _client.closeHandler = closeHandler;
       _client.errorHandler = errorHandler;
     }
 
     void errorHandlerServer() {
-      print("Server socket error");
-      _server.close();
+      Expect.fail("Server socket error");
     }
 
     this.port.receive((message, SendPort replyTo) {
       if (message == EchoServerGame.SERVERINIT) {
         _server = new ServerSocket(HOST, 0, 10);
         Expect.equals(true, _server !== null);
         _server.connectionHandler = connectionHandler;
         _server.errorHandler = errorHandlerServer;
         replyTo.send(_server.port, null);
       } else if (message == EchoServerGame.SERVERSHUTDOWN) {
         _server.close();
         this.port.close();
       }
     });
   }
 
   ServerSocket _server;
 }
 
 main() {
   EchoServerTest.testMain();
 }