From: Yegor Kozlov <yegor@apache.org>
Date: Thu, 14 Jan 2010 19:23:13 +0000 (+0000)
Subject: avoid creating unnecessary temp files, tighten up usage of temp files in unit tests
X-Git-Tag: REL_3_7_BETA1~135
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5bb2570155bb38bd8434d0e1769714cf473fa853;p=poi.git

avoid creating unnecessary temp files, tighten up usage of temp files in unit tests

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

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index e05e57ec11..20aeadb50f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -266,7 +266,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Iterable<X
      */
     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
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index 20004bd368..2959317bfb 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
@@ -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 @@ public class XWPFDocument extends POIXMLDocument {
      */
     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
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java b/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
index fc8c159e53..642fe30748 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
@@ -23,6 +23,7 @@ import java.io.FileOutputStream;
 
 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 @@ public class TestWorkbookProtection extends TestCase {
 
 		wb.lockRevision();
 
-		File tempFile = File.createTempFile("workbookProtection", ".xlsx");
+		File tempFile = TempFile.createTempFile("workbookProtection", ".xlsx");
 		FileOutputStream out = new FileOutputStream(tempFile);
 		wb.write(out);
 		out.close();
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
index 1d96f6d589..4a06622912 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 
 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 @@ public class TestDocumentProtection extends TestCase {
         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);
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
index 8c95fdb7bf..049f98d567 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
@@ -54,6 +54,7 @@ import org.apache.poi.poifs.filesystem.DocumentEntry;
 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 @@ public class TestWriteWellKnown extends TestCase {
 
         /* 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 @@ public class TestWriteWellKnown extends TestCase {
         /*
          * <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);