[commons-vfs] branch master updated: Assume was in the wrong method.

[ggregory]

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 1ff1e85  Assume was in the wrong method.
1ff1e85 is described below

commit 1ff1e8584eb28c1e01bbb4c947dfbebc19aab433
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Tue Jul 9 14:32:53 2019 -0400

    Assume was in the wrong method.
---
 .../commons/vfs2/filter/SymbolicLinkFileFilterTest.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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 ff010d2..11f59db 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
@@ -71,6 +71,8 @@ public class SymbolicLinkFileFilterTest extends 
BaseFilterTest {
 
     @BeforeClass
     public static void beforeClass() throws IOException {
+        
Assume.assumeTrue(Boolean.getBoolean(SymbolicLinkFileFilterTest.class.getSimpleName()
 + ".Enable"));
+
         testDir = getTestDir(SymbolicLinkFileFilterTest.class.getName());
         testDir.mkdir();
 
@@ -94,7 +96,6 @@ public class SymbolicLinkFileFilterTest extends 
BaseFilterTest {
 
     @AfterClass
     public static void afterClass() throws IOException {
-        
Assume.assumeTrue(Boolean.getBoolean(SymbolicLinkFileFilterTest.class.getSimpleName()
 + ".Enable"));
         targetFile = null;
         targetFileInfo = null;
         linkFile = null;
@@ -104,10 +105,14 @@ public class SymbolicLinkFileFilterTest extends 
BaseFilterTest {
         if (zipFileObject != null) {
             zipFileObject.close();
         }
-        FileUtils.deleteQuietly(zipFile);
-        zipFile = null;
-        FileUtils.deleteDirectory(testDir);
-        testDir = null;
+        if (zipFile != null) {
+            FileUtils.deleteQuietly(zipFile);
+            zipFile = null;
+        }
+        if (testDir != null) {
+            FileUtils.deleteDirectory(testDir);
+            testDir = null;
+        }
     }
 
     @Test