From 4ab69b6935ce92c351c1e0424d75f9b5d898afb9 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 25 Jan 2011 11:21:42 +0000
Subject: [PATCH] LMS-1984 Made AbstractFileSystemTestCase cleanup more robust.
SVN: 19578
---
.../cisd/base/tests/AbstractFileSystemTestCase.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java b/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
index 9cc75e198ed..3df09076107 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.base.tests;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Arrays;
@@ -39,8 +40,8 @@ public abstract class AbstractFileSystemTestCase extends AssertJUnit
protected static final String TARGETS_DIRECTORY = "targets";
- private static final File UNIT_TEST_ROOT_DIRECTORY =
- new File(TARGETS_DIRECTORY + File.separator + UNIT_TEST_WORKING_DIRECTORY);
+ private static final File UNIT_TEST_ROOT_DIRECTORY = new File(TARGETS_DIRECTORY
+ + File.separator + UNIT_TEST_WORKING_DIRECTORY);
protected final File workingDirectory;
@@ -105,6 +106,12 @@ public abstract class AbstractFileSystemTestCase extends AssertJUnit
{
return;
}
- FileUtils.deleteDirectory(workingDirectory);
+ try
+ {
+ FileUtils.deleteDirectory(workingDirectory);
+ } catch (FileNotFoundException ex)
+ {
+ // Ignore
+ }
}
}
--
GitLab