You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2016/05/05 12:22:37 UTC
svn commit: r1742424 -
/poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
Author: centic
Date: Thu May 5 12:22:37 2016
New Revision: 1742424
URL: http://svn.apache.org/viewvc?rev=1742424&view=rev
Log:
Close file-handles in tests as well to avoid noise when running file-leak-detection
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java?rev=1742424&r1=1742423&r2=1742424&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java Thu May 5 12:22:37 2016
@@ -17,46 +17,51 @@
package org.apache.poi.poifs.macros;
-import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.util.StringUtil;
+import org.junit.Ignore;
+import org.junit.Test;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.StringUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.poi.POITestCase.assertContains;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
public class TestVBAMacroReader {
-
private static final Map<POIDataSamples, String> expectedMacroContents;
+
protected static String readVBA(POIDataSamples poiDataSamples) {
File macro = poiDataSamples.getFile("SimpleMacro.vba");
- byte[] bytes;
+ final byte[] bytes;
try {
- bytes = IOUtils.toByteArray(new FileInputStream(macro));
+ FileInputStream stream = new FileInputStream(macro);
+ try {
+ bytes = IOUtils.toByteArray(stream);
+ } finally {
+ stream.close();
+ }
} catch (IOException e) {
throw new RuntimeException(e);
}
+
String testMacroContents = new String(bytes, StringUtil.UTF8);
if (! testMacroContents.startsWith("Sub ")) {
throw new IllegalArgumentException("Not a macro");
}
- String testMacroNoSub = testMacroContents.substring(testMacroContents.indexOf("()")+3);
- return testMacroNoSub;
+
+ return testMacroContents.substring(testMacroContents.indexOf("()")+3);
}
+
static {
final Map<POIDataSamples, String> _expectedMacroContents = new HashMap<POIDataSamples, String>();
final POIDataSamples[] dataSamples = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org