From 45228f98015faf83bb5e741df581502c2a3708d0 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Thu, 1 Dec 2016 07:12:34 +0000 Subject: [PATCH] Move test to correct package and add some more checks git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1772148 13f79535-47bb-0310-9956-ffa450edef68 --- .../TestZipPackagePropertiesMarshaller.java | 66 +++++++++++++++++++ .../TestZipPackagePropertiesMarshaller.java | 36 ---------- 2 files changed, 66 insertions(+), 36 deletions(-) create mode 100644 src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java delete mode 100644 src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java new file mode 100644 index 000000000..4ff321e37 --- /dev/null +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java @@ -0,0 +1,66 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + +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 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 { + 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"); + } + }); + } +} diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java deleted file mode 100644 index 1a4c0de4f..000000000 --- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestZipPackagePropertiesMarshaller.java +++ /dev/null @@ -1,36 +0,0 @@ -/* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -==================================================================== */ - -package org.apache.poi.openxml4j.opc.internal; - -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; - -import org.apache.poi.openxml4j.exceptions.OpenXML4JException; -import org.apache.poi.openxml4j.opc.internal.marshallers.ZipPackagePropertiesMarshaller; -import org.junit.Test; - -public class TestZipPackagePropertiesMarshaller { - - @Test(expected=IllegalArgumentException.class) - public void nonZipOutputStream() throws OpenXML4JException { - PartMarshaller marshaller = new ZipPackagePropertiesMarshaller(); - OutputStream notAZipOutputStream = new ByteArrayOutputStream(0); - marshaller.marshall(null, notAZipOutputStream); - } - -}