commit 7bf840cb3a4e6e7d7ea54f20a3587d301ae3a252
author Andrey Somov <public.somov@gmail.com> Thu Jun 09 22:23:43 2011 +0200
committer Andrey Somov <public.somov@gmail.com> Thu Jun 09 22:23:43 2011 +0200
tree 6e807a827a1500d3bbe5bbb2a551dffdf475c152
parent 37c1b0be3cfcd6fd38fdbae858a02c49e438d85b

Issue 121: close more input streams in tests

src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java

diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java
index 901072c..b42a049 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue68/NonAsciiCharacterTest.java
@@ -18,6 +18,7 @@
 

 import java.io.FileInputStream;

 import java.io.FileNotFoundException;

+import java.io.IOException;

 import java.io.InputStream;

 import java.io.InputStreamReader;

 import java.io.UnsupportedEncodingException;

@@ -42,9 +43,10 @@
     public void testLoadFromFileWithWrongEncoding() {

         try {

             Yaml yaml = new Yaml();

-            Object text = yaml.load(new InputStreamReader(new FileInputStream(

-                    "src/test/resources/issues/issue68.txt"), "Cp1252"));

-            fail("Invalid UTF-8 must not be aceepted: " + text.toString());

+            InputStream input = new FileInputStream("src/test/resources/issues/issue68.txt");

+            Object text = yaml.load(new InputStreamReader(input, "Cp1252"));

+            input.close();

+            fail("Invalid UTF-8 must not be accepted: " + text.toString());

         } catch (Exception e) {

             assertEquals("special characters are not allowed", e.getMessage());

         }

@@ -52,12 +54,12 @@
 

     public void testLoadFromFile() throws UnsupportedEncodingException, FileNotFoundException {

         Yaml yaml = new Yaml();

-        String text = (String) yaml.load(new InputStreamReader(new FileInputStream(

-                "src/test/resources/issues/issue68.txt"), "UTF-8"));

+        InputStream input = new FileInputStream("src/test/resources/issues/issue68.txt");

+        String text = (String) yaml.load(new InputStreamReader(input, "UTF-8"));

         assertEquals("И жить торопится и чувствовать спешит...", text);

     }

 

-    public void testLoadFromInputStream() {

+    public void testLoadFromInputStream() throws IOException {

         InputStream input;

         input = YamlDocument.class.getClassLoader().getResourceAsStream("issues/issue68.txt");

         if (input == null) {

@@ -66,5 +68,6 @@
         Yaml yaml = new Yaml();

         String text = (String) yaml.load(input);// UTF-8 by default

         assertEquals("И жить торопится и чувствовать спешит...", text);

+        input.close();

     }

 }

src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java

diff --git a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
index 9a0f45b..eaeec72 100644
--- a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
+++ b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
@@ -76,6 +76,7 @@
         reader.forward(1);

         assertEquals('\u0000', reader.peek());

         assertEquals(Charset.forName("UTF-8"), reader.getEncoding());

+        input.close();

     }

 

     public void testUnicodeLeBom() throws IOException {

@@ -93,6 +94,7 @@
         reader.forward(1);

         assertEquals('\u0000', reader.peek());

         assertEquals(Charset.forName("UTF-16LE"), reader.getEncoding());

+        input.close();

     }

 

     public void testUnicodeBeBom() throws IOException {

@@ -110,6 +112,6 @@
         reader.forward(1);

         assertEquals('\u0000', reader.peek());

         assertEquals(Charset.forName("UTF-16BE"), reader.getEncoding());

+        input.close();

     }

-

 }