[infinispan-commits] Infinispan SVN: r2416 - trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra.

[infinispan-commits at lists.jboss.org]

Author: NadirX
Date: 2010-09-17 05:51:51 -0400 (Fri, 17 Sep 2010)
New Revision: 2416

Modified:
   trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraServiceDataCleaner.java
Log:
Use TestingUtils

Modified: trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraServiceDataCleaner.java
===================================================================
--- trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraServiceDataCleaner.java	2010-09-17 09:39:22 UTC (rev 2415)
+++ trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraServiceDataCleaner.java	2010-09-17 09:51:51 UTC (rev 2416)
@@ -1,12 +1,12 @@
 package org.infinispan.loaders.cassandra;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.util.FileUtils;
+import org.infinispan.test.TestingUtil;
 
 public class CassandraServiceDataCleaner {
 	/**
@@ -28,7 +28,7 @@
 	 */
 	public void cleanupDataDirectories() throws IOException {
 		for (String s : getDataDirs()) {
-			cleanDir(s);
+			TestingUtil.recursiveFileRemove(s);
 		}
 	}
 
@@ -69,28 +69,4 @@
 		FileUtils.createDirectory(dir);
 	}
 
-	/**
-	 * Removes all directory content from file the system
-	 * 
-	 * @param dir
-	 * @throws IOException
-	 */
-	private void cleanDir(String dir) throws IOException {
-		File dirFile = new File(dir);
-		if (dirFile.exists() && dirFile.isDirectory()) {
-			deleteDir(dirFile);
-		}
-	}
-
-	public static void deleteDir(File dir) throws IOException {
-		if (dir.isDirectory()) {
-			String[] children = dir.list();
-			for (int i = 0; i < children.length; i++) {
-				deleteDir(new File(dir, children[i]));
-			}
-		}
-
-		dir.delete();
-	}
-
 }