Add close to input stream and cleanup socket and streams

tests/standalone/src/FileTest.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.
 //
 // Dart test program for testing file I/O.
 
 
 class FileTest {
   static Directory tempDirectory;
   static int numLiveAsyncTests = 0;
@@ skipping 14 matching lines @@
 
   static void deleteTempDirectory() {
     tempDirectory.deleteSync();
   }
 
   // Test for file read functionality.
   static int testReadStream() {
     // Read a file and check part of it's contents.
     String filename = getFilename("bin/file_test.cc");
     File file = new File(filename);
-    FileInputStream input = file.openInputStream();
+    InputStream input = file.openInputStream();
     List<int> buffer = new List<int>(42);
     int bytesRead = input.readInto(buffer, 0, 12);
     Expect.equals(12, bytesRead);
     bytesRead = input.readInto(buffer, 12, 30);
     input.close();
     Expect.equals(30, bytesRead);
     Expect.equals(47, buffer[0]);  // represents '/' in the file.
     Expect.equals(47, buffer[1]);  // represents '/' in the file.
     Expect.equals(32, buffer[2]);  // represents ' ' in the file.
     Expect.equals(67, buffer[3]);  // represents 'C' in the file.
     Expect.equals(111, buffer[4]);  // represents 'o' in the file.
     Expect.equals(112, buffer[5]);  // represents 'p' in the file.
     Expect.equals(121, buffer[6]);  // represents 'y' in the file.
     Expect.equals(114, buffer[7]);  // represents 'r' in the file.
     Expect.equals(105, buffer[8]);  // represents 'i' in the file.
     Expect.equals(103, buffer[9]);  // represents 'g' in the file.
     Expect.equals(104, buffer[10]);  // represents 'h' in the file.
     Expect.equals(116, buffer[11]);  // represents 't' in the file.
     return 1;
   }
 
   // Test for file read and write functionality.
   static int testReadWriteStream() {
     // Read a file.
     String inFilename = getFilename("tests/vm/data/fixed_length_file");
     File file = new File(inFilename);
-    FileInputStream input = file.openInputStream();
+    InputStream input = file.openInputStream();
     List<int> buffer1 = new List<int>(42);
     int bytesRead = input.readInto(buffer1, 0, 42);
     Expect.equals(42, bytesRead);
-    input.close();
+    Expect.isTrue(input.closed);
     // Write the contents of the file just read into another file.
     String outFilename = tempDirectory.path + "/out_read_write_stream";
     file = new File(outFilename);
     OutputStream output = file.openOutputStream();
     bool writeDone = output.writeFrom(buffer1, 0, 42);
     Expect.equals(true, writeDone);
     output.close();
     // Now read the contents of the file just written.
     List<int> buffer2 = new List<int>(42);
     file = new File(outFilename);
     input = file.openInputStream();
     bytesRead = input.readInto(buffer2, 0, 42);
-    input.close();
+    Expect.isTrue(input.closed);
+    //input.close();

[Mads Ager (google), 2011/12/23 08:35:40]

Code in comment.

[Søren Gjesse, 2012/01/02 11:51:17]

Done.

     Expect.equals(42, bytesRead);
     // Now compare the two buffers to check if they are identical.
     for (int i = 0; i < buffer1.length; i++) {
       Expect.equals(buffer1[i],  buffer2[i]);
     }
     // Delete the output file.
     file.deleteSync();
     Expect.isFalse(file.existsSync());
     return 1;
   }
@@ skipping 388 matching lines @@
       wrongExceptionCaught = true;
     }
     Expect.equals(true, exceptionCaught);
     Expect.equals(true, !wrongExceptionCaught);
     input.deleteSync();
     return 1;
   }
 
   // Tests stream exception handling after file was closed.
   static int testCloseExceptionStream() {
-    bool exceptionCaught = false;
-    bool wrongExceptionCaught = false;
+    List<int> buffer = new List<int>(42);
     File file = new File(tempDirectory.path + "/out_close_exception_stream");
     file.createSync();
-    FileInputStream input = file.openInputStream();
-    input.close();
-    try {
-      List<int> buffer = new List<int>(42);
-      input.readInto(buffer, 0, 12);
-    } catch (FileIOException ex) {
-      exceptionCaught = true;
-    } catch (Exception ex) {
-      wrongExceptionCaught = true;
-    }
-    Expect.equals(true, exceptionCaught);
-    Expect.equals(true, !wrongExceptionCaught);
-    exceptionCaught = false;
+    InputStream input = file.openInputStream();
+    Expect.isTrue(input.closed);
+    Expect.throws(( ) => input.readInto(buffer, 0, 12),
+                  (e) => e is FileIOException);
     OutputStream output = file.openOutputStream();
     output.close();
-    try {
-      List<int> buffer = new List<int>(42);
-      bool readDone = output.writeFrom(buffer, 0, 12);
-    } catch (FileIOException ex) {
-      exceptionCaught = true;
-    } catch (Exception ex) {
-      wrongExceptionCaught = true;
-    }
-    Expect.equals(true, exceptionCaught);
-    Expect.equals(true, !wrongExceptionCaught);
+    Expect.throws(( ) => output.writeFrom(buffer, 0, 12),
+                  (e) => e is FileIOException);
     file.deleteSync();
     return 1;
   }
 
   // Tests buffer out of bounds exception.
   static int testBufferOutOfBoundsException() {
     bool exceptionCaught = false;
     bool wrongExceptionCaught = false;
     File file = new File(tempDirectory.path + "/out_buffer_out_of_bounds");
     RandomAccessFile openedFile = file.openSync(true);
@@ skipping 133 matching lines @@
         Expect.equals(1, testCloseExceptionStream());
         Expect.equals(1, testBufferOutOfBoundsException());
         asyncTestDone();
       });
   }
 }
 
 main() {
   FileTest.testMain();
 }