Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A53CB18FC6 for ; Tue, 7 Jul 2015 07:44:12 +0000 (UTC) Received: (qmail 41663 invoked by uid 500); 7 Jul 2015 07:44:12 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 41628 invoked by uid 500); 7 Jul 2015 07:44:12 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 41619 invoked by uid 99); 7 Jul 2015 07:44:12 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2015 07:44:12 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 1A07EAC06F8 for ; Tue, 7 Jul 2015 07:44:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1689590 - in /poi/trunk/src: integrationtest/org/apache/poi/stress/ scratchpad/testcases/org/apache/poi/hsmf/extractor/ testcases/org/apache/poi/hssf/dev/ testcases/org/apache/poi/hssf/usermodel/ Date: Tue, 07 Jul 2015 07:44:11 -0000 To: commits@poi.apache.org From: centic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150707074412.1A07EAC06F8@hades.apache.org> Author: centic Date: Tue Jul 7 07:44:11 2015 New Revision: 1689590 URL: http://svn.apache.org/r1689590 Log: Add some missing close(), reduce output in unit tests and remove some other Eclipse warnings Modified: poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Modified: poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java?rev=1689590&r1=1689589&r2=1689590&view=diff ============================================================================== --- poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java (original) +++ poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java Tue Jul 7 07:44:11 2015 @@ -88,12 +88,14 @@ public class XSLFFileHandler extends Abs } } } + + 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 { Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java?rev=1689590&r1=1689589&r2=1689590&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java Tue Jul 7 07:44:11 2015 @@ -60,6 +60,8 @@ public final class TestOutlookTextExtrac 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 TestOutlookTextExtrac 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 TestOutlookTextExtrac 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 TestOutlookTextExtrac 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 TestOutlookTextExtrac // Embeded bits are checked in // TestExtractorFactory + + ext.close(); } public void testEncodings() throws Exception { @@ -209,5 +224,7 @@ public final class TestOutlookTextExtrac // And check some chinese bits assertContains(text, "(\u5f35\u6bd3\u502b)"); assertContains(text, "( MSG \u683c\u5f0f\u6e2c\u8a66 )"); + + ext.close(); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java?rev=1689590&r1=1689589&r2=1689590&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java Tue Jul 7 07:44:11 2015 @@ -79,11 +79,11 @@ public abstract class BaseXLSIteratingTe 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 Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1689590&r1=1689589&r2=1689590&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Tue Jul 7 07:44:11 2015 @@ -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; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org