PDFBOX-6235: optimize

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1937079 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java

@@ -80,14 +80,15 @@ static void setUp()
     void testCreateFromStream() throws IOException
     {
         try (PDDocument document = new PDDocument();
-             InputStream is1 = JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg");
-             InputStream is2 = JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"))
+             InputStream is = JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"))
         {
-            PDImageXObject ximage = JPEGFactory.createFromStream(document, is1);
+            byte[] ba = is.readAllBytes();
+
+            PDImageXObject ximage = JPEGFactory.createFromStream(document, new ByteArrayInputStream(ba));
             validate(ximage, 8, 344, 287, "jpg", PDDeviceRGB.INSTANCE.getName());
 
             doWritePDF(document, ximage, TESTRESULTSDIR, "jpegrgbstream.pdf");
-            checkJpegStream(TESTRESULTSDIR, "jpegrgbstream.pdf", is2);
+            checkJpegStream(TESTRESULTSDIR, "jpegrgbstream.pdf", new ByteArrayInputStream(ba));
         }
     }
 
@@ -98,15 +99,16 @@ void testCreateFromStream() throws IOException
     @Test
     void testCreateFromStreamCMYK() throws IOException
     {
-        try (InputStream is1 = JPEGFactoryTest.class.getResourceAsStream("jpegcmyk.jpg");
-             InputStream is2 = JPEGFactoryTest.class.getResourceAsStream("jpegcmyk.jpg"))
+        try (InputStream is = JPEGFactoryTest.class.getResourceAsStream("jpegcmyk.jpg"))
         {
+            byte[] ba = is.readAllBytes();
+
             PDDocument document = new PDDocument();
-            PDImageXObject ximage = JPEGFactory.createFromStream(document, is1);
+            PDImageXObject ximage = JPEGFactory.createFromStream(document, new ByteArrayInputStream(ba));
             validate(ximage, 8, 343, 287, "jpg", PDDeviceCMYK.INSTANCE.getName());
 
             doWritePDF(document, ximage, TESTRESULTSDIR, "jpegcmykstream.pdf");
-            checkJpegStream(TESTRESULTSDIR, "jpegcmykstream.pdf", is2);
+            checkJpegStream(TESTRESULTSDIR, "jpegcmykstream.pdf", new ByteArrayInputStream(ba));
         }
     }
 
@@ -117,15 +119,16 @@ void testCreateFromStreamCMYK() throws IOException
     @Test
     void testCreateFromStream256() throws IOException
     {
-        try (InputStream is1 = JPEGFactoryTest.class.getResourceAsStream("jpeg256.jpg");
-             InputStream is2 = JPEGFactoryTest.class.getResourceAsStream("jpeg256.jpg"))
+        try (InputStream is = JPEGFactoryTest.class.getResourceAsStream("jpeg256.jpg"))
         {
+            byte[] ba = is.readAllBytes();
+
             PDDocument document = new PDDocument();
-            PDImageXObject ximage = JPEGFactory.createFromStream(document, is1);
+            PDImageXObject ximage = JPEGFactory.createFromStream(document, new ByteArrayInputStream(ba));
             validate(ximage, 8, 344, 287, "jpg", PDDeviceGray.INSTANCE.getName());
 
             doWritePDF(document, ximage, TESTRESULTSDIR, "jpeg256stream.pdf");
-            checkJpegStream(TESTRESULTSDIR, "jpeg256stream.pdf", is2);
+            checkJpegStream(TESTRESULTSDIR, "jpeg256stream.pdf", new ByteArrayInputStream(ba));
         }
     }