GEODE-2456: change JUnit4CacheTestCase tearDown to use deleteQuietly
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/15748ed4 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/15748ed4 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/15748ed4 Branch: refs/heads/feature/GEODE-2456 Commit: 15748ed41ff6f3512ef1c69d0c64c2fbd42d6707 Parents: f7a8ae6 Author: Kirk Lund <[email protected]> Authored: Thu Feb 9 12:02:56 2017 -0800 Committer: Kirk Lund <[email protected]> Committed: Thu Feb 9 15:15:34 2017 -0800 ---------------------------------------------------------------------- .../test/dunit/cache/internal/JUnit4CacheTestCase.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/15748ed4/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java index a511995..f8b1415 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Map; import java.util.Properties; +import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.Logger; import org.apache.geode.cache.AttributesFactory; @@ -41,7 +42,6 @@ import org.apache.geode.cache.client.PoolManager; import org.apache.geode.cache30.CacheSerializableRunnable; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.DistributionMessageObserver; -import org.apache.geode.internal.FileUtil; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.InternalRegionArguments; import org.apache.geode.internal.cache.LocalRegion; @@ -568,17 +568,13 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase } public static final void cleanDiskDirs() throws IOException { - FileUtil.delete(getDiskDir()); + FileUtils.deleteQuietly(getDiskDir()); Arrays.stream(new File(".").listFiles()).forEach(file -> deleteBACKUPDiskStoreFile(file)); } private static void deleteBACKUPDiskStoreFile(final File file) { if (file.getName().startsWith("BACKUPDiskStore-")) { - try { - FileUtil.delete(file); - } catch (IOException e) { - throw new RuntimeException("Unable to delete BACKUPDiskStore file", e); - } + FileUtils.deleteQuietly(file); } }
