From: Andreas Beeker Date: Sat, 31 Dec 2016 21:37:14 +0000 (+0000) Subject: fix forbidden-apis-check error X-Git-Tag: REL_3_16_BETA2~79 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6507656c44021e4412b4c1af3edcdaf60e31e411;p=poi.git fix forbidden-apis-check error git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1776817 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java b/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java index 79d7bed610..b82d92136e 100644 --- a/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java +++ b/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java @@ -122,7 +122,7 @@ public class OOXMLLister implements Closeable { container.close(); } - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws IOException, InvalidFormatException { if(args.length == 0) { System.err.println("Use:"); System.err.println("\tjava OOXMLLister "); diff --git a/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java b/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java index 94b01173d8..cb883c8765 100644 --- a/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java +++ b/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java @@ -20,28 +20,34 @@ ==================================================================== */ package org.apache.poi.dev; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; + +import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageAccess; import org.apache.poi.util.NullOutputStream; import org.apache.poi.xssf.XSSFTestDataSamples; import org.junit.Test; -import java.io.File; -import java.io.PrintStream; - public class TestOOXMLLister { @Test - public void testMain() throws Exception { + public void testMain() throws IOException, InvalidFormatException { File file = XSSFTestDataSamples.getSampleFile("Formatting.xlsx"); OOXMLLister.main(new String[] {file.getAbsolutePath()}); } @Test - public void testWithPrintStream() throws Exception { + public void testWithPrintStream() throws IOException, InvalidFormatException { File file = XSSFTestDataSamples.getSampleFile("Formatting.xlsx"); - OOXMLLister lister = new OOXMLLister(OPCPackage.open(file.getAbsolutePath(), PackageAccess.READ), new PrintStream(new NullOutputStream())); + PrintStream nullStream = new PrintStream(new NullOutputStream(), true, "UTF-8"); + OPCPackage opc = OPCPackage.open(file.getAbsolutePath(), PackageAccess.READ); + OOXMLLister lister = new OOXMLLister(opc, nullStream); lister.displayParts(); lister.displayRelations(); lister.close(); + opc.close(); + nullStream.close(); } }