Ensure writer.close() is invoked by CMLWriter.

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
cdk · Jul 22, 2014 · 91d2592 · 91d2592
1 parent 33c6627
commit 91d2592
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/storage/libiocml/pom.xml b/storage/libiocml/pom.xml
@@ -45,6 +45,11 @@
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>jgrapht</groupId>
             <artifactId>jgrapht</artifactId>

diff --git a/storage/libiocml/src/main/java/org/openscience/cdk/io/CMLWriter.java b/storage/libiocml/src/main/java/org/openscience/cdk/io/CMLWriter.java
@@ -141,6 +141,10 @@ public CMLWriter(final Writer writer) {
             public void write(int b) throws IOException {
                 writer.write(b);
             }
+
+            @Override public void close() throws IOException {
+                writer.close();
+            }
         };
 
         initIOSettings();

diff --git a/storage/libiocml/src/test/java/org/openscience/cdk/io/cml/CML2WriterTest.java b/storage/libiocml/src/test/java/org/openscience/cdk/io/cml/CML2WriterTest.java
@@ -27,13 +27,16 @@
  *  */
 package org.openscience.cdk.io.cml;
 
+import java.io.IOException;
 import java.io.StringWriter;
+import java.io.Writer;
 
 import javax.vecmath.Point3d;
 import javax.vecmath.Vector3d;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.CDKConstants;
 import org.openscience.cdk.CDKTestCase;
@@ -533,4 +536,10 @@ public class CML2WriterTest extends CDKTestCase {
 //        Assert.assertTrue(cmlContent.indexOf("<molecule id=\"D") != -1);
 //        Assert.assertTrue(cmlContent.indexOf("<molecule id=\"E") != -1);
 //    }
+
+    @Test public void writeIsClosed() throws IOException {
+        Writer mock = Mockito.mock(Writer.class);
+        new CMLWriter(mock).close();
+        Mockito.verify(mock).close();
+    }
 }