From commits-return-12131-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Wed Mar 7 22:19:45 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C1165180656 for ; Wed, 7 Mar 2018 22:19:44 +0100 (CET) Received: (qmail 10751 invoked by uid 500); 7 Mar 2018 21:19:43 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 10738 invoked by uid 99); 7 Mar 2018 21:19:43 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Mar 2018 21:19:43 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1B94A3A0113 for ; Wed, 7 Mar 2018 21:19:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1826159 - /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java Date: Wed, 07 Mar 2018 21:19:42 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180307211943.1B94A3A0113@svn01-us-west.apache.org> Author: tilman Date: Wed Mar 7 21:19:42 2018 New Revision: 1826159 URL: http://svn.apache.org/viewvc?rev=1826159&view=rev Log: PDFBOX-4071: use jdk7 try-with-resources Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java?rev=1826159&r1=1826158&r2=1826159&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/PDStreamTest.java Wed Mar 7 21:19:42 2018 @@ -38,22 +38,22 @@ public class PDStreamTest @Test public void testCreateInputStreamNullFilters() throws Exception { - PDDocument doc = new PDDocument(); - InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 }); - PDStream pdStream = new PDStream(doc, is, (COSArray) null); - Assert.assertNull(pdStream.getFilters()); - List stopFilters = new ArrayList<>(); - stopFilters.add(COSName.DCT_DECODE.toString()); - stopFilters.add(COSName.DCT_DECODE_ABBREVIATION.toString()); - - is = pdStream.createInputStream(stopFilters); - Assert.assertEquals(12,is.read()); - Assert.assertEquals(34,is.read()); - Assert.assertEquals(56,is.read()); - Assert.assertEquals(78,is.read()); - Assert.assertEquals(-1,is.read()); - - doc.close(); + try (PDDocument doc = new PDDocument()) + { + InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 }); + PDStream pdStream = new PDStream(doc, is, (COSArray) null); + Assert.assertNull(pdStream.getFilters()); + List stopFilters = new ArrayList<>(); + stopFilters.add(COSName.DCT_DECODE.toString()); + stopFilters.add(COSName.DCT_DECODE_ABBREVIATION.toString()); + + is = pdStream.createInputStream(stopFilters); + Assert.assertEquals(12,is.read()); + Assert.assertEquals(34,is.read()); + Assert.assertEquals(56,is.read()); + Assert.assertEquals(78,is.read()); + Assert.assertEquals(-1,is.read()); + } } /** @@ -62,22 +62,22 @@ public class PDStreamTest @Test public void testCreateInputStreamEmptyFilters() throws Exception { - PDDocument doc = new PDDocument(); - InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 }); - PDStream pdStream = new PDStream(doc, is, new COSArray()); - Assert.assertEquals(0,pdStream.getFilters().size()); - List stopFilters = new ArrayList<>(); - stopFilters.add(COSName.DCT_DECODE.toString()); - stopFilters.add(COSName.DCT_DECODE_ABBREVIATION.toString()); - - is = pdStream.createInputStream(stopFilters); - Assert.assertEquals(12,is.read()); - Assert.assertEquals(34,is.read()); - Assert.assertEquals(56,is.read()); - Assert.assertEquals(78,is.read()); - Assert.assertEquals(-1,is.read()); - - doc.close(); + try (PDDocument doc = new PDDocument()) + { + InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 }); + PDStream pdStream = new PDStream(doc, is, new COSArray()); + Assert.assertEquals(0,pdStream.getFilters().size()); + List stopFilters = new ArrayList<>(); + stopFilters.add(COSName.DCT_DECODE.toString()); + stopFilters.add(COSName.DCT_DECODE_ABBREVIATION.toString()); + + is = pdStream.createInputStream(stopFilters); + Assert.assertEquals(12,is.read()); + Assert.assertEquals(34,is.read()); + Assert.assertEquals(56,is.read()); + Assert.assertEquals(78,is.read()); + Assert.assertEquals(-1,is.read()); + } } /** @@ -86,19 +86,19 @@ public class PDStreamTest @Test public void testCreateInputStreamNullStopFilters() throws Exception { - PDDocument doc = new PDDocument(); - InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 }); - PDStream pdStream = new PDStream(doc, is, new COSArray()); - Assert.assertEquals(0, pdStream.getFilters().size()); - - is = pdStream.createInputStream(null); - Assert.assertEquals(12, is.read()); - Assert.assertEquals(34, is.read()); - Assert.assertEquals(56, is.read()); - Assert.assertEquals(78,is.read()); - Assert.assertEquals(-1,is.read()); - - doc.close(); + try (PDDocument doc = new PDDocument()) + { + InputStream is = new ByteArrayInputStream(new byte[] { 12, 34, 56, 78 }); + PDStream pdStream = new PDStream(doc, is, new COSArray()); + Assert.assertEquals(0, pdStream.getFilters().size()); + + is = pdStream.createInputStream(null); + Assert.assertEquals(12, is.read()); + Assert.assertEquals(34, is.read()); + Assert.assertEquals(56, is.read()); + Assert.assertEquals(78,is.read()); + Assert.assertEquals(-1,is.read()); + } } }