bug 52949: parameterize fromNPOIFS also

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

diff --git a/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java b/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
index f44d249f1d3b0960153d95fbb75b89c252ecdf9c..241e097e2f4872e2c67ea86d3c46c2cbe5b9b8c1 100644 (file)
--- a/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
+++ b/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
@@ -24,8 +24,11 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 import java.util.Map;
 
+import org.apache.poi.POIDataSamples;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
 import org.apache.poi.util.IOUtils;
@@ -67,16 +70,12 @@ public class TestVBAMacroReader {
     }
 
     @Test
-    public void fromNPOIFS() throws Exception {
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(
-                HSSFTestDataSamples.getSampleFile("SimpleMacro.xls"));
-        VBAMacroReader r = new VBAMacroReader(fs);
-        assertMacroContents(r);
-        r.close();
+    public void HSSFfromNPOIFS() throws Exception {
+        fromNPOIFS(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xls");
     }
 
-    protected void fromFile(POIDataSamples poiDataSamples, String filename) {   
-        File f = poiDataSamples.getSampleFile(filename);
+    protected void fromFile(POIDataSamples poiDataSamples, String filename) throws IOException {   
+        File f = poiDataSamples.getFile(filename);
         VBAMacroReader r = new VBAMacroReader(f);
         try {
             assertMacroContents(r);
@@ -85,8 +84,8 @@ public class TestVBAMacroReader {
         }
     }
 
-    protected void fromStream(POIDataSamples poiDataSamples, String filename) {   
-        InputStream fis = poiDataSamples.openSampleFileStream(filename);
+    protected void fromStream(POIDataSamples poiDataSamples, String filename) throws IOException {   
+        InputStream fis = poiDataSamples.openResourceAsStream(filename);
         try {
             VBAMacroReader r = new VBAMacroReader(fis);
             try {
@@ -94,10 +93,27 @@ public class TestVBAMacroReader {
             } finally {
                 r.close();
             }
+        } finally {
+            fis.close();
+        }
+    }
+
+    protected void fromNPOIFS(POIDataSamples poiDataSamples, String filename) throws IOException {   
+        File f = poiDataSamples.getFile(filename);
+        NPOIFSFileSystem fs = new NPOIFSFileSystem(f);
+        try {
+            VBAMacroReader r = new VBAMacroReader(fs);
+            try {
+                assertMacroContents(r);
+            } finally {
+                r.close();
+            }
+        } finally {
+            fs.close();
         }
     }
     
-    protected void assertMacroContents(VBAMacroReader r) throws Exception {
+    protected void assertMacroContents(VBAMacroReader r) throws IOException {
         Map<String,String> contents = r.readMacros();
         
         assertFalse(contents.isEmpty());