Author: yegor
Date: Thu Jan 14 19:23:13 2010
New Revision: 899364
URL: http://svn.apache.org/viewvc?rev=899364&view=rev
Log:
avoid creating unnecessary temp files, tighten up usage of temp files in unit
tests
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=899364&r1=899363&r2=899364&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Thu Jan 14 19:23:13 2010
@@ -266,7 +266,7 @@
*/
protected static OPCPackage newPackage() {
try {
- OPCPackage pkg = OPCPackage.create(PackageHelper.createTempFile());
+ OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream());
// Main part
PackagePartName corePartName =
PackagingURIHelper.createPartName(XSSFRelation.WORKBOOK.getDefaultFileName());
// Create main part relationship
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=899364&r1=899363&r2=899364&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Thu Jan 14 19:23:13 2010
@@ -16,6 +16,7 @@
==================================================================== */
package org.apache.poi.xwpf.usermodel;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -195,7 +196,7 @@
*/
protected static OPCPackage newPackage() {
try {
- OPCPackage pkg = OPCPackage.create(PackageHelper.createTempFile());
+ OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream());
// Main part
PackagePartName corePartName =
PackagingURIHelper.createPartName(XWPFRelation.DOCUMENT.getDefaultFileName());
// Create main part relationship
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java?rev=899364&r1=899363&r2=899364&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
Thu Jan 14 19:23:13 2010
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
+import org.apache.poi.util.TempFile;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
public class TestWorkbookProtection extends TestCase {
@@ -95,7 +96,7 @@
wb.lockRevision();
- File tempFile = File.createTempFile("workbookProtection",
".xlsx");
+ File tempFile = TempFile.createTempFile("workbookProtection",
".xlsx");
FileOutputStream out = new FileOutputStream(tempFile);
wb.write(out);
out.close();
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java?rev=899364&r1=899363&r2=899364&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
Thu Jan 14 19:23:13 2010
@@ -25,6 +25,7 @@
import junit.framework.TestCase;
+import org.apache.poi.util.TempFile;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFParagraph;
import org.apache.poi.xwpf.usermodel.XWPFRun;
@@ -126,7 +127,7 @@
r1.setText("Lorem ipsum dolor sit amet.");
doc.enforceCommentsProtection();
- File tempFile = File.createTempFile("documentProtectionFile", ".docx");
+ File tempFile = TempFile.createTempFile("documentProtectionFile",
".docx");
FileOutputStream out = new FileOutputStream(tempFile);
doc.write(out);
Modified:
poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java?rev=899364&r1=899363&r2=899364&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
Thu Jan 14 19:23:13 2010
@@ -54,6 +54,7 @@
import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.POIDataSamples;
+import org.apache.poi.util.TempFile;
/**
* <p>Tests HPSF's high-level writing functionality for the well-known property
@@ -374,7 +375,7 @@
/* Write the POI filesystem to a (temporary) file <em>doc2</em>
* and close the latter. */
- final File doc2 = File.createTempFile("POI_HPSF_Test.", ".tmp");
+ final File doc2 = TempFile.createTempFile("POI_HPSF_Test.", ".tmp");
doc2.deleteOnExit();
OutputStream out = new FileOutputStream(doc2);
poifs.writeFilesystem(out);
@@ -503,7 +504,7 @@
/*
* <li><p>Write the POI filesystem to a (temporary) file <em>doc3</em>
* and close the latter. */
- final File doc3 = File.createTempFile("POI_HPSF_Test.", ".tmp");
+ final File doc3 = TempFile.createTempFile("POI_HPSF_Test.", ".tmp");
doc3.deleteOnExit();
out = new FileOutputStream(doc3);
poifs.writeFilesystem(out);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
