Add close to input stream and cleanup socket and streams

tests/standalone/src/EchoServerStreamTest.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 to test socket streams.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
@@ skipping 16 matching lines @@
       _buffer[i] = FIRSTCHAR + i;
     }
     new EchoServer().spawn().then((SendPort port) {
       _sendPort = port;
       start();
     });
   }
 
   void sendData() {
 
-    void closeHandler() {
-      _socket.close();
-    }
-
     void errorHandler() {
       Expect.fail("Socket error");
     }
 
     void connectHandler() {
 
       SocketOutputStream stream = _socket.outputStream;
 
       void dataSent() {
         InputStream inputStream = _socket.inputStream;
         int offset = 0;
         List<int> data;
 
-        void dataReceived() {
+        void onClose() {
+          Expect.equals(MSGSIZE, offset);
+          _messages++;
+          if (_messages < MESSAGES) {
+            sendData();
+          } else {
+            shutdown();
+          }
+        }
+
+        void onData() {
           // Test both read and readInto.
           int bytesRead = 0;
           if (_messages % 2 == 0) {
             bytesRead = inputStream.readInto(data, offset, MSGSIZE - offset);
             for (int i = 0; i < offset + bytesRead; i++) {
               Expect.equals(FIRSTCHAR + i, data[i]);
             }
           } else {
             data = inputStream.read();
             bytesRead = data.length;
             for (int i = 0; i < data.length; i++) {
               Expect.equals(FIRSTCHAR + i + offset, data[i]);
             }
           }
 
           offset += bytesRead;
-          if (offset == MSGSIZE) {
-            _messages++;
-            _socket.close();
-            if (_messages < MESSAGES) {
-              sendData();
-            } else {
-              shutdown();
-            }
-          }
         }
 
         if (_messages % 2 == 0) data = new List<int>(MSGSIZE);
-        inputStream.dataHandler = dataReceived;
+        inputStream.dataHandler = onData;
+        inputStream.closeHandler = onClose;
       }
 
-      _socket.closeHandler = closeHandler;
       _socket.errorHandler = errorHandler;
 
       // Test both write and writeFrom in different forms.
-      switch (_messages % 2) {
+      switch (_messages % 4) {
         case 0:
           stream.write(_buffer);
           break;
         case 1:
           stream.write(_buffer, false);
           break;
         case 2:
           stream.writeFrom(_buffer);
           break;
         case 3:
+          Expect.equals(0, _buffer.length % 2);
           stream.writeFrom(_buffer, len: _buffer.length ~/ 2);
           stream.writeFrom(_buffer, _buffer.length ~/ 2);
           break;
       }
       stream.close();
       dataSent();
     }
 
     _socket = new Socket(TestingServer.HOST, _port);
     if (_socket !== null) {
@@ skipping 57 matching lines @@
 
     inputStream = connection.inputStream;
     inputStream.dataHandler = dataReceived;
     connection.errorHandler = errorHandler;
   }
 }
 
 main() {
   EchoServerGame echoServerGame = new EchoServerGame.start();
 }