From c1e92f159f1390d42bddddb66c41a026fb4a1f55 Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Wed, 13 Aug 2008 11:04:06 +0000 Subject: [PATCH] change: make the setup of the tests more robust with regard to 'vanishing files' (since we have a QueueingPathRemover running) SVN: 7856 --- .../cisd/common/utilities/AbstractFileSystemTestCase.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/AbstractFileSystemTestCase.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/AbstractFileSystemTestCase.java index 0d33bfc6f8b..55f084fe300 100644 --- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/AbstractFileSystemTestCase.java +++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/AbstractFileSystemTestCase.java @@ -16,10 +16,11 @@ package ch.systemsx.cisd.common.utilities; +import static org.testng.AssertJUnit.assertTrue; + import java.io.File; import java.io.IOException; -import org.apache.commons.io.FileUtils; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeMethod; @@ -66,8 +67,9 @@ public abstract class AbstractFileSystemTestCase @BeforeMethod public void setUp() throws IOException { - FileUtils.cleanDirectory(workingDirectory); - assert workingDirectory.isDirectory() && workingDirectory.listFiles().length == 0; + FileUtilities.deleteRecursively(workingDirectory); + workingDirectory.mkdir(); + assertTrue(workingDirectory.isDirectory() && workingDirectory.listFiles().length == 0); } @AfterClass -- GitLab