poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From one...@apache.org
Subject svn commit: r1715850 - in /poi/trunk/src/ooxml/testcases/org/apache/poi/xslf: XSLFTestDataSamples.java usermodel/TestXSLFSheet.java
Date Mon, 23 Nov 2015 15:36:57 GMT
Author: onealj
Date: Mon Nov 23 15:36:57 2015
New Revision: 1715850

URL: http://svn.apache.org/viewvc?rev=1715850&view=rev
Log:
catch IOException and rethrow as RuntimeException

Modified:
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java?rev=1715850&r1=1715849&r2=1715850&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java Mon Nov 23
15:36:57 2015
@@ -24,21 +24,24 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 
 /**
  * @author Yegor Kozlov
  */
 public class XSLFTestDataSamples {
 
-    public static XMLSlideShow openSampleDocument(String sampleName) throws IOException {
+    public static XMLSlideShow openSampleDocument(String sampleName) {
         InputStream is = POIDataSamples.getSlideShowInstance().openResourceAsStream(sampleName);
         try {
             return new XMLSlideShow(OPCPackage.open(is));
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {
-            is.close();
+            try {
+                is.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -46,7 +49,7 @@ public class XSLFTestDataSamples {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
         try {
             doc.write(baos);
-        } catch (Exception e) {
+        } catch (IOException e) {
             throw new RuntimeException(e);
         }
         
@@ -57,8 +60,12 @@ public class XSLFTestDataSamples {
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {
-            baos.close();
-            bais.close();
+            try {
+                baos.close();
+                bais.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
         
     }

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java?rev=1715850&r1=1715849&r2=1715850&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java Mon Nov
23 15:36:57 2015
@@ -18,6 +18,7 @@ package org.apache.poi.xslf.usermodel;
 
 import static org.junit.Assert.*;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.poi.xslf.XSLFTestDataSamples;
@@ -31,7 +32,7 @@ import org.junit.Test;
 public class TestXSLFSheet {
     
     @Test
-    public void testCreateShapes(){
+    public void testCreateShapes() throws IOException {
         XMLSlideShow ppt = new XMLSlideShow();
         XSLFSlide slide = ppt.createSlide();
         assertTrue(slide.getShapes().isEmpty());
@@ -58,8 +59,8 @@ public class TestXSLFSheet {
         assertSame(shape3, slide.getShapes().get(2));
         assertSame(shape4, slide.getShapes().get(3));
 
-        ppt = XSLFTestDataSamples.writeOutAndReadBack(ppt);
-        slide = ppt.getSlides().get(0);
+        XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt);
+        slide = ppt2.getSlides().get(0);
         List<XSLFShape> shapes = slide.getShapes();
         assertEquals(4, shapes.size());
 
@@ -67,5 +68,8 @@ public class TestXSLFSheet {
         assertTrue(shapes.get(1) instanceof XSLFTextBox);
         assertTrue(shapes.get(2) instanceof XSLFConnectorShape);
         assertTrue(shapes.get(3) instanceof XSLFGroupShape);
+        
+        ppt.close();
+        ppt2.close();
     }
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message