From: PJ Fanning Date: Wed, 6 Jun 2018 16:27:02 +0000 (+0000) Subject: fix test class name X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd90cb4ea7d50df8410c7f69b10981e3adecb372;p=poi.git fix test class name git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1833056 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java b/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java index cee2380402..54e1cddbac 100644 --- a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java +++ b/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; import java.util.Enumeration; -import java.util.zip.ZipEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.poi.openxml4j.opc.internal.ZipHelper; diff --git a/src/ooxml/testcases/org/apache/poi/TestEmbedded.java b/src/ooxml/testcases/org/apache/poi/TestEmbedded.java new file mode 100644 index 0000000000..841e4f6cc6 --- /dev/null +++ b/src/ooxml/testcases/org/apache/poi/TestEmbedded.java @@ -0,0 +1,71 @@ + +/* ==================================================================== + 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; + +import org.apache.poi.ooxml.POIXMLDocument; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xslf.usermodel.XSLFSlideShow; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.poi.openxml4j.opc.OPCPackage; +import org.apache.poi.openxml4j.opc.PackagePart; + +import junit.framework.TestCase; + +/** + * Class to test that we handle embeded bits in + * OOXML files properly + */ +public class TestEmbedded extends TestCase +{ + public void testExcel() throws Exception { + POIXMLDocument doc = new XSSFWorkbook( + POIDataSamples.getSpreadSheetInstance().openResourceAsStream("ExcelWithAttachments.xlsm") + ); + test(doc, 4); + } + + public void testWord() throws Exception { + POIXMLDocument doc = new XWPFDocument( + POIDataSamples.getDocumentInstance().openResourceAsStream("WordWithAttachments.docx") + ); + test(doc, 5); + } + + public void testPowerPoint() throws Exception { + POIXMLDocument doc = new XSLFSlideShow(OPCPackage.open( + POIDataSamples.getSlideShowInstance().openResourceAsStream("PPTWithAttachments.pptm")) + ); + test(doc, 4); + } + + private void test(POIXMLDocument doc, int expectedCount) throws Exception { + assertNotNull(doc.getAllEmbedds()); + assertEquals(expectedCount, doc.getAllEmbedds().size()); + + for(int i=0; i 0); + } + } +} diff --git a/src/ooxml/testcases/org/apache/poi/TestEmbeded.java b/src/ooxml/testcases/org/apache/poi/TestEmbeded.java deleted file mode 100644 index 9095906b90..0000000000 --- a/src/ooxml/testcases/org/apache/poi/TestEmbeded.java +++ /dev/null @@ -1,71 +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; - -import org.apache.poi.ooxml.POIXMLDocument; -import org.apache.poi.util.IOUtils; -import org.apache.poi.xslf.usermodel.XSLFSlideShow; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.openxml4j.opc.OPCPackage; -import org.apache.poi.openxml4j.opc.PackagePart; - -import junit.framework.TestCase; - -/** - * Class to test that we handle embeded bits in - * OOXML files properly - */ -public class TestEmbeded extends TestCase -{ - public void testExcel() throws Exception { - POIXMLDocument doc = new XSSFWorkbook( - POIDataSamples.getSpreadSheetInstance().openResourceAsStream("ExcelWithAttachments.xlsm") - ); - test(doc, 4); - } - - public void testWord() throws Exception { - POIXMLDocument doc = new XWPFDocument( - POIDataSamples.getDocumentInstance().openResourceAsStream("WordWithAttachments.docx") - ); - test(doc, 5); - } - - public void testPowerPoint() throws Exception { - POIXMLDocument doc = new XSLFSlideShow(OPCPackage.open( - POIDataSamples.getSlideShowInstance().openResourceAsStream("PPTWithAttachments.pptm")) - ); - test(doc, 4); - } - - private void test(POIXMLDocument doc, int expectedCount) throws Exception { - assertNotNull(doc.getAllEmbedds()); - assertEquals(expectedCount, doc.getAllEmbedds().size()); - - for(int i=0; i 0); - } - } -}