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 2019/12/14 13:10:21 UTC
svn commit: r1871507 -
/poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
Author: centic
Date: Sat Dec 14 13:10:21 2019
New Revision: 1871507
URL: http://svn.apache.org/viewvc?rev=1871507&view=rev
Log:
Ensure that the temporary directory does exist before using it in tests
Modified:
poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java?rev=1871507&r1=1871506&r2=1871507&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java Sat Dec 14 13:10:21 2019
@@ -43,6 +43,10 @@ public class TestTempFile {
@Before
public void setUp() throws IOException {
previousTempDir = System.getProperty(TempFile.JAVA_IO_TMPDIR);
+ if(previousTempDir != null) {
+ assertTrue("Failed to create directory " + previousTempDir,
+ new File(previousTempDir).exists() || new File(previousTempDir).mkdirs());
+ }
// use a separate tempdir for the tests to be able to check for leftover files
tempDir = File.createTempFile("TestTempFile", ".tst");
@@ -53,20 +57,22 @@ public class TestTempFile {
@After
public void tearDown() throws IOException {
- String[] files = tempDir.list();
- assertNotNull(files);
- // can have the "poifiles" subdir
- if(files.length == 1) {
- assertEquals("Had: " + Arrays.toString(files), DefaultTempFileCreationStrategy.POIFILES, files[0]);
- files = new File(tempDir, files[0]).list();
+ if(tempDir != null) {
+ String[] files = tempDir.list();
assertNotNull(files);
- assertEquals("Had: " + Arrays.toString(files), 0, files.length);
- } else {
- assertEquals("Had: " + Arrays.toString(files), 0, files.length);
- }
+ // can have the "poifiles" subdir
+ if (files.length == 1) {
+ assertEquals("Had: " + Arrays.toString(files), DefaultTempFileCreationStrategy.POIFILES, files[0]);
+ files = new File(tempDir, files[0]).list();
+ assertNotNull(files);
+ assertEquals("Had: " + Arrays.toString(files), 0, files.length);
+ } else {
+ assertEquals("Had: " + Arrays.toString(files), 0, files.length);
+ }
- // remove the directory after the tests
- TestPOIFSDump.deleteDirectory(tempDir);
+ // remove the directory after the tests
+ TestPOIFSDump.deleteDirectory(tempDir);
+ }
if(previousTempDir == null) {
System.clearProperty(TempFile.JAVA_IO_TMPDIR);
@@ -141,6 +147,7 @@ public class TestTempFile {
assertTrue(file1.delete());
thrown.expect(IllegalArgumentException.class);
+ //noinspection ConstantConditions
TempFile.setTempFileCreationStrategy(null);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org