This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 99684d0c Bullet-proofing of tests
99684d0c is described below
commit 99684d0c804be03c2f6b3e8d3d9bea3c0843ab6e
Author: Gary Gregory <[email protected]>
AuthorDate: Wed May 17 13:39:29 2023 -0400
Bullet-proofing of tests
Don't fail a test during its clean up phase if some of its resources
could not be released because they were not allocated in the first
place. IOW, don't try top delete or close a file that does not exist.
---
.../java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java | 3 ++-
.../java/org/apache/commons/vfs2/filter/BaseFilterTest.java | 10 +++++++++-
.../apache/commons/vfs2/filter/CanExecuteFileFilterTest.java | 9 ++++-----
.../org/apache/commons/vfs2/filter/CanReadFileFilterTest.java | 7 ++++---
.../org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java | 7 ++++---
.../apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java | 3 ++-
.../org/apache/commons/vfs2/filter/EmptyFileFilterTest.java | 3 ++-
.../org/apache/commons/vfs2/filter/HiddenFileFilterTest.java | 3 ++-
.../org/apache/commons/vfs2/filter/SizeFileFilterTest.java | 3 ++-
.../apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java | 5 ++---
10 files changed, 33 insertions(+), 20 deletions(-)
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
index 3dd1f7e9..15b9b0e7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Date;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
@@ -73,7 +74,7 @@ public class AgeFileFilterTest extends BaseFilterTest {
oldFileInfo = null;
oldFile = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
index 470c9d43..1f9ec507 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
@@ -148,6 +148,12 @@ public abstract class BaseFilterTest {
}
}
+ protected static void delete(final File file) {
+ if (file != null) {
+ file.delete();
+ }
+ }
+
/**
* Returns the temporary directory.
*
@@ -165,7 +171,9 @@ public abstract class BaseFilterTest {
* @return Subdirectory of java.io.tmpdir.
*/
protected static File getTestDir(final String name) {
- return new File(getTempDir(), name);
+ final File file = new File(getTempDir(), name);
+ file.mkdirs();
+ return file;
}
/**
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java
index 7465369c..8d0dcc2d 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
@@ -62,19 +63,17 @@ public class CanExecuteFileFilterTest extends
BaseFilterTest {
@AfterAll
public static void afterClass() throws IOException {
-
executableFileInfo = null;
- executableFile.delete();
- executableFile = null;
+ delete(executableFile);
notExecutableFileInfo = null;
- notExecutableFile.delete();
+ delete(notExecutableFile);
notExecutableFile = null;
notExistingFileInfo = null;
notExistingFile = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
index 7f90d44b..45bfbd5d 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
@@ -61,17 +62,17 @@ public class CanReadFileFilterTest extends BaseFilterTest {
public static void afterClass() throws IOException {
writableFileInfo = null;
- writableFile.delete();
+ delete(writableFile);
writableFile = null;
readOnlyFileInfo = null;
- readOnlyFile.delete();
+ delete(readOnlyFile);
readOnlyFile = null;
notExistingFileInfo = null;
notExistingFile = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
index 46bda398..deff89d4 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
@@ -61,17 +62,17 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
public static void afterClass() throws IOException {
writableFileInfo = null;
- writableFile.delete();
+ delete(writableFile);
writableFile = null;
readOnlyFileInfo = null;
- readOnlyFile.delete();
+ delete(readOnlyFile);
readOnlyFile = null;
notExistingFileInfo = null;
notExistingFile = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
index 8c6a80fe..7ea46257 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilter;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
@@ -71,7 +72,7 @@ public class DirectoryAndFileFilterTest extends
BaseFilterTest {
notExistingFileInfo = null;
notExistingFile = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
index 6a6a6771..a203d5a1 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilter;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
@@ -76,7 +77,7 @@ public class EmptyFileFilterTest extends BaseFilterTest {
notExistingFile = null;
notExistingFileInfo = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
index 63ec0762..cb7a04b6 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilter;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
@@ -64,7 +65,7 @@ public class HiddenFileFilterTest extends BaseFilterTest {
notExistingFile = null;
notExistingFileInfo = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
index 58030542..d8dfb7ef 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
@@ -65,7 +66,7 @@ public class SizeFileFilterTest extends BaseFilterTest {
maxFileInfo = null;
maxFile = null;
- zipFileObj.close();
+ IOUtils.close(zipFileObj);
FileUtils.deleteQuietly(zipFile);
zipFile = null;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java
index 00b0a0ab..81abaf92 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.nio.file.Files;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.vfs2.FileFilter;
import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
@@ -80,9 +81,7 @@ public class SymbolicLinkFileFilterTest extends
BaseFilterTest {
linkFileInfo = null;
notExistingFile = null;
notExistingFileInfo = null;
- if (zipFileObject != null) {
- zipFileObject.close();
- }
+ IOUtils.close(zipFileObject);
if (zipFile != null) {
FileUtils.deleteQuietly(zipFile);
zipFile = null;
