From 5845a41b78b0f01735cf7ada45bd044ab4f90e5e Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Tue, 7 Jul 2015 07:44:11 +0000 Subject: [PATCH] Add some missing close(), reduce output in unit tests and remove some other Eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1689590 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/stress/XSLFFileHandler.java | 4 +- .../extractor/TestOutlookTextExtractor.java | 41 +++++++++++++------ .../poi/hssf/dev/BaseXLSIteratingTest.java | 2 +- .../apache/poi/hssf/usermodel/TestBugs.java | 1 - 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java b/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java index b734c4e4bc..b6f5f7cffe 100644 --- a/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java +++ b/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java @@ -88,12 +88,14 @@ public class XSLFFileHandler extends AbstractFileHandler { } } } + + ppt.close(); } // a test-case to test this locally without executing the full TestAllFiles @Test public void test() throws Exception { - InputStream stream = new FileInputStream("test-data/slideshow/pptx2svg.pptx"); + InputStream stream = new FileInputStream("test-data/slideshow/SampleShow.pptx"); try { handleFile(stream); } finally { diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java b/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java index 3d276ce64a..adbb966a84 100644 --- a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java +++ b/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java @@ -60,6 +60,8 @@ public final class TestOutlookTextExtractor extends POITestCase { String dateText = f.format(cal.getTime()); assertContains(text, "Date: " + dateText + "\n"); assertContains(text, "The quick brown fox jumps over the lazy dog"); + + ext.close(); } public void testSimple() throws Exception { @@ -77,21 +79,28 @@ public final class TestOutlookTextExtractor extends POITestCase { assertContains(text, "Subject: test message\n"); assertContains(text, "Date: Fri, 6 Jul 2007 05:27:17 +0000\n"); assertContains(text, "This is a test message."); + + ext.close(); } public void testConstructors() throws Exception { - String inp = (new OutlookTextExtactor(new FileInputStream( - samples.getFile("simple_test_msg.msg") - )).getText()); - String poifs = (new OutlookTextExtactor(new POIFSFileSystem(new FileInputStream( - samples.getFile("simple_test_msg.msg") - ))).getText()); - String mapi = (new OutlookTextExtactor(new MAPIMessage(new FileInputStream( - samples.getFile("simple_test_msg.msg") - ))).getText()); - - assertEquals(inp, poifs); - assertEquals(inp, mapi); + OutlookTextExtactor ext = new OutlookTextExtactor(new FileInputStream( + samples.getFile("simple_test_msg.msg"))); + String inp = ext.getText(); + ext.close(); + + ext = new OutlookTextExtactor(new POIFSFileSystem(new FileInputStream( + samples.getFile("simple_test_msg.msg")))); + String poifs = ext.getText(); + ext.close(); + + ext = new OutlookTextExtactor(new MAPIMessage(new FileInputStream( + samples.getFile("simple_test_msg.msg")))); + String mapi = ext.getText(); + ext.close(); + + assertEquals(inp, poifs); + assertEquals(inp, mapi); } /** @@ -128,6 +137,8 @@ public final class TestOutlookTextExtractor extends POITestCase { assertContains(text, "Subject: This is a test message please ignore\n"); assertContains(text, "Date:"); assertContains(text, "The quick brown fox jumps over the lazy dog"); + + ext.close(); } } @@ -164,6 +175,8 @@ public final class TestOutlookTextExtractor extends POITestCase { assertContains(text, "Subject: This is a test message please ignore\n"); assertContains(text, "Date: Mon, 11 Jan 2010 16:2"); // Exact times differ slightly assertContains(text, "The quick brown fox jumps over the lazy dog"); + + ext.close(); } } @@ -192,6 +205,8 @@ public final class TestOutlookTextExtractor extends POITestCase { // Embeded bits are checked in // TestExtractorFactory + + ext.close(); } public void testEncodings() throws Exception { @@ -209,5 +224,7 @@ public final class TestOutlookTextExtractor extends POITestCase { // And check some chinese bits assertContains(text, "(\u5f35\u6bd3\u502b)"); assertContains(text, "( MSG \u683c\u5f0f\u6e2c\u8a66 )"); + + ext.close(); } } diff --git a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java index 521b9ad679..0adb2cf984 100644 --- a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java +++ b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java @@ -79,11 +79,11 @@ public abstract class BaseXLSIteratingTest { try { runOneFile(dir, file, failed); } catch (Exception e) { - System.out.println("Failed: " + file); if(SILENT_EXCLUDED.contains(file)) { continue; } + System.out.println("Failed: " + file); e.printStackTrace(); // try to read it in HSSFWorkbook to quickly fail if we cannot read the file there at all and thus probably can use SILENT_EXCLUDED instead diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java index 3fd83b4cf5..5223bb5b06 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java @@ -32,7 +32,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; -- 2.39.5