Rewrite test

sdk/lib/io/string_stream.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.
 
 part of dart.io;
 
 // Interface for decoders decoding binary data into string data. The
 // decoder keeps track of line breaks during decoding.
 abstract class _StringDecoder {
   // Add more binary data to be decoded. The ownership of the buffer
   // is transfered to the decoder and the caller most not modify it any more.
   int write(List<int> buffer);
 
+  void done();
+
   // Returns whether any decoded data is available.
   bool get isEmpty;
 
   // Returns the number of available decoded characters.
   int available();
 
   // Get the number of line breaks present in the current decoded
   // data.
   int get lineBreaks;
 
@@ skipping 57 matching lines @@
     _bufferList.add(buffer);
     // Decode as many bytes into characters as possible.
     while (_bufferList.length > 0) {
       if (!_processNext()) {
         break;
       }
     }
     return buffer.length;
   }
 
+  void done() { }
+
   bool get isEmpty => _result.isEmpty;
 
   int get lineBreaks => _lineBreaks;
 
   String decoded([int length]) {
     if (isEmpty) return null;
 
     List<int> result;
     if (length != null && length < available()) {
       result = _result.getRange(_resultOffset, length);
@@ skipping 77 matching lines @@
   final int CR = 13;
 }
 
 
 // Utility class for decoding UTF-8 from data delivered as a stream of
 // bytes.
 class _UTF8Decoder extends _StringDecoderBase {
   static const kMaxCodePoint = 0x10FFFF;
   static const kReplacementCodePoint = 0x3f;
 
+  void done() {
+    if (!_bufferList.isEmpty) {
+      _reportError(new DecoderException("Illegal UTF-8"));
+    }
+  }
+
   void _reportError(error) {
     if (onError != null) {
       onError(error);
       return false;
     } else {
       throw error;
     }
   }
 
   // Process the next UTF-8 encoded character.
@@ skipping 12 matching lines @@
       } else if ((value & 0xf8) == 0xf0) {  // 11110xxx
         value = value & 0x07;
         additionalBytes = 3;
       } else if ((value & 0xfc) == 0xf8) {  // 111110xx
         value = value & 0x03;
         additionalBytes = 4;
       } else if ((value & 0xfe) == 0xfc) {  // 1111110x
         value = value & 0x01;
         additionalBytes = 5;
       } else {
-        _reportError(new DecoderException("Illegal UTF-8"));
+        return _reportError(new DecoderException("Illegal UTF-8"));
       }
       // Check if there are enough bytes to decode the character. Otherwise
       // return false.
       if (_bufferList.length < additionalBytes + 1) {
         return false;
       }
       // Remove the value peeked from the buffer list.
       _bufferList.next();
       for (int i = 0; i < additionalBytes; i++) {
         int byte = _bufferList.next();
         if ((byte & 0xc0) != 0x80) {
-          _reportError(new DecoderException("Illegal UTF-8"));
+          return _reportError(new DecoderException("Illegal UTF-8"));
         }
         value = value << 6 | (byte & 0x3F);
       }
     } else {
       // Remove the value peeked from the buffer list.
       _bufferList.next();
     }
     if (value > kMaxCodePoint) {
       addChar(kReplacementCodePoint);
     } else {
@@ skipping 227 matching lines @@
     }
     if (_decoder.lineBreaks > 0 && _clientLineHandler != null) {
       _clientLineHandler();
     }
     _checkScheduleCallback();
     _checkInstallDataHandler();
   }
 
   void _onClosed() {
     _inputClosed = true;
+    _decoder.done();
     if (_decoder.isEmpty && _clientCloseHandler !=  null) {
       _clientCloseHandler();
     } else {
       _checkScheduleCallback();
     }
   }
 
   void _readData() {
     List<int> data = _input.read();
     if (data != null) {
@@ skipping 84 matching lines @@
   bool _inputClosed = false;  // Is the underlying input stream closed?
   bool _closed = false;  // Is this stream closed.
   bool _eof = false;  // Has all data been read from the decoder?
   Timer _scheduledDataCallback;
   Timer _scheduledLineCallback;
   Timer _scheduledCloseCallback;
   Function _clientDataHandler;
   Function _clientLineHandler;
   Function _clientCloseHandler;
 }