svn commit: r1772148 - in /poi/trunk/src/ooxml: java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java

[ce...@apache.org]

Author: centic
Date: Thu Dec  1 07:12:34 2016
New Revision: 1772148

URL: http://svn.apache.org/viewvc?rev=1772148&view=rev
Log:
Move test to correct package and add some more checks

Added:
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
      - copied, changed from r1772147, poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java
Removed:
    poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java

Copied: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java (from r1772147, poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java?p2=poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java&p1=poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java&r1=1772147&r2=1772148&rev=1772148&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java Thu Dec  1 07:12:34 2016
@@ -15,22 +15,52 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.openxml4j.opc.internal;
+package org.apache.poi.openxml4j.opc.internal.marshallers;
+
+import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
+import org.apache.poi.openxml4j.opc.PackagingURIHelper;
+import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
+import org.apache.poi.openxml4j.opc.internal.PartMarshaller;
+import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.internal.marshallers.ZipPackagePropertiesMarshaller;
-import org.junit.Test;
+import static org.apache.poi.openxml4j.opc.PackagingURIHelper.PACKAGE_RELATIONSHIPS_ROOT_URI;
+import static org.junit.Assert.assertTrue;
 
 public class TestZipPackagePropertiesMarshaller {
+    private PartMarshaller marshaller = new ZipPackagePropertiesMarshaller();
 
     @Test(expected=IllegalArgumentException.class)
     public void nonZipOutputStream() throws OpenXML4JException {
-        PartMarshaller marshaller = new ZipPackagePropertiesMarshaller();
         OutputStream notAZipOutputStream = new ByteArrayOutputStream(0);
         marshaller.marshall(null, notAZipOutputStream);
     }
 
+    @Test
+    public void withZipOutputStream() throws Exception {
+        assertTrue(marshaller.marshall(new PackagePropertiesPart(null, PackagingURIHelper.createPartName(PACKAGE_RELATIONSHIPS_ROOT_URI)),
+                new ZipOutputStream(new ByteArrayOutputStream())));
+    }
+
+    @Test
+    public void writingFails() throws Exception {
+        assertTrue(marshaller.marshall(new PackagePropertiesPart(null, PackagingURIHelper.createPartName(PACKAGE_RELATIONSHIPS_ROOT_URI)),
+                new ZipOutputStream(new ByteArrayOutputStream())));
+    }
+
+    @Test(expected=OpenXML4JException.class)
+    public void ioException() throws Exception {
+        marshaller.marshall(new PackagePropertiesPart(null, PackagingURIHelper.createPartName(PACKAGE_RELATIONSHIPS_ROOT_URI)),
+                new ZipOutputStream(new ByteArrayOutputStream()) {
+                    @Override
+                    public void putNextEntry(ZipEntry e) throws IOException {
+                        throw new IOException("TestException");
+                    }
+                });
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org