You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by gl...@apache.org on 2004/10/12 07:49:01 UTC
cvs commit: jakarta-poi/src/testcases/org/apache/poi/util TestTempFile.java
glens 2004/10/11 22:49:01
Modified: src/examples/src/org/apache/poi/hpsf/examples
CopyCompare.java
src/testcases/org/apache/poi/hpsf/basic TestWrite.java
src/testcases/org/apache/poi/hssf/record TestSSTRecord.java
src/testcases/org/apache/poi/hssf/usermodel TestBugs.java
TestCellStyle.java TestFormulas.java
TestHSSFCell.java TestHSSFPalette.java
TestHSSFRow.java TestHSSFSheet.java
TestNamedRange.java TestSheetShiftRows.java
TestWorkbook.java
Added: src/java/org/apache/poi/util TempFile.java
src/testcases/org/apache/poi/util TestTempFile.java
Log:
Centralized creation of temp files and made the default operation to delete on exit
Revision Changes Path
1.6 +3 -2 jakarta-poi/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
Index: CopyCompare.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CopyCompare.java 31 Aug 2004 16:56:46 -0000 1.5
+++ CopyCompare.java 12 Oct 2004 05:49:00 -0000 1.6
@@ -47,6 +47,7 @@
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.util.TempFile;
/**
* <p>This class copies a POI file system to a new file and compares the copy
@@ -112,7 +113,7 @@
if (args.length == 1)
{
originalFileName = args[0];
- File f = File.createTempFile("CopyOfPOIFileSystem-", ".ole2");
+ File f = TempFile.createTempFile("CopyOfPOIFileSystem-", ".ole2");
f.deleteOnExit();
copyFileName = f.getAbsolutePath();
}
1.1 jakarta-poi/src/java/org/apache/poi/util/TempFile.java
Index: TempFile.java
===================================================================
/* ====================================================================
Copyright 2002-2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
package org.apache.poi.util;
import java.io.File;
import java.io.IOException;
import java.util.Random;
/**
* Interface for creating temporary files. Collects them all into one directory.
*
* @author Glen Stampoultzis
*/
public class TempFile
{
static File dir;
static Random rnd = new Random();
/**
* Creates a temporary file. Files are collected into one directory and by default are
* deleted on exit from the VM. Files can be kept by defining the system property
* <code>poi.keep.tmp.files</code>.
* <p>
* Dont forget to close all files or it might not be possible to delete them.
*/
public static File createTempFile(String prefix, String suffix) throws IOException
{
if (dir == null)
{
dir = new File(System.getProperty("java.io.tmpdir"), "poifiles");
dir.mkdir();
if (System.getProperty("poi.keep.tmp.files") == null)
dir.deleteOnExit();
}
File newFile = new File(dir, prefix + rnd.nextInt() + suffix);
if (System.getProperty("poi.keep.tmp.files") == null)
newFile.deleteOnExit();
return newFile;
}
}
1.20 +7 -5 jakarta-poi/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
Index: TestWrite.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TestWrite.java 19 Sep 2004 16:44:44 -0000 1.19
+++ TestWrite.java 12 Oct 2004 05:49:01 -0000 1.20
@@ -62,6 +62,7 @@
import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.TempFile;
@@ -475,7 +476,8 @@
final int cp = validCodepages[i];
if (cp == -1 && !hasProperDefaultCharset())
{
- System.err.println(IMPROPER_DEFAULT_CHARSET_MESSAGE +
" This testcase is skipped for the default codepage.");
+ System.err.println(IMPROPER_DEFAULT_CHARSET_MESSAGE +
+ " This testcase is skipped for the default codepage.");
continue;
}
@@ -709,7 +711,7 @@
/* Create a new POI filesystem containing the origin file's
* property set streams: */
- final File copy = File.createTempFile(f.getName(), "");
+ final File copy = TempFile.createTempFile(f.getName(), "");
copy.deleteOnExit();
final OutputStream out = new FileOutputStream(copy);
final POIFSFileSystem poiFs = new POIFSFileSystem();
@@ -763,7 +765,7 @@
{
try
{
- final File copy = File.createTempFile("Test-HPSF", "ole2");
+ final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
copy.deleteOnExit();
/* Write: */
@@ -815,7 +817,7 @@
{
try
{
- final File copy = File.createTempFile("Test-HPSF", "ole2");
+ final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
copy.deleteOnExit();
/* Write: */
1.10 +3 -2 jakarta-poi/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
Index: TestSSTRecord.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestSSTRecord.java 23 Aug 2004 08:52:49 -0000 1.9
+++ TestSSTRecord.java 12 Oct 2004 05:49:01 -0000 1.10
@@ -24,6 +24,7 @@
import org.apache.poi.util.HexRead;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
+import org.apache.poi.util.TempFile;
import java.io.*;
import java.util.Arrays;
@@ -458,7 +459,7 @@
assertEquals( "01/05 (Wed) ", sheet.getRow( 0 ).getCell( (short) 8 ).getStringCellValue() );
assertEquals( "01/05 (Wed)", sheet.getRow( 1 ).getCell( (short) 8 ).getStringCellValue() );
- file = File.createTempFile( "testout", "xls" );
+ file = TempFile.createTempFile( "testout", "xls" );
FileOutputStream outStream = new FileOutputStream( file );
wb.write( outStream );
outStream.close();
@@ -479,7 +480,7 @@
assertEquals( "Testing", sheet.getRow( row++ ).getCell( (short) 0 ).getStringCellValue() );
// file = new File("/tryme.xls");
- file = File.createTempFile( "testout", ".xls" );
+ file = TempFile.createTempFile( "testout", ".xls" );
outStream = new FileOutputStream( file );
wb.write( outStream );
outStream.close();
1.17 +9 -8 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
Index: TestBugs.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TestBugs.java 23 Aug 2004 08:52:52 -0000 1.16
+++ TestBugs.java 12 Oct 2004 05:49:01 -0000 1.17
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
import org.apache.poi.hssf.util.Region;
+import org.apache.poi.util.TempFile;
import java.io.*;
@@ -48,7 +49,7 @@
HSSFRow r = s.createRow(0);
HSSFCell c = r.createCell((short)0);
c.setCellValue(10);
- File file = File.createTempFile("test15228",".xls");
+ File file = TempFile.createTempFile("test15228",".xls");
FileOutputStream out = new FileOutputStream(file);
wb.write(out);
assertTrue("No exception thrown", true);
@@ -65,7 +66,7 @@
HSSFRow r = s.createRow(0);
HSSFCell c = r.createCell((short)0);
c.setCellValue(10);
- File file = File.createTempFile("test13796",".xls");
+ File file = TempFile.createTempFile("test13796",".xls");
FileOutputStream out = new FileOutputStream(file);
wb.write(out);
assertTrue("No exception thrown", true);
@@ -75,7 +76,7 @@
/**Test writing a hyperlink
* Open resulting sheet in Excel and check that A1 contains a hyperlink*/
public void test23094() throws Exception {
- File file = File.createTempFile("test23094",".xls");
+ File file = TempFile.createTempFile("test23094",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -98,7 +99,7 @@
cell.setCellFormula("HYPERLINK(\"http://google.com\",\"Google\")");
// Write out the workbook
- File f = File.createTempFile("test15353",".xls");
+ File f = TempFile.createTempFile("test15353",".xls");
FileOutputStream fileOut = new FileOutputStream(f);
wb.write(fileOut);
fileOut.close();
@@ -158,7 +159,7 @@
oCell.setCellValue("0.3");
// Write the output to a file
- File f = File.createTempFile("test15375",".xls");
+ File f = TempFile.createTempFile("test15375",".xls");
FileOutputStream fileOut = new FileOutputStream(f);
wb.write(fileOut);
fileOut.close();
@@ -199,7 +200,7 @@
cell = row.createCell((short)2);
cell.setCellValue(tmp3);
}
- File f = File.createTempFile("test15375-2",".xls");
+ File f = TempFile.createTempFile("test15375-2",".xls");
FileOutputStream fileOut = new FileOutputStream(f);
wb.write(fileOut);
fileOut.close();
@@ -238,7 +239,7 @@
sheet.setDefaultColumnWidth((short) 18) ;
try {
- File f = File.createTempFile("test22568",".xls");
+ File f = TempFile.createTempFile("test22568",".xls");
FileOutputStream out = new FileOutputStream(f) ;
wb.write(out) ;
@@ -425,7 +426,7 @@
assertEquals("String Cell value", c1.getStringCellValue(), c2.getStringCellValue());
assertEquals("String Cell value", d1.getStringCellValue(), d2.getStringCellValue());
- File xls = File.createTempFile("testFormulaUnicode", ".xls");
+ File xls = TempFile.createTempFile("testFormulaUnicode", ".xls");
FileOutputStream out = new FileOutputStream(xls);
w.write(out);
out.close();
1.12 +4 -3 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
Index: TestCellStyle.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestCellStyle.java 23 Aug 2004 08:52:52 -0000 1.11
+++ TestCellStyle.java 12 Oct 2004 05:49:01 -0000 1.12
@@ -28,6 +28,7 @@
import java.util.*;
import junit.framework.*;
+import org.apache.poi.util.TempFile;
/**
* Class to test cell styling functionality
@@ -59,7 +60,7 @@
public void testWriteSheetFont()
throws IOException
{
- File file = File.createTempFile("testWriteSheetFont",
+ File file = TempFile.createTempFile("testWriteSheetFont",
".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
@@ -104,7 +105,7 @@
public void testDataStyle()
throws Exception
{
- File file = File.createTempFile("testWriteSheetStyleDate",
+ File file = TempFile.createTempFile("testWriteSheetStyleDate",
".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
@@ -150,7 +151,7 @@
public void testWriteSheetStyle()
throws IOException
{
- File file = File.createTempFile("testWriteSheetStyle",
+ File file = TempFile.createTempFile("testWriteSheetStyle",
".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
1.35 +19 -18 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
Index: TestFormulas.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- TestFormulas.java 23 Aug 2004 08:52:52 -0000 1.34
+++ TestFormulas.java 12 Oct 2004 05:49:01 -0000 1.35
@@ -27,6 +27,7 @@
import junit.framework.TestCase;
import org.apache.poi.hssf.util.CellReference;
+import org.apache.poi.util.TempFile;
/**
* @author Andrew C. Oliver (acoliver at apache dot org)
@@ -47,7 +48,7 @@
throws Exception {
short rownum = 0;
- File file = File.createTempFile("testFormula",".xls");
+ File file = TempFile.createTempFile("testFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -169,7 +170,7 @@
private void floatTest(String operator)
throws Exception {
short rownum = 0;
- File file = File.createTempFile("testFormulaFloat",".xls");
+ File file = TempFile.createTempFile("testFormulaFloat",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -260,7 +261,7 @@
private void operationRefTest(String operator)
throws Exception {
- File file = File.createTempFile("testFormula",".xls");
+ File file = TempFile.createTempFile("testFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -412,7 +413,7 @@
*/
private void orderTest(String formula)
throws Exception {
- File file = File.createTempFile("testFormula",".xls");
+ File file = TempFile.createTempFile("testFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -450,7 +451,7 @@
private void binomialOperator(String operator)
throws Exception {
short rownum = 0;
- File file = File.createTempFile("testFormula",".xls");
+ File file = TempFile.createTempFile("testFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -548,7 +549,7 @@
throws Exception {
short rownum = 0;
- File file = File.createTempFile("testFormulaAreaFunction"+function,".xls");
+ File file = TempFile.createTempFile("testFormulaAreaFunction"+function,".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -586,7 +587,7 @@
throws Exception {
short rownum = 0;
- File file = File.createTempFile("testFormulaArrayFunction"+function,".xls");
+ File file = TempFile.createTempFile("testFormulaArrayFunction"+function,".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -625,7 +626,7 @@
throws Exception {
short rownum = 0;
- File file = File.createTempFile("testFormulaAreaArrayFunction"+function,".xls");
+ File file = TempFile.createTempFile("testFormulaAreaArrayFunction"+function,".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -664,7 +665,7 @@
public void testAbsRefs() throws Exception {
- File file = File.createTempFile("testFormulaAbsRef",".xls");
+ File file = TempFile.createTempFile("testFormulaAbsRef",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -711,7 +712,7 @@
{
String filename = System.getProperty("HSSF.testdata.path");
- File file = File.createTempFile("testSheetFormula",".xls");
+ File file = TempFile.createTempFile("testSheetFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet("A");
@@ -743,7 +744,7 @@
}
public void testRVAoperands() throws Exception {
- File file = File.createTempFile("testFormulaRVA",".xls");
+ File file = TempFile.createTempFile("testFormulaRVA",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -785,7 +786,7 @@
{
String readFilename = System.getProperty("HSSF.testdata.path");
- File file = File.createTempFile("testStringFormula",".xls");
+ File file = TempFile.createTempFile("testStringFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet("A");
@@ -818,7 +819,7 @@
throws IOException
{
- File file = File.createTempFile("testLogicalFormula",".xls");
+ File file = TempFile.createTempFile("testLogicalFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet("A");
@@ -847,7 +848,7 @@
{
String readFilename = System.getProperty("HSSF.testdata.path");
- File file = File.createTempFile("testDateFormula",".xls");
+ File file = TempFile.createTempFile("testDateFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet("Sheet1");
@@ -885,7 +886,7 @@
{
String readFilename = System.getProperty("HSSF.testdata.path");
- File file = File.createTempFile("testIfFormula",".xls");
+ File file = TempFile.createTempFile("testIfFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet("Sheet1");
@@ -922,7 +923,7 @@
//assertTrue("expected: A!A1+A!B1 got: "+c.getCellFormula(), ("A!A1+A!B1").equals(c.getCellFormula()));
in.close();
- File simpleIf = File.createTempFile("testSimpleIfFormulaWrite",".xls");
+ File simpleIf = TempFile.createTempFile("testSimpleIfFormulaWrite",".xls");
out = new FileOutputStream(simpleIf);
wb = new HSSFWorkbook();
s = wb.createSheet("Sheet1");
@@ -937,7 +938,7 @@
assertTrue("length of simpleIf file is zero", (simpleIf.length()>0));
- File nestedIf = File.createTempFile("testNestedIfFormula",".xls");
+ File nestedIf = TempFile.createTempFile("testNestedIfFormula",".xls");
out = new FileOutputStream(nestedIf);
wb = new HSSFWorkbook();
s = wb.createSheet("Sheet1");
@@ -987,7 +988,7 @@
assertEquals(function, c.getCellFormula());
- File file = File.createTempFile("testSumIfFormula",".xls");
+ File file = TempFile.createTempFile("testSumIfFormula",".xls");
FileOutputStream out = new FileOutputStream(file);
wb = new HSSFWorkbook();
s = wb.createSheet();
1.12 +4 -3 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
Index: TestHSSFCell.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestHSSFCell.java 23 Aug 2004 08:52:52 -0000 1.11
+++ TestHSSFCell.java 12 Oct 2004 05:49:01 -0000 1.12
@@ -27,6 +27,7 @@
import org.apache.poi.hssf.record.EOFRecord;
import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.util.TempFile;
import java.io.File;
import java.io.FileInputStream;
@@ -57,7 +58,7 @@
throws java.io.IOException {
String readFilename = System.getProperty("HSSF.testdata.path");
- File file = File.createTempFile("testBoolErr",".xls");
+ File file = TempFile.createTempFile("testBoolErr",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet("Sheet1");
@@ -171,7 +172,7 @@
3, s.getActiveCellRow());
//write book to temp file; read and verify that position is serialized
- File temp = File.createTempFile("testActiveCell", ".xls");
+ File temp = TempFile.createTempFile("testActiveCell", ".xls");
FileOutputStream fos = new FileOutputStream(temp);
book.write(fos);
fos.close();
@@ -195,7 +196,7 @@
throws java.io.IOException {
String readFilename = System.getProperty("HSSF.testdata.path");
- File file = File.createTempFile("testFormulaStyle",".xls");
+ File file = TempFile.createTempFile("testFormulaStyle",".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet("Sheet1");
1.7 +2 -1 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
Index: TestHSSFPalette.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestHSSFPalette.java 23 Aug 2004 08:52:52 -0000 1.6
+++ TestHSSFPalette.java 12 Oct 2004 05:49:01 -0000 1.7
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.apache.poi.hssf.record.PaletteRecord;
import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.util.TempFile;
/**
* @author Brian Sanders (bsanders at risklabs dot com)
@@ -65,7 +66,7 @@
palette.setColorAtIndex((short) 0x3b, (byte) 0, (byte) 255, (byte) 52);
//writing to disk; reading in and verifying palette
- File temp = File.createTempFile("testCustomPalette", ".xls");
+ File temp = TempFile.createTempFile("testCustomPalette", ".xls");
FileOutputStream fos = new FileOutputStream(temp);
book.write(fos);
fos.close();
1.9 +3 -1 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
Index: TestHSSFRow.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestHSSFRow.java 23 Aug 2004 08:52:52 -0000 1.8
+++ TestHSSFRow.java 12 Oct 2004 05:49:01 -0000 1.9
@@ -24,6 +24,8 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import org.apache.poi.util.TempFile;
+
/**
* Test HSSFRow is okay.
*
@@ -83,7 +85,7 @@
assertEquals(0, data[6]);
assertEquals(0, data[8]);
- File file = File.createTempFile("XXX", "XLS");
+ File file = TempFile.createTempFile("XXX", "XLS");
FileOutputStream stream = new FileOutputStream(file);
workbook.write(stream);
stream.close();
1.22 +5 -4 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
Index: TestHSSFSheet.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TestHSSFSheet.java 23 Aug 2004 08:52:52 -0000 1.21
+++ TestHSSFSheet.java 12 Oct 2004 05:49:01 -0000 1.22
@@ -32,6 +32,7 @@
import org.apache.poi.hssf.record.WSBoolRecord;
import org.apache.poi.hssf.record.WindowTwoRecord;
import org.apache.poi.hssf.util.Region;
+import org.apache.poi.util.TempFile;
/**
* Tests HSSFSheet. This test case is very incomplete at the moment.
@@ -165,7 +166,7 @@
cell.setCellValue(true);
cell = row.createCell((short) 11);
cell.setCellValue(true);
- File tempFile = File.createTempFile("bool", "test.xls");
+ File tempFile = TempFile.createTempFile("bool", "test.xls");
FileOutputStream stream = new FileOutputStream(tempFile);
workbook.write(stream);
stream.close();
@@ -312,7 +313,7 @@
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet sheet = wb.createSheet();
- File tempFile = File.createTempFile("display", "test.xls");
+ File tempFile = TempFile.createTempFile("display", "test.xls");
FileOutputStream stream = new FileOutputStream(tempFile);
wb.write(stream);
stream.close();
@@ -330,7 +331,7 @@
sheet.setDisplayRowColHeadings(false);
sheet.setDisplayFormulas(true);
- tempFile = File.createTempFile("display", "test.xls");
+ tempFile = TempFile.createTempFile("display", "test.xls");
stream = new FileOutputStream(tempFile);
wb.write(stream);
stream.close();
@@ -377,7 +378,7 @@
assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
- File tempFile = File.createTempFile("display", "testPagebreaks.xls");
+ File tempFile = TempFile.createTempFile("display", "testPagebreaks.xls");
FileOutputStream stream = new FileOutputStream(tempFile);
wb.write(stream);
stream.close();
1.10 +6 -5 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestNamedRange.java
Index: TestNamedRange.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestNamedRange.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestNamedRange.java 23 Aug 2004 08:52:52 -0000 1.9
+++ TestNamedRange.java 12 Oct 2004 05:49:01 -0000 1.10
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.util.TempFile;
/**
@@ -105,7 +106,7 @@
SanityChecker c = new SanityChecker();
c.checkHSSFWorkbook(wb);
- File file = File.createTempFile("testNamedRange",
+ File file = TempFile.createTempFile("testNamedRange",
".xls");
FileOutputStream fileOut = new FileOutputStream(file);
@@ -229,7 +230,7 @@
HSSFName namedRange1 = wb.getNameAt(0);
String referece = namedRange1.getReference();
- File file = File.createTempFile("testMultiNamedRange", ".xls");
+ File file = TempFile.createTempFile("testMultiNamedRange", ".xls");
FileOutputStream fileOut = new FileOutputStream(file);
wb.write(fileOut);
@@ -293,7 +294,7 @@
namedRange2.setReference("sheet2" + "!$A$1:$O$21");
// Write the workbook to a file
- File file = File.createTempFile("testMuiltipletNamedRanges", ".xls");
+ File file = TempFile.createTempFile("testMuiltipletNamedRanges", ".xls");
FileOutputStream fileOut = new FileOutputStream(file);
wb.write(fileOut);
fileOut.close();
@@ -401,7 +402,7 @@
String reference = sheetName+"!$A$1:$B$1";
workbook.setPrintArea(0, reference);
- File file = File.createTempFile("testPrintArea",".xls");
+ File file = TempFile.createTempFile("testPrintArea",".xls");
FileOutputStream fileOut = new FileOutputStream(file);
workbook.write(fileOut);
@@ -444,7 +445,7 @@
String reference3 = sheetName+"!$D$2:$F$5";
workbook.setPrintArea(2, reference3);
- File file = File.createTempFile("testMultiPrintArea",".xls");
+ File file = TempFile.createTempFile("testMultiPrintArea",".xls");
FileOutputStream fileOut = new FileOutputStream(file);
workbook.write(fileOut);
1.7 +4 -3 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestSheetShiftRows.java
Index: TestSheetShiftRows.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestSheetShiftRows.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestSheetShiftRows.java 23 Aug 2004 08:52:52 -0000 1.6
+++ TestSheetShiftRows.java 12 Oct 2004 05:49:01 -0000 1.7
@@ -21,6 +21,7 @@
import junit.framework.TestCase;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.util.TempFile;
import java.io.File;
import java.io.FileInputStream;
@@ -64,7 +65,7 @@
// Shift the second row down 1 and write to temp file
s.shiftRows( 1, 1, 1 );
- File tempFile = File.createTempFile( "shift", "test.xls" );
+ File tempFile = TempFile.createTempFile( "shift", "test.xls" );
FileOutputStream fout = new FileOutputStream( tempFile );
wb.write( fout );
fout.close();
@@ -85,7 +86,7 @@
// Shift rows 1-3 down 3 in the current one. This tests when
// 1 row is blank. Write to a another temp file
s.shiftRows( 0, 2, 3 );
- tempFile = File.createTempFile( "shift", "test.xls" );
+ tempFile = TempFile.createTempFile( "shift", "test.xls" );
fout = new FileOutputStream( tempFile );
wb.write( fout );
fout.close();
@@ -110,7 +111,7 @@
// Shift rows 3 and 4 up and write to temp file
s.shiftRows( 2, 3, -2 );
- tempFile = File.createTempFile( "shift", "test.xls" );
+ tempFile = TempFile.createTempFile( "shift", "test.xls" );
fout = new FileOutputStream( tempFile );
wb.write( fout );
fout.close();
1.14 +17 -17 jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
Index: TestWorkbook.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestWorkbook.java 23 Aug 2004 08:52:52 -0000 1.13
+++ TestWorkbook.java 12 Oct 2004 05:49:01 -0000 1.14
@@ -18,14 +18,7 @@
package org.apache.poi.hssf.usermodel;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Iterator;
-
import junit.framework.TestCase;
-
import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.BackupRecord;
import org.apache.poi.hssf.record.LabelSSTRecord;
@@ -33,6 +26,13 @@
import org.apache.poi.hssf.record.aggregates.ValueRecordsAggregate;
import org.apache.poi.hssf.util.Region;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.util.TempFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
/**
* Class to test Workbook functionality
@@ -81,7 +81,7 @@
public void testWriteSheetSimple()
throws IOException
{
- File file = File.createTempFile("testWriteSheetSimple",
+ File file = TempFile.createTempFile("testWriteSheetSimple",
".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
@@ -127,7 +127,7 @@
public void testWriteModifySheetSimple()
throws IOException
{
- File file = File.createTempFile("testWriteSheetSimple",
+ File file = TempFile.createTempFile("testWriteSheetSimple",
".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
@@ -235,7 +235,7 @@
public void testWriteDataFormat()
throws IOException
{
- File file = File.createTempFile("testWriteDataFormat",
+ File file = TempFile.createTempFile("testWriteDataFormat",
".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook wb = new HSSFWorkbook();
@@ -335,7 +335,7 @@
sheet.getRow(( short ) 0).getCell(( short ) 0);
cell.setCellValue(REPLACED);
- File destination = File.createTempFile("SimpleResult",
+ File destination = TempFile.createTempFile("SimpleResult",
".xls");
FileOutputStream outstream = new FileOutputStream(destination);
@@ -381,7 +381,7 @@
cell = sheet.getRow(( short ) 1).getCell(( short ) 0);
cell.setCellValue(REPLACED);
File destination =
- File.createTempFile("SimpleWithSkipResult", ".xls");
+ TempFile.createTempFile("SimpleWithSkipResult", ".xls");
FileOutputStream outstream = new FileOutputStream(destination);
workbook.write(outstream);
@@ -433,7 +433,7 @@
cell.setCellValue(REPLACED);
}
File destination =
- File.createTempFile("SimpleWithStylingResult", ".xls");
+ TempFile.createTempFile("SimpleWithStylingResult", ".xls");
FileOutputStream outstream = new FileOutputStream(destination);
workbook.write(outstream);
@@ -483,7 +483,7 @@
cell.setCellValue(FIRST_NAME_VALUE);
cell = sheet.getRow(( short ) 5).getCell(( short ) 2);
cell.setCellValue(SSN_VALUE);
- File destination = File.createTempFile("EmployeeResult",
+ File destination = TempFile.createTempFile("EmployeeResult",
".xls");
FileOutputStream outstream = new FileOutputStream(destination);
@@ -550,7 +550,7 @@
public void testWriteModifySheetMerged()
throws IOException
{
- File file = File.createTempFile("testWriteSheetMerged",
+ File file = TempFile.createTempFile("testWriteSheetMerged",
".xls");
FileOutputStream out = new FileOutputStream(file);
FileInputStream in = null;
@@ -656,7 +656,7 @@
throws Exception
{
String testName = "TestManyRows";
- File file = File.createTempFile(testName, ".xls");
+ File file = TempFile.createTempFile(testName, ".xls");
FileOutputStream out = new FileOutputStream(file);
HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet();
@@ -704,7 +704,7 @@
workbook.setRepeatingRowsAndColumns(0, 0, 1, 0, 0);
- File file = File.createTempFile("testPrintTitles",".xls");
+ File file = TempFile.createTempFile("testPrintTitles",".xls");
FileOutputStream fileOut = new FileOutputStream(file);
workbook.write(fileOut);
1.1 jakarta-poi/src/testcases/org/apache/poi/util/TestTempFile.java
Index: TestTempFile.java
===================================================================
/* ====================================================================
Copyright 2002-2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
package org.apache.poi.util;
import junit.framework.TestCase;
import java.io.File;
import java.io.FileWriter;
/**
* @author Glen Stampoultzis
*/
public class TestTempFile extends TestCase {
TempFile tempFile;
public void testCreateTempFile()
throws Exception
{
File tempFile = TempFile.createTempFile("test", ".txt");
FileWriter w = new FileWriter(tempFile);
w.write("testing");
w.close();
assertTrue(tempFile.exists());
assertEquals("poifiles", tempFile.getParentFile().getName());
// Can't think of a good way to check whether a file is actually deleted since it would require the VM to stop.
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: poi-dev-help@jakarta.apache.org